(WIP) Additional test script changes

12 files changed, 45 insertions, 27 deletions

diff --git a/netcon/docker-test/httpd/httpd-2.4.16-1.fc23.x86_64/httpd-2.4.16-1.fc23.x86_64.name b/netcon/docker-test/httpd/httpd-2.4.16-1.fc23.x86_64/httpd-2.4.16-1.fc23.x86_64.name
deleted file mode 100644
index e69de29b..00000000
--- a/netcon/docker-test/httpd/httpd-2.4.16-1.fc23.x86_64/httpd-2.4.16-1.fc23.x86_64.name
+++ /dev/null
diff --git a/netcon/docker-test/httpd/httpd-2.4.16-1.fc23.x86_64/monitor_dockerfile b/netcon/docker-test/httpd/httpd-2.4.16-1.fc23.x86_64/monitor_dockerfile
index e8f803cd..d2d2a0cb 100644
--- a/netcon/docker-test/httpd/httpd-2.4.16-1.fc23.x86_64/monitor_dockerfile
+++ b/netcon/docker-test/httpd/httpd-2.4.16-1.fc23.x86_64/monitor_dockerfile
@@ -4,9 +4,6 @@ MAINTAINER https://www.zerotier.com/
 
 EXPOSE 9993/udp
 
-# Install LWIP library used by service
-ADD liblwip.so /var/lib/zerotier-one/liblwip.so
-
 # Add ZT files
 RUN mkdir -p /var/lib/zerotier-one/networks.d
 ADD monitor_identity.public /var/lib/zerotier-one/identity.public
@@ -14,6 +11,10 @@ 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 zerotier-one /
 ADD zerotier-cli /
 
diff --git a/netcon/docker-test/httpd/httpd-2.4.16-1.fc23.x86_64/monitor_entrypoint.sh b/netcon/docker-test/httpd/httpd-2.4.16-1.fc23.x86_64/monitor_entrypoint.sh
index 52470efd..c8fca5a3 100644
--- a/netcon/docker-test/httpd/httpd-2.4.16-1.fc23.x86_64/monitor_entrypoint.sh
+++ b/netcon/docker-test/httpd/httpd-2.4.16-1.fc23.x86_64/monitor_entrypoint.sh
@@ -49,7 +49,7 @@ touch "$bigfile_name"
 curl --connect-timeout "$app_timeout_time" -v -o "$bigfile_name" http://"$ncvirtip"/"$bigfile_name"
 
 # Check md5
-md5sum < "$bigfile_name" >> "$rx_md5sumfile"
+md5sum < "$bigfile_name" > "$rx_md5sumfile"
 rx_md5sum=$(<$rx_md5sumfile)
 tx_md5sum=$(<$tx_md5sumfile)
 
diff --git a/netcon/docker-test/httpd/httpd-2.4.16-1.fc23.x86_64/netcon_dockerfile b/netcon/docker-test/httpd/httpd-2.4.16-1.fc23.x86_64/netcon_dockerfile
index 3de8ed3f..0584107f 100644
--- a/netcon/docker-test/httpd/httpd-2.4.16-1.fc23.x86_64/netcon_dockerfile
+++ b/netcon/docker-test/httpd/httpd-2.4.16-1.fc23.x86_64/netcon_dockerfile
@@ -9,6 +9,14 @@ RUN yum clean all
 
 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 *.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
 
@@ -20,14 +28,6 @@ RUN cp libzerotierintercept.so.1.0 /lib/libzerotierintercept.so.1.0
 RUN ln -sf /lib/libzerotierintercept.so.1.0 /lib/libzerotierintercept
 RUN /usr/bin/install -c zerotier-intercept /usr/bin
 
-# 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 *.conf /var/lib/zerotier-one/networks.d/
-ADD *.conf /
-ADD *.name /
-
 ADD zerotier-one /
 ADD zerotier-cli /
 
diff --git a/netcon/docker-test/httpd/httpd-2.4.16-1.fc23.x86_64/netcon_entrypoint.sh b/netcon/docker-test/httpd/httpd-2.4.16-1.fc23.x86_64/netcon_entrypoint.sh
index 1c5dcbd1..bf11ebfc 100644
--- a/netcon/docker-test/httpd/httpd-2.4.16-1.fc23.x86_64/netcon_entrypoint.sh
+++ b/netcon/docker-test/httpd/httpd-2.4.16-1.fc23.x86_64/netcon_entrypoint.sh
@@ -37,8 +37,7 @@ export ZT_NC_NWID=$dev
 # Generate large random file for transfer test, share md5sum for monitor container to check
 echo '*** Generating ' "$bigfile_size" ' file'
 dd if=/dev/urandom of=/var/www/html/"$bigfile_name"  bs="$bigfile_size"  count=1
-#md5sum /var/www/html/"$bigfile_name" >> "$tx_md5sumfile"
-md5sum < /var/www/html/"$bigfile_name" >> "$tx_md5sumfile"
+md5sum < /var/www/html/"$bigfile_name" > "$tx_md5sumfile"
 echo '*** Wrote MD5 sum to ' "$tx_md5sumfile"
 
 echo '*** Starting application...'
