removed old netcon references in docker test files

tests/docker/python/python/monitor_entrypoint.sh

@@ -8,7 +8,7 @@ test_namefile=$(ls *.name)
 test_name="${test_namefile%.*}" # test network id
 nwconf=$(ls *.conf) # blank test network config file
 nwid="${nwconf%.*}" # test network id
-netcon_wait_time=35 # wait for test container to come online
+sdk_wait_time=35 # wait for test container to come online
 app_timeout_time=25 # app-specific timeout
 file_path=/opt/results/ # test result output file path (fs shared between host and containers)
 file_base="$test_name".txt # test result output file
@@ -33,8 +33,8 @@ while [ -z "$virtip4" ]; do
 done
 echo '*** Starting Test...'
 echo '*** Up and running at' $virtip4 ' on network: ' $nwid
-echo '*** Sleeping for ('  "$netcon_wait_time"  's ) while we wait for the Network Container to come online...'
-sleep "$netcon_wait_time"s
+echo '*** Sleeping for ('  "$sdk_wait_time"  's ) while we wait for the Network Container to come online...'
+sleep "$sdk_wait_time"s
 ncvirtip=$(<$address_file)
 
 

tests/docker/python/python/sdk_dockerfile

@@ -11,8 +11,8 @@ EXPOSE 9993/udp 80/udp
 
 # Add ZT files
 RUN mkdir -p /var/lib/zerotier-one/networks.d
-ADD netcon_identity.public /var/lib/zerotier-one/identity.public
-ADD netcon_identity.secret /var/lib/zerotier-one/identity.secret
+ADD sdk_identity.public /var/lib/zerotier-one/identity.public
+ADD sdk_identity.secret /var/lib/zerotier-one/identity.secret
 ADD *.conf /var/lib/zerotier-one/networks.d/
 ADD *.conf /
 ADD *.name /
@@ -29,8 +29,8 @@ ADD zerotier-cli /
 ADD zerotier-sdk-service /
 
 # Install test scripts
-ADD netcon_entrypoint.sh /netcon_entrypoint.sh
-RUN chmod -v +x /netcon_entrypoint.sh
+ADD sdk_entrypoint.sh /sdk_entrypoint.sh
+RUN chmod -v +x /sdk_entrypoint.sh
 
 # Start ZeroTier-One
-CMD ["./netcon_entrypoint.sh"]
+CMD ["./sdk_entrypoint.sh"]

tests/docker/python/python3/monitor_entrypoint.sh

@@ -8,7 +8,7 @@ test_namefile=$(ls *.name)
 test_name="${test_namefile%.*}" # test network id
 nwconf=$(ls *.conf) # blank test network config file
 nwid="${nwconf%.*}" # test network id
-netcon_wait_time=35 # wait for test container to come online
+sdk_wait_time=35 # wait for test container to come online
 app_timeout_time=25 # app-specific timeout
 file_path=/opt/results/ # test result output file path (fs shared between host and containers)
 file_base="$test_name".txt # test result output file
@@ -33,8 +33,8 @@ while [ -z "$virtip4" ]; do
 done
 echo '*** Starting Test...'
 echo '*** Up and running at' $virtip4 ' on network: ' $nwid
-echo '*** Sleeping for ('  "$netcon_wait_time"  's ) while we wait for the Network Container to come online...'
-sleep "$netcon_wait_time"s
+echo '*** Sleeping for ('  "$sdk_wait_time"  's ) while we wait for the Network Container to come online...'
+sleep "$sdk_wait_time"s
 ncvirtip=$(<$address_file)
 
 

tests/docker/python/python3/sdk_dockerfile

@@ -10,8 +10,8 @@ EXPOSE 9993/udp 80/udp
 
 # Add ZT files
 RUN mkdir -p /var/lib/zerotier-one/networks.d
-ADD netcon_identity.public /var/lib/zerotier-one/identity.public
-ADD netcon_identity.secret /var/lib/zerotier-one/identity.secret
+ADD sdk_identity.public /var/lib/zerotier-one/identity.public
+ADD sdk_identity.secret /var/lib/zerotier-one/identity.secret
 ADD *.conf /var/lib/zerotier-one/networks.d/
 ADD *.conf /
 ADD *.name /
@@ -28,8 +28,8 @@ ADD zerotier-cli /
 ADD zerotier-sdk-service /
 
 # Install test scripts
-ADD netcon_entrypoint.sh /netcon_entrypoint.sh
-RUN chmod -v +x /netcon_entrypoint.sh
+ADD sdk_entrypoint.sh /sdk_entrypoint.sh
+RUN chmod -v +x /sdk_entrypoint.sh
 
 # Start ZeroTier-One
-CMD ["./netcon_entrypoint.sh"]
+CMD ["./sdk_entrypoint.sh"]