From b6b06d74a94acdff2010550b238ef88e03dc7f8a Mon Sep 17 00:00:00 2001
From: "Richard T. Carback III" <rick.carback@gmail.com>
Date: Fri, 8 Jan 2021 22:19:22 +0000
Subject: [PATCH] Update smoke infra config
---
basice2e/permissioning.yaml | 6 ++----
basice2e/run.sh | 15 +++++++++++----
basice2e/udb.yaml | 6 +++++-
smokeinfra/permissioning.yaml | 13 +++++++------
4 files changed, 25 insertions(+), 15 deletions(-)
diff --git a/basice2e/permissioning.yaml b/basice2e/permissioning.yaml
index 52897f0..4d98061 100644
--- a/basice2e/permissioning.yaml
+++ b/basice2e/permissioning.yaml
@@ -28,8 +28,8 @@ nodeMetricInterval: 3
disableGatewayPing: true
# UDB ID
-udbID: 1
-
+udbID: "AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAMD"
+udbAddress: "127.0.0.1:18001"
# Path to UDB public key PEM file
udbPubKeyPemPath: "../keys/cmix.rip.crt"
@@ -62,8 +62,6 @@ udbCertPath: "../keys/cmix.rip.crt"
# Path to the certificate file
serverCertPath: "../keys/cmix.rip.crt"
-udbID: 3
-
# Time interval (in minutes) in which the database is
# checked for banned nodes
BanTrackerInterval: "3"
diff --git a/basice2e/run.sh b/basice2e/run.sh
index 8b67be3..9fb0760 100755
--- a/basice2e/run.sh
+++ b/basice2e/run.sh
@@ -32,7 +32,14 @@ mkdir -p $CLIENTCLEAN
echo "STARTING SERVERS..."
-PERMCMD="../bin/permissioning --logLevel 2 -c permissioning.yaml "
+UDBID=$(../bin/client init -s results/udbsession -l results/udbidgen.log --password hello --ndf ndf.json)
+echo "GENERATED UDB ID: $UDBID"
+UDBID=$(sed -e 's/[&\\/]/\\&/g; s/$/\\/' -e '$s/\\$//' <<<"$UDBID")
+cp permissioning.yaml permissioning-actual.yaml
+sed -i "s/AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAMD/$UDBID/g" permissioning-actual.yaml
+
+
+PERMCMD="../bin/permissioning --logLevel 2 -c permissioning-actual.yaml "
$PERMCMD > results/permissioning-console.txt 2>&1 &
PIDVAL=$!
echo "$PERMCMD -- $PIDVAL"
@@ -116,7 +123,7 @@ echo "$UDBCMD -- $PIDVAL"
rm rid.txt || true
while [ ! -s rid.txt ] && [ $cnt -lt 30 ]; do
sleep 1
- grep -a "Gateway Polling for Message Reception Begun" results/udb-console.txt > rid.txt || true
+ grep -a "Sending Poll message" results/udb-console.txt > rid.txt || true
cnt=$(($cnt + 1))
echo -n "."
done
@@ -211,13 +218,13 @@ PIDVAL=$!
echo "$CLIENTCMD -- $PIDVAL"
wait $PIDVAL
-CLIENTCMD="timeout 240s ../bin/client ud $CLIENTUDOPTS -l $CLIENTOUT/client13.log -s blob13 --register josh13 --addemail josh13@elixxir.io --addphone 6178675309"
+CLIENTCMD="timeout 240s ../bin/client ud $CLIENTUDOPTS -l $CLIENTOUT/client13.log -s blob13 --register josh13 --addemail josh13@elixxir.io --addphone 6178675309US"
eval $CLIENTCMD >> $CLIENTOUT/client13.txt || true &
PIDVAL=$!
echo "$CLIENTCMD -- $PIDVAL"
wait $PIDVAL
-CLIENTCMD="timeout 240s ../bin/client ud $CLIENTUDOPTS -l $CLIENTOUT/client13.log -s blob13 --searchusername josh13 --searchemail josh13@elixxir.io --searchphone 6178675309"
+CLIENTCMD="timeout 240s ../bin/client ud $CLIENTUDOPTS -l $CLIENTOUT/client13.log -s blob13 --searchusername josh13 --searchemail josh13@elixxir.io --searchphone 6178675309US"
eval $CLIENTCMD >> $CLIENTOUT/client13.txt || true &
PIDVAL=$!
echo "$CLIENTCMD -- $PIDVAL"
diff --git a/basice2e/udb.yaml b/basice2e/udb.yaml
index 9c353db..8e34056 100644
--- a/basice2e/udb.yaml
+++ b/basice2e/udb.yaml
@@ -1,5 +1,9 @@
# UDB Config for E2E Integration test
logPath: "./results/udb.log"
-sessionfile: "./results/udb.session"
+sessionPath: "./results/udbsession"
+sessionPass: "hello"
certPath: "../keys/cmix.rip.crt"
ndfPath: "ndf.json"
+port: "18001"
+keyPath: "../keys/cmix.rip.key"
+permCertPath: "../keys/cmix.rip.crt"
diff --git a/smokeinfra/permissioning.yaml b/smokeinfra/permissioning.yaml
index c510989..d149d39 100644
--- a/smokeinfra/permissioning.yaml
+++ b/smokeinfra/permissioning.yaml
@@ -40,11 +40,8 @@ udbPubKeyPemPath: "../keys/cmix.rip.crt"
# Path to the file containing the update ID
updateIdPath: "results/updateId.txt"
-# === REQUIRED FOR ENABLING TLS ===
-# Path to the registration server private key file
-keyPath: "../keys/cmix.rip.key"
-# Path to the registration server certificate file
-certPath: "../keys/cmix.rip.crt"
+# Path to the UDB certificate file
+udbCertPath: "../keys/cmix.rip.crt"
ndfOutputPath: "results/permissions-ndfoutput.json"
@@ -56,7 +53,11 @@ certPath: "../keys/cmix.rip.crt"
# Path to the certificate file
serverCertPath: "../keys/cmix.rip.crt"
-udbID: 3
+udbID: "AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAMD"
+udbAddress: "127.0.0.1:18001"
+# Path to UDB public key PEM file
+udbPubKeyPemPath: "../keys/cmix.rip.crt"
+
# Time interval (in minutes) in which the database is
# checked for banned nodes
--
GitLab