gfwleak/zhangyang-libzt
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

removed old netcon references in docker test files

Browse Source
This commit is contained in:
Joseph Henry
2016-07-06 16:58:58 -05:00
parent e6fbbfc249
commit f9fcc89f62
53 changed files with 275 additions and 114 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
integrations/docker/hello.lua Normal file
View File

@@ -0,0 +1,3 @@
local msg = "welcome to the machine!"
redis.call("SET", "msg", msg)
return redis.call("GET", "msg")

28
integrations/docker/monitor_dockerfile Normal file
View File

@@ -0,0 +1,28 @@
# ZT Network Containers Test Monitor
FROM fedora:23
MAINTAINER https://www.zerotier.com/
RUN yum -y install redis-3.0.4-1.fc23.x86_64
EXPOSE 9993/udp
# Add ZT files
RUN mkdir -p /var/lib/zerotier-one/networks.d
ADD monitor_identity.public /var/lib/zerotier-one/identity.public
ADD monitor_identity.secret /var/lib/zerotier-one/identity.secret
ADD *.conf /var/lib/zerotier-one/networks.d/
ADD *.conf /
ADD *.name /
# Install LWIP library used by service
ADD liblwip.so /var/lib/zerotier-one/liblwip.so
ADD hello.lua /
ADD zerotier-one /
ADD zerotier-cli /
# Start ZeroTier-One
ADD monitor_entrypoint.sh /monitor_entrypoint.sh
RUN chmod -v +x /monitor_entrypoint.sh
CMD ["./monitor_entrypoint.sh"]

56
integrations/docker/monitor_entrypoint.sh Normal file
View File

@@ -0,0 +1,56 @@
#!/bin/bash
export PATH=/bin:/usr/bin:/usr/local/bin:/sbin:/usr/sbin:/
# --- Test Parameters ---
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=25 # wait for test container to come online
app_timeout_time=15 # 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
fail=FAIL. # appended to result file in event of failure
ok=OK. # appended to result file in event of success
tmp_ext=.tmp # temporary filetype used for sharing test data between containers
address_file="$file_path$test_name"_addr"$tmp_ext" # file shared between host and containers for sharing address (optional)
# --- Network Config ---
echo '*** ZeroTier Network Containers Test Monitor'
chown -R daemon /var/lib/zerotier-one
chgrp -R daemon /var/lib/zerotier-one
su daemon -s /bin/bash -c '/zerotier-one -d -U -p9993 >>/tmp/zerotier-one.out 2>&1'
virtip4=""
while [ -z "$virtip4" ]; do
sleep 0.2
virtip4=`/zerotier-cli listnetworks | grep -F $nwid | cut -d ' ' -f 9 | sed 's/,/\n/g' | grep -F '.' | cut -d / -f 1`
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
ncvirtip=$(<$address_file)
# --- Test section ---
echo '*** Running lua script against redis host at' $ncvirtip
redis-cli -h $ncvirtip EVAL "$(cat hello.lua)" 0 > redis_response.txt
response_string=$(<redis_response.txt)
if [[ $response_string == *"welcome to the machine!"* ]]
then
echo 'REDIS RESPONSE OK'
touch "$file_path$ok$test_name.txt"
printf 'Test: redis-server responded!\n' >> "$file_path$ok$test_name.txt"
else
echo 'REDIS RESPONSE FAIL'
touch "$file_path$fail$test_name.txt"
printf 'Test: redis server did NOT respond!\n' >> "$file_path$fail$test_name.txt"
fi

0
tests/docker/redis/redis-3.0.4-1.fc23.x86_64/netcon_dockerfile → integrations/docker/sdk_dockerfile
View File

0
tests/docker/redis/redis-3.0.4-1.fc23.x86_64/netcon_entrypoint.sh → integrations/docker/sdk_entrypoint.sh
View File

6
tests/docker/_build_single_image.sh
View File

