Update simple testing suite

safing · Oct 4, 2023 · 415623f · 415623f
1 parent ceabefb
commit 415623f
Show file tree

Hide file tree

Showing 5 changed files with 31 additions and 5 deletions.
diff --git a/testing/simple/config-template.json b/testing/simple/config-template.json
@@ -11,8 +11,9 @@
   "spn": {
     "publicHub": {
       "name": "test-$HUBNAME",
-      "transports": ["http:80", "tcp:17"],
-      "allowUnencrypted": true
+      "transports": ["http:80", "http:8080", "tcp:17"],
+      "allowUnencrypted": true,
+      "bindToAdvertised": true
     }
   }
 }
diff --git a/testing/simple/inject-intel.sh b/testing/simple/inject-intel.sh
@@ -2,7 +2,7 @@
 
 cd "$( dirname "${BASH_SOURCE[0]}" )"
 
-MAIN_INTEL_FILE="main-intel.json"
+MAIN_INTEL_FILE="intel-testnet.json"
 
 if [[ ! -f $MAIN_INTEL_FILE ]]; then
   echo "missing $MAIN_INTEL_FILE"

diff --git a/testing/simple/intel-client.yaml b/testing/simple/intel-client.yaml
@@ -0,0 +1,25 @@
+# Get current list of IDs from test net:
+#   curl http://127.0.0.1:817/api/v1/spn/map/test/pins | jq ".[] | .ID"
+# Then import into test client with:
+#   curl -X POST --upload-file intel-client.yaml http://127.0.0.1:817/api/v1/spn/map/test/intel/update
+Hubs:
+  Zwm48YWWFGdwXjhE1MyEkWfqxPr9DiUBoXpusTZ1FMQnuK:
+    Trusted: true
+  Zwu5LkkbfCbAcYxWG3vtWF1VvWjgWpc1GJfkwRdLFNtytV:
+    Trusted: true
+  ZwuQpz5CqYmYoLnt9KXQ8oxnmosBzfrCYwCGhxT4fsG1Dz:
+    Trusted: true
+  ZwwmC3dHzr7J6XW9mc2KD6FDNuXwPVJUFi9dLnDSNMyjLk:
+    Trusted: true
+  ZwxSBdvqtJyz8zRWKZe6QyK51KH9av6VFay2GQvpFrWKHq:
+    Trusted: true
+  ZwxnuL6zMLj4AxJX8Bj369w2tNrVtYxzffVcXZuMxdxbGj:
+    Trusted: true
+  ZwyXdnC8JkC7m796skGD7QWGoYycByR3KVntkXMY8CxRZQ:
+    Trusted: true
+  Zwz7AHiH1EevD9eYFqvQQPbVWyBBcksTRxxafbRx5Cvc4F:
+    Trusted: true
+  ZwzMtc65t9XBMwmLm2xNSL69FvqHGPLiqeNBZ3eEN5a9sS:
+    Trusted: true
+  ZwzjnCUNGsuWnkYmN3QEj8JPLxU6V1QQFk9b47AigmPKiH:
+    Trusted: true
diff --git a/testing/simple/main-intel.json → testing/simple/intel-testnet.json b/testing/simple/main-intel.json → testing/simple/intel-testnet.json
diff --git a/testing/simple/stop.sh b/testing/simple/stop.sh
@@ -2,8 +2,8 @@
 
 cd "$( dirname "${BASH_SOURCE[0]}" )"
 
-docker-compose -p spn-test-simple stop
-docker-compose -p spn-test-simple rm
+docker compose -p spn-test-simple stop
+docker compose -p spn-test-simple rm
 
 oldnet=$(docker network ls | grep spn-test-simple | cut -d" " -f1)
 if [[ $oldnet != "" ]]; then