Merge branch 'release' of gitlab.com:elixxir/integration into feature/removeRandomOrdering

basice2e/permissioning.yaml

@@ -24,9 +24,11 @@ minServerVersion:  "3.0.0"
 minClientVersion: "2.0.0"
 nodeMetricInterval: 3
 
-disableGatewayPing: true
-disableNodePing: true
+# For testing, use the sequence as the country code. Do not use the geobinning database
+disableGeoBinning: true
 
+# For testing, do not exclude node or gateway IPs which are local to the machine
+allowLocalIPs: true
 # Disable pruning of NDF for offline nodes
 # if set to false, network will sleep for five minutes on start
 disableNDFPruning: true
@@ -92,8 +94,5 @@ RegCodesFilePath: "regCodes.json"
 # Set address space size for ephemeral IDs
 addressSpace: 32
 
-disableGeoBinning: false
-
-
 # Public address used in NDF to give to client
 registrationAddress: "0.0.0.0:11421"

smokeinfra/permissioning.yaml

@@ -26,8 +26,12 @@ minServerVersion:  "3.0.0"
 minClientVersion: "2.0.0"
 nodeMetricInterval: 3
 
-disableGatewayPing: true
-disableNodePing: true
+
+# For testing, use the sequence as the country code. Do not use the geobinning database
+disableGeoBinning: true
+
+# For testing, do not exclude node or gateway IPs which are local to the machine
+allowLocalIPs: true
 
 # Disable pruning of NDF for offline nodes
 # if set to false, network will sleep for five minutes on start
@@ -93,5 +97,3 @@ schedulingConfigPath: "registration.json"
 # placement)
 RegCodesFilePath: "regCodes.json"
 
-disableGeoBinning: false
-