@@ -12,12 +12,12 @@ cp ../../zerotier-cli zerotier-sdk-service
cp ../../zerotier-intercept zerotier-intercept
cp ../../libzerotierintercept.so libzerotierintercept.so
cp ../../liblwip.so liblwip.so
cp ../../netcon_identity.public netcon_identity.public
cp ../../netcon_identity.secret netcon_identity.secret
cp ../../sdk_identity.public sdk_identity.public
cp ../../sdk_identity.secret sdk_identity.secret
cp ../../monitor_identity.public monitor_identity.public
cp ../../monitor_identity.secret monitor_identity.secret
docker build --tag="$test_name" -f netcon_dockerfile .
docker build --tag="$test_name" -f sdk_dockerfile .
docker build --tag="$test_name"_monitor -f monitor_dockerfile .
rm -f zerotier-cli

4
tests/docker/_two_party_test.sh
View File

@@ -7,8 +7,8 @@ touch "$test_name".name
test_container=$(docker run -d -it -v $PWD/../../_results:/opt/results --device=/dev/net/tun "$test_name":latest)
monitor_container=$(docker run -d -it -v $PWD/../../_results:/opt/results --device=/dev/net/tun "$test_name"_monitor:latest)
echo "waiting $netcon_test_wait_time for test to complete."
sleep $netcon_test_wait_time
echo "waiting $sdk_test_wait_time for test to complete."
sleep $sdk_test_wait_time
docker stop $(docker ps -a -q)
docker rm $test_container
docker rm $monitor_container

2
tests/docker/build_tests.sh
View File