diff --git a/netcon/docker-test/httpd/httpd-2.4.17-3.fc23.x86_64/httpd-2.4.17-3.fc23.x86_64.name b/netcon/docker-test/httpd/httpd-2.4.17-3.fc23.x86_64/httpd-2.4.17-3.fc23.x86_64.name
deleted file mode 100644
index e69de29b..00000000
--- a/netcon/docker-test/httpd/httpd-2.4.17-3.fc23.x86_64/httpd-2.4.17-3.fc23.x86_64.name
+++ /dev/null
diff --git a/netcon/docker-test/httpd/httpd-2.4.17-3.fc23.x86_64/monitor_dockerfile b/netcon/docker-test/httpd/httpd-2.4.17-3.fc23.x86_64/monitor_dockerfile
index e8f803cd..d2d2a0cb 100644
--- a/netcon/docker-test/httpd/httpd-2.4.17-3.fc23.x86_64/monitor_dockerfile
+++ b/netcon/docker-test/httpd/httpd-2.4.17-3.fc23.x86_64/monitor_dockerfile
@@ -4,9 +4,6 @@ MAINTAINER https://www.zerotier.com/
 
 EXPOSE 9993/udp
 
-# Install LWIP library used by service
-ADD liblwip.so /var/lib/zerotier-one/liblwip.so
-
 # Add ZT files
 RUN mkdir -p /var/lib/zerotier-one/networks.d
 ADD monitor_identity.public /var/lib/zerotier-one/identity.public
@@ -14,6 +11,10 @@ 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 zerotier-one /
 ADD zerotier-cli /
 
diff --git a/netcon/docker-test/httpd/httpd-2.4.17-3.fc23.x86_64/monitor_entrypoint.sh b/netcon/docker-test/httpd/httpd-2.4.17-3.fc23.x86_64/monitor_entrypoint.sh
index 52470efd..c8fca5a3 100644
--- a/netcon/docker-test/httpd/httpd-2.4.17-3.fc23.x86_64/monitor_entrypoint.sh
+++ b/netcon/docker-test/httpd/httpd-2.4.17-3.fc23.x86_64/monitor_entrypoint.sh
@@ -49,7 +49,7 @@ touch "$bigfile_name"
 curl --connect-timeout "$app_timeout_time" -v -o "$bigfile_name" http://"$ncvirtip"/"$bigfile_name"
 
 # Check md5
-md5sum < "$bigfile_name" >> "$rx_md5sumfile"
+md5sum < "$bigfile_name" > "$rx_md5sumfile"
 rx_md5sum=$(<$rx_md5sumfile)
 tx_md5sum=$(<$tx_md5sumfile)
 
diff --git a/netcon/docker-test/httpd/httpd-2.4.17-3.fc23.x86_64/netcon_dockerfile b/netcon/docker-test/httpd/httpd-2.4.17-3.fc23.x86_64/netcon_dockerfile
index 3a17acdd..d8dfb989 100644
--- a/netcon/docker-test/httpd/httpd-2.4.17-3.fc23.x86_64/netcon_dockerfile
+++ b/netcon/docker-test/httpd/httpd-2.4.17-3.fc23.x86_64/netcon_dockerfile
@@ -9,6 +9,14 @@ RUN yum clean all
 
 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 *.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
 
@@ -20,14 +28,6 @@ RUN cp libzerotierintercept.so.1.0 /lib/libzerotierintercept.so.1.0
 RUN ln -sf /lib/libzerotierintercept.so.1.0 /lib/libzerotierintercept
 RUN /usr/bin/install -c zerotier-intercept /usr/bin
 
-# 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 *.conf /var/lib/zerotier-one/networks.d/
-ADD *.conf /
-ADD *.name /
-
 ADD zerotier-one /
 ADD zerotier-cli /
 
diff --git a/netcon/docker-test/httpd/httpd-2.4.17-3.fc23.x86_64/netcon_entrypoint.sh b/netcon/docker-test/httpd/httpd-2.4.17-3.fc23.x86_64/netcon_entrypoint.sh
index 44f8db12..a7c82e60 100644
--- a/netcon/docker-test/httpd/httpd-2.4.17-3.fc23.x86_64/netcon_entrypoint.sh
+++ b/netcon/docker-test/httpd/httpd-2.4.17-3.fc23.x86_64/netcon_entrypoint.sh
@@ -39,7 +39,7 @@ export ZT_NC_NWID=$dev
 echo '*** Generating ' "$bigfile_size" ' file'
 dd if=/dev/urandom of=/var/www/html/"$bigfile_name"  bs="$bigfile_size"  count=1
 #md5sum /var/www/html/"$bigfile_name" >> "$tx_md5sumfile"
-md5sum < /var/www/html/"$bigfile_name" >> "$tx_md5sumfile"
+md5sum < /var/www/html/"$bigfile_name" > "$tx_md5sumfile"
 echo '*** Wrote MD5 sum to ' "$tx_md5sumfile"
 
 echo '*** Starting application...'
diff --git a/netcon/docker-test/httpd/httpd_demo/httpd_demo.name b/netcon/docker-test/httpd/httpd_demo/httpd_demo.name
deleted file mode 100644
index e69de29b..00000000
--- a/netcon/docker-test/httpd/httpd_demo/httpd_demo.name
+++ /dev/null
diff --git a/netcon/docker-test/httpd/httpd_demo/two_party_test.sh b/netcon/docker-test/httpd/httpd_demo/two_party_test.sh
new file mode 100755
index 00000000..164b0b2e
--- /dev/null
+++ b/netcon/docker-test/httpd/httpd_demo/two_party_test.sh
@@ -0,0 +1,17 @@
+#!/bin/bash
+
+# Runs test image and monitor image as daemons
+
+test_name=${PWD##*/}
+echo 'Building dockerfiles for test: ' "$test_name"
+touch "$test_name".name
+
+# Start netcon container to be tested
+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
+docker stop $(docker ps -a -q)
+docker rm $test_container
+docker rm $monitor_container
\ No newline at end of file