Merge branch 'feature/XX-3113/getPublicIp' into 'release'

XX-3113 / Update address flags in gateway and server yaml files

See merge request elixxir/integration!106

basice2e/gateway-1.yaml

@@ -18,6 +18,11 @@ nodeAddress: "127.0.0.1:50000"
 # Required field.
 port: 8440
 
+# The public IPv4 address of the Gateway, as reported to the network, to use
+# instead of dynamically looking up Gateway's own IP address. If a port is not
+# included, then the port flag is used instead.
+overridePublicIP: "0.0.0.0"
+
 # The number of seconds a message should remain in the globals before being
 # deleted from the user's message queue
 messageTimeout: "1800s"

basice2e/gateway-2.yaml

@@ -18,6 +18,11 @@ nodeAddress: "127.0.0.1:50001"
 # Required field.
 port: 8441
 
+# The public IPv4 address of the Gateway, as reported to the network, to use
+# instead of dynamically looking up Gateway's own IP address. If a port is not
+# included, then the port flag is used instead.
+overridePublicIP: "0.0.0.0"
+
 # The number of seconds a message should remain in the globals before being
 # deleted from the user's message queue
 messageTimeout: "1800s"

basice2e/gateway-3.yaml

@@ -18,6 +18,11 @@ nodeAddress: "127.0.0.1:50002"
 # Required field.
 port: 8442
 
+# The public IPv4 address of the Gateway, as reported to the network, to use
+# instead of dynamically looking up Gateway's own IP address. If a port is not
+# included, then the port flag is used instead.
+overridePublicIP: "0.0.0.0"
+
 # The number of seconds a message should remain in the globals before being
 # deleted from the user's message queue
 messageTimeout: "1800s"

basice2e/gateway-4.yaml

@@ -18,6 +18,11 @@ nodeAddress: "127.0.0.1:50003"
 # Required field.
 port: 8443
 
+# The public IPv4 address of the Gateway, as reported to the network, to use
+# instead of dynamically looking up Gateway's own IP address. If a port is not
+# included, then the port flag is used instead.
+overridePublicIP: "0.0.0.0"
+
 # The number of seconds a message should remain in the globals before being
 # deleted from the user's message queue
 messageTimeout: "1800s"

basice2e/gateway-5.yaml

@@ -18,6 +18,11 @@ nodeAddress: "127.0.0.1:50004"
 # Required field.
 port: 8444
 
+# The public IPv4 address of the Gateway, as reported to the network, to use
+# instead of dynamically looking up Gateway's own IP address. If a port is not
+# included, then the port flag is used instead.
+overridePublicIP: "0.0.0.0"
+
 # The number of seconds a message should remain in the globals before being
 # deleted from the user's message queue
 messageTimeout: "1800s"

basice2e/run.sh

@@ -333,20 +333,33 @@ echo "$CLIENTCMD -- $PIDVAL"
 wait $PIDVAL
 wait $PIDVAL2
 
-# Single-use test
+
+# Single-use test: client53 sends message to client52; client52 responds with
+# the same message in the set number of message parts
 echo "TESTING SINGLE-USE"
-CLIENTCMD="timeout 240s ../bin/client single $CLIENTSINGLEOPTS -l $CLIENTOUT/client52.log -s blob52 --writeContact $CLIENTOUT/jono52-contact.bin --reply --timeout 90s"
-eval $CLIENTCMD >> $CLIENTOUT/client52.txt 2>&1 || true &
-PIDVAL1=$!
-echo "$CLIENTCMD -- $PIDVAL1"
-sleep 5
+
+# Generate contact file for client52
+CLIENTCMD="../bin/client init -s blob52 -l results/client52.log --password hello --ndf ndf.json --writeContact $CLIENTOUT/jono52-contact.bin"
+eval $CLIENTCMD >> /dev/null 2>&1 || true &
+PIDVAL=$!
+echo "$CLIENTCMD -- $PIDVAL"
+wait $PIDVAL
+
+# Start client53, which sends a message and then waits for a response
 CLIENTCMD="timeout 240s ../bin/client single $CLIENTSINGLEOPTS -l $CLIENTOUT/client53.log -s blob53 --maxMessages 8 --message \"Test single-use message\" --send -c $CLIENTOUT/jono52-contact.bin --timeout 90s"
 eval $CLIENTCMD >> $CLIENTOUT/client53.txt 2>&1 || true &
 PIDVAL2=$!
 echo "$CLIENTCMD -- $PIDVAL2"
+
+# Start client52, which waits for a message and then responds
+CLIENTCMD="timeout 240s ../bin/client single $CLIENTSINGLEOPTS -l $CLIENTOUT/client52.log -s blob52 --reply --timeout 90s"
+eval $CLIENTCMD >> $CLIENTOUT/client52.txt 2>&1 || true &
+PIDVAL1=$!
+echo "$CLIENTCMD -- $PIDVAL1"
 wait $PIDVAL1
 wait $PIDVAL2
 