@@ -6,7 +6,7 @@
rm _results/*.txt
# How long we shall wait for each test to conclude
export netcon_test_wait_time=60s
export sdk_test_wait_time=60s
export image_build_script=_build_single_image.sh

4
tests/docker/build_zt.sh
View File

@@ -6,8 +6,8 @@
cd ../../
make clean
make one
make netcon
cd netcon/docker-test
make sdk
cd sdk/docker-test
cp ../../zerotier-cli zerotier-cli
cp ../../zerotier-sdk-service zerotier-sdk-service

6
tests/docker/darkhttpd/darkhttpd-1.11.x86_64/monitor_entrypoint.sh
View File

@@ -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)

10
tests/docker/darkhttpd/darkhttpd-1.11.x86_64/netcon_dockerfile → tests/docker/darkhttpd/darkhttpd-1.11.x86_64/sdk_dockerfile
View File

@@ -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"]

0
tests/docker/darkhttpd/darkhttpd-1.11.x86_64/netcon_entrypoint.sh → tests/docker/darkhttpd/darkhttpd-1.11.x86_64/sdk_entrypoint.sh
View File

6
tests/docker/httpd/httpd-2.4.16-1.fc23.x86_64/monitor_entrypoint.sh
View File

@@ -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)

10
tests/docker/httpd/httpd-2.4.16-1.fc23.x86_64/netcon_dockerfile → tests/docker/httpd/httpd-2.4.16-1.fc23.x86_64/sdk_dockerfile
View File

@@ -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"]

0
tests/docker/httpd/httpd-2.4.16-1.fc23.x86_64/netcon_entrypoint.sh → tests/docker/httpd/httpd-2.4.16-1.fc23.x86_64/sdk_entrypoint.sh
View File

6
tests/docker/httpd/httpd-2.4.16-1.ub14.x86_64/monitor_entrypoint.sh
View File

@@ -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)

10
tests/docker/httpd/httpd-2.4.16-1.ub14.x86_64/netcon_dockerfile → tests/docker/httpd/httpd-2.4.16-1.ub14.x86_64/sdk_dockerfile
View File

@@ -12,8 +12,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 /
@@ -30,8 +30,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"]

0
tests/docker/httpd/httpd-2.4.16-1.ub14.x86_64/netcon_entrypoint.sh → tests/docker/httpd/httpd-2.4.16-1.ub14.x86_64/sdk_entrypoint.sh
View File

4
tests/docker/httpd/httpd-2.4.18-1.fc23.x86_64/_two_party_test.sh
View File

@@ -7,8 +7,8 @@ touch "$test_name".name
test_container=$(docker run -d -it -v $PWD/../../_results:/opt/results --device=/dev/net/tun "$test_name":latest)
monitor_container=$(docker run -d -it -v $PWD/../../_results:/opt/results --device=/dev/net/tun "$test_name"_monitor:latest)
echo "waiting $netcon_test_wait_time for test to complete."
sleep $netcon_test_wait_time
echo "waiting $sdk_test_wait_time for test to complete."
sleep $sdk_test_wait_time
docker stop $(docker ps -a -q)
docker rm $test_container
docker rm $monitor_container

6
tests/docker/httpd/httpd-2.4.18-1.fc23.x86_64/monitor_entrypoint.sh
View File

@@ -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)

10
tests/docker/httpd/httpd-2.4.18-1.fc23.x86_64/netcon_dockerfile → tests/docker/httpd/httpd-2.4.18-1.fc23.x86_64/sdk_dockerfile
View File

@@ -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"]

0
tests/docker/httpd/httpd-2.4.18-1.fc23.x86_64/netcon_entrypoint.sh → tests/docker/httpd/httpd-2.4.18-1.fc23.x86_64/sdk_entrypoint.sh
View File

6
tests/docker/httpd/httpd_demo/monitor_entrypoint.sh
View File

@@ -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=25 # wait for test container to come online
sdk_wait_time=25 # wait for test container to come online
app_timeout_time=15 # 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
@@ -41,8 +41,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)

10
tests/docker/httpd/httpd_demo/netcon_dockerfile → tests/docker/httpd/httpd_demo/sdk_dockerfile
View File

@@ -21,8 +21,8 @@ RUN ln -sf /lib/libzerotierintercept.so /lib/libzerotierintercept
# 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 /
@@ -30,8 +30,8 @@ ADD *.name /
ADD zerotier-cli /
# 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
# Install LWIP library used by service
ADD liblwip.so /
@@ -39,4 +39,4 @@ RUN mkdir -p ext/bin/lwip
RUN cp liblwip.so ext/bin/lwip/liblwip.so
# Start ZeroTier-One
CMD ["./netcon_entrypoint.sh"]
CMD ["./sdk_entrypoint.sh"]

0
tests/docker/httpd/httpd_demo/netcon_entrypoint.sh → tests/docker/httpd/httpd_demo/sdk_entrypoint.sh
View File

6
tests/docker/nginx/nginx-1.4.6-1.ub14.x86_64/monitor_entrypoint.sh
View File

@@ -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)

10
tests/docker/nginx/nginx-1.4.6-1.ub14.x86_64/netcon_dockerfile → tests/docker/nginx/nginx-1.4.6-1.ub14.x86_64/sdk_dockerfile
View File

@@ -14,8 +14,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 /
@@ -32,10 +32,10 @@ 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
ADD nginx.conf_ /
# Start ZeroTier-One
CMD ["./netcon_entrypoint.sh"]
CMD ["./sdk_entrypoint.sh"]

0
tests/docker/nginx/nginx-1.4.6-1.ub14.x86_64/netcon_entrypoint.sh → tests/docker/nginx/nginx-1.4.6-1.ub14.x86_64/sdk_entrypoint.sh
View File

4
tests/docker/nginx/nginx-1.8.0-13.fc23.x86_64/_two_party_test.sh
View File

@@ -7,8 +7,8 @@ touch "$test_name".name
test_container=$(docker run -d -it -v $PWD/../../_results:/opt/results --device=/dev/net/tun "$test_name":latest)
monitor_container=$(docker run -d -it -v $PWD/../../_results:/opt/results --device=/dev/net/tun "$test_name"_monitor:latest)
echo "waiting $netcon_test_wait_time for test to complete."
sleep $netcon_test_wait_time
echo "waiting $sdk_test_wait_time for test to complete."
sleep $sdk_test_wait_time
docker stop $(docker ps -a -q)
docker rm $test_container
docker rm $monitor_container

6
tests/docker/nginx/nginx-1.8.0-13.fc23.x86_64/monitor_entrypoint.sh
View File

@@ -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)

10
tests/docker/nginx/nginx-1.8.0-13.fc23.x86_64/netcon_dockerfile → tests/docker/nginx/nginx-1.8.0-13.fc23.x86_64/sdk_dockerfile
View File

@@ -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,10 +29,10 @@ 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
ADD nginx.conf_ /
# Start ZeroTier-One
CMD ["./netcon_entrypoint.sh"]
CMD ["./sdk_entrypoint.sh"]

0
tests/docker/nginx/nginx-1.8.0-13.fc23.x86_64/netcon_entrypoint.sh → tests/docker/nginx/nginx-1.8.0-13.fc23.x86_64/sdk_entrypoint.sh
View File

6
tests/docker/nginx/nginx-1.8.0-14.fc23.x86_64/monitor_entrypoint.sh
View File

@@ -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)

10
tests/docker/nginx/nginx-1.8.0-14.fc23.x86_64/netcon_dockerfile → tests/docker/nginx/nginx-1.8.0-14.fc23.x86_64/sdk_dockerfile
View File

@@ -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,10 +29,10 @@ 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
ADD nginx.conf_ /
# Start ZeroTier-One
CMD ["./netcon_entrypoint.sh"]
CMD ["./sdk_entrypoint.sh"]

0
tests/docker/nginx/nginx-1.8.0-14.fc23.x86_64/netcon_entrypoint.sh → tests/docker/nginx/nginx-1.8.0-14.fc23.x86_64/sdk_entrypoint.sh
View File

6
tests/docker/nodejs/nodejs-0.10.36-4.fc23/monitor_entrypoint.sh
View File

@@ -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=25 # wait for test container to come online
sdk_wait_time=25 # wait for test container to come online
app_timeout_time=15 # 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
@@ -30,8 +30,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)

10
tests/docker/nodejs/nodejs-0.10.36-4.fc23/netcon_dockerfile → tests/docker/nodejs/nodejs-0.10.36-4.fc23/sdk_dockerfile
View File

@@ -11,8 +11,8 @@ EXPOSE 9993/udp 8080/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 /
@@ -32,8 +32,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"]

0
tests/docker/nodejs/nodejs-0.10.36-4.fc23/netcon_entrypoint.sh → tests/docker/nodejs/nodejs-0.10.36-4.fc23/sdk_entrypoint.sh
View File

6
tests/docker/python/python/monitor_entrypoint.sh
View File

@@ -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)

10
tests/docker/python/python/netcon_dockerfile → tests/docker/python/python/sdk_dockerfile
View File

@@ -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"]

0
tests/docker/python/python/netcon_entrypoint.sh → tests/docker/python/python/sdk_entrypoint.sh
View File

6
tests/docker/python/python3/monitor_entrypoint.sh
View File

@@ -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)

10
tests/docker/python/python3/netcon_dockerfile → tests/docker/python/python3/sdk_dockerfile
View File

@@ -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"]

0
tests/docker/python/python3/netcon_entrypoint.sh → tests/docker/python/python3/sdk_entrypoint.sh
View File

6
tests/docker/redis/redis-3.0.4-1.fc23.x86_64/monitor_entrypoint.sh
View File

@@ -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=25 # wait for test container to come online
sdk_wait_time=25 # wait for test container to come online
app_timeout_time=15 # 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
@@ -30,8 +30,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)

36
tests/docker/redis/redis-3.0.4-1.fc23.x86_64/sdk_dockerfile Normal file
View File

@@ -0,0 +1,36 @@
# ZT Network Containers Test
FROM fedora:23
MAINTAINER https://www.zerotier.com/
# Install apps
RUN yum -y update
RUN yum -y install redis-3.0.4-1.fc23.x86_64
RUN yum clean all
# Add ZT files
RUN mkdir -p /var/lib/zerotier-one/networks.d
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 /
EXPOSE 9993/udp 6379/udp
# Install LWIP library used by service
ADD liblwip.so /var/lib/zerotier-one/liblwip.so
# Install syscall intercept library
ADD libzerotierintercept.so /
RUN cp libzerotierintercept.so lib/libzerotierintercept.so
RUN ln -sf /lib/libzerotierintercept.so /lib/libzerotierintercept
ADD zerotier-cli /
Add zerotier-sdk-service /
# Install test scripts
ADD sdk_entrypoint.sh /sdk_entrypoint.sh
RUN chmod -v +x /sdk_entrypoint.sh
# Start ZeroTier-One
CMD ["./sdk_entrypoint.sh"]

38
tests/docker/redis/redis-3.0.4-1.fc23.x86_64/sdk_entrypoint.sh Normal file
View File

@@ -0,0 +1,38 @@
#!/bin/bash
export PATH=/bin:/usr/bin:/usr/local/bin:/sbin:/usr/sbin:/
# --- Test Parameters ---
test_namefile=$(ls *.name)
test_name="${test_namefile%.*}" # test network id
nwconf=$(ls *.conf) # blank test network config file
nwid="${nwconf%.*}" # test network id
file_path=/opt/results/ # test result output file path (fs shared between host and containers)
file_base="$test_name".txt # test result output file
tmp_ext=.tmp # temporary filetype used for sharing test data between containers
address_file="$file_path$test_name"_addr"$tmp_ext" # file shared between host and containers for sharing address (optional)
# --- Network Config ---
echo '*** ZeroTier Network Containers Test: ' "$test_name"
chown -R daemon /var/lib/zerotier-one
chgrp -R daemon /var/lib/zerotier-one
su daemon -s /bin/bash -c '/zerotier-sdk-service -d -U -p9993 >>/tmp/zerotier-sdk-service.out 2>&1'
virtip4=""
while [ -z "$virtip4" ]; do
sleep 0.2
virtip4=`/zerotier-cli listnetworks | grep -F $nwid | cut -d ' ' -f 9 | sed 's/,/\n/g' | grep -F '.' | cut -d / -f 1`
dev=`/zerotier-cli listnetworks | grep -F "" | cut -d ' ' -f 8 | cut -d "_" -f 2 | sed "s/^<dev>//" | tr '\n' '\0'`
done
echo '*** Up and running at' $virtip4 ' on network: ' $nwid
echo '*** Writing address to ' "$address_file"
echo $virtip4 > "$address_file"
# --- Test section ---
echo '*** Starting application...'
sleep 0.5
export ZT_NC_NETWORK=/var/lib/zerotier-one/nc_"$dev"
export LD_PRELOAD=./libzerotierintercept.so
/usr/bin/redis-server --port 6379

6
tests/docker/sshd/openssh-server-7.1p1-3.fc23.x86_64/monitor_entrypoint.sh
View File

@@ -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=25 # wait for test container to come online
sdk_wait_time=25 # wait for test container to come online
app_timeout_time=15 # 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)

10
tests/docker/sshd/openssh-server-7.1p1-3.fc23.x86_64/netcon_dockerfile → tests/docker/sshd/openssh-server-7.1p1-3.fc23.x86_64/sdk_dockerfile
View File

@@ -11,8 +11,8 @@ EXPOSE 9993/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 @@ RUN ln -sf /lib/libzerotierintercept.so /lib/libzerotierintercept
ADD zerotier-cli /
# 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"]

0
tests/docker/sshd/openssh-server-7.1p1-3.fc23.x86_64/netcon_entrypoint.sh → tests/docker/sshd/openssh-server-7.1p1-3.fc23.x86_64/sdk_entrypoint.sh
View File

2
tests/docker/test.sh
View File

@@ -8,7 +8,7 @@ echo "*** Running unit tests..."
rm _results/*.txt
# How long we shall wait for each test to conclude
export netcon_test_wait_time=60s
export sdk_test_wait_time=60s
# Test structure, in later releases more complex multi-party scripts will be included
export test_script=_two_party_test.sh

2
tests/zt_api/zt_api_client.c
View File

@@ -6,7 +6,7 @@
#include <sys/socket.h> //socket
#include <arpa/inet.h> //inet_addr
#include "../../netcon.h"
#include "../../sdk.h"
int main(int argc , char *argv[])
{

2
tests/zt_api/zt_api_server.c
View File

@@ -8,7 +8,7 @@
#include <arpa/inet.h> //inet_addr
#include <unistd.h> //write
#include "../../netcon.h"
#include "../../sdk.h"
int main(int argc , char *argv[])
{