+
 if [ "$PERMISSIONING" == "" ]
 then
     # UD Test

basice2e/server-1.yaml

@@ -17,7 +17,7 @@ node:
         errOutput: "results/servers/server-1.err"
         ipListOutput: "results/servers/iplist-1.txt"
     port: 50000
-    addressOverride: "127.0.0.1"
+    overridePublicIP: "127.0.0.1"
 database:
     name: "node1"
     username: "cmix_server"

basice2e/server-2.yaml

@@ -17,7 +17,7 @@ node:
         errOutput: "results/servers/server-2.err"
         ipListOutput: "results/servers/iplist-2.txt"
     port: 50001
-    addressOverride: "127.0.0.1"
+    overridePublicIP: "127.0.0.1"
 database:
     name: "node2"
     username: "cmix_server"

basice2e/server-3.yaml

@@ -17,7 +17,7 @@ node:
         errOutput: "results/servers/server-3.err"
         ipListOutput: "results/servers/iplist-3.txt"
     port: 50002
-    addressOverride: "127.0.0.1"
+    overridePublicIP: "127.0.0.1"
 database:
     name: "node3"
     username: "cmix_server"

basice2e/server-4.yaml

@@ -17,7 +17,7 @@ node:
         errOutput: "results/servers/server-4.err"
         ipListOutput: "results/servers/iplist-4.txt"
     port: 50003
-    addressOverride: "127.0.0.1"
+    overridePublicIP: "127.0.0.1"
 database:
     name: "node4"
     username: "cmix_server"

basice2e/server-5.yaml

@@ -17,7 +17,7 @@ node:
         errOutput: "results/servers/server-5.err"
         ipListOutput: "results/servers/iplist-5.txt"
     port: 50004
-    addressOverride: "127.0.0.1"
+    overridePublicIP: "127.0.0.1"
 database:
     name: "node5"
     username: "cmix_server"

smokeinfra/gateway-1.yaml

@@ -14,6 +14,11 @@ logLevel: 2
 # The public IP address and port of the node associated with this gateway
 nodeAddress: "127.0.0.1:60000"
 
+# The public IPv4 address of the Gateway, as reported to the network, to use
+# instead of dynamically looking up Gateway's own IP address. If a port is not
+# included, then the port flag is used instead.
+overridePublicIP: "0.0.0.0"
+
 # Port for Gateway to listen on. Gateway must be the only listener on this port.
 # Required field.
 port: 9440

smokeinfra/gateway-2.yaml

@@ -14,6 +14,11 @@ logLevel: 2
 # The public IP address and port of the node associated with this gateway
 nodeAddress: "127.0.0.1:60001"
 
+# The public IPv4 address of the Gateway, as reported to the network, to use
+# instead of dynamically looking up Gateway's own IP address. If a port is not
+# included, then the port flag is used instead.
+overridePublicIP: "0.0.0.0"
+
 # Port for Gateway to listen on. Gateway must be the only listener on this port.
 # Required field.
 port: 9441

smokeinfra/gateway-3.yaml

@@ -14,6 +14,11 @@ logLevel: 2
 # The public IP address and port of the node associated with this gateway
 nodeAddress: "127.0.0.1:60002"
 
+# The public IPv4 address of the Gateway, as reported to the network, to use
+# instead of dynamically looking up Gateway's own IP address. If a port is not
+# included, then the port flag is used instead.
+overridePublicIP: "0.0.0.0"
+
 # Port for Gateway to listen on. Gateway must be the only listener on this port.
 # Required field.
 port: 9442

smokeinfra/server-1.yaml

@@ -13,11 +13,11 @@ node:
         idf:  "nodeID-1.json"
         cert: "../keys/cmix.rip.crt"
         key:  "../keys/cmix.rip.key"
-        ipListOutput:  "results/ipList-1.txt"
         log:  "results/server-1.log"
+        ipListOutput: "results/ipList-1.txt"
         errOutput: "results/server-1.err"
     port: 60000
-    addressOverride: "127.0.0.1"
+    overridePublicIP: "127.0.0.1"
 database:
     name: "node1"
     username: "cmix_server"

smokeinfra/server-2.yaml

@@ -17,7 +17,7 @@ node:
         ipListOutput: "results/ipList-2.txt"
         errOutput: "results/server-2.err"
     port: 60001
-    addressOverride: "127.0.0.1"
+    overridePublicIP: "127.0.0.1"
 database:
     name: "node2"
     username: "cmix_server"

smokeinfra/server-3.yaml

@@ -17,7 +17,7 @@ node:
         ipListOutput: "results/ipList-3.txt"
         errOutput: "results/server-3.err"
     port: 60002
-    addressOverride: "127.0.0.1"
+    overridePublicIP: "127.0.0.1"
 database:
     name: "node3"
     username: "cmix_server"