Merge branch 'niamh/newidtest' into 'release'

Niamh/newidtest

See merge request elixxir/integration!75

basice2e/gateway-1.yaml

@@ -32,6 +32,8 @@ MessageTimeout: 1800
 keyPath: "../keys/cmix.rip.key"
 # Path to the certificate file
 certPath: "../keys/cmix.rip.crt"
+# Path to permissioning cert
+permissioningCertPath: "../keys/cmix.rip.crt"
 # Path to the certificate file
 serverCertPath: "../keys/cmix.rip.crt"
 IP_Whitelist_File: whitelist.txt

basice2e/gateway-2.yaml

@@ -33,6 +33,8 @@ MessageTimeout: 1800
 keyPath: "../keys/cmix.rip.key"
 # Path to the certificate file
 certPath: "../keys/cmix.rip.crt"
+# Path to the permissioning certificate
+permissioningCertPath: "../keys/cmix.rip.crt"
 # Path to the certificate file
 serverCertPath: "../keys/cmix.rip.crt"
 IP_Whitelist_File: whitelist.txt

basice2e/gateway-3.yaml

@@ -33,6 +33,8 @@ MessageTimeout: 1800
 keyPath: "../keys/cmix.rip.key"
 # Path to the certificate file
 certPath: "../keys/cmix.rip.crt"
+# Path to the permissioning certificate
+permissioningCertPath: "../keys/cmix.rip.crt"
 # Path to the certificate file
 serverCertPath: "../keys/cmix.rip.crt"
 IP_Whitelist_File: whitelist.txt

basice2e/gateway-4.yaml

@@ -32,6 +32,8 @@ MessageTimeout: 1800
 keyPath: "../keys/cmix.rip.key"
 # Path to the certificate file
 certPath: "../keys/cmix.rip.crt"
+# Path to the permissioning certificate
+permissioningCertPath: "../keys/cmix.rip.crt"
 # Path to the certificate file
 serverCertPath: "../keys/cmix.rip.crt"
 IP_Whitelist_File: whitelist.txt

basice2e/gateway-5.yaml

@@ -32,6 +32,8 @@ MessageTimeout: 1800
 keyPath: "../keys/cmix.rip.key"
 # Path to the certificate file
 certPath: "../keys/cmix.rip.crt"
+# Path to the permissioning certificate
+permissioningCertPath: "../keys/cmix.rip.crt"
 # Path to the certificate file
 serverCertPath: "../keys/cmix.rip.crt"
 IP_Whitelist_File: whitelist.txt

basice2e/nodeID-1.json

+{"salt":[1,197,186,106,177,151,123,222,1,61,203,46,42,5,143,45,65,126,211,70,97,212,45,80,66,130,74,95,205,181,22,183],"id":[1,41,213,172,226,28,227,142,249,215,77,236,126,155,189,11,11,38,7,122,206,168,34,24,130,182,156,100,206,108,209,23,2],"type":"node"}

basice2e/nodeID-2.json

+{"salt":[2,197,186,106,177,151,123,222,1,61,203,46,42,5,143,45,65,126,211,70,97,212,45,80,66,130,74,95,205,181,22,183],"id":[2,41,213,172,226,28,227,142,249,215,77,236,126,155,189,11,11,38,7,122,206,168,34,24,130,182,156,100,206,108,209,23,2],"type":"node"}

basice2e/nodeID-3.json

+{"salt":[3,197,186,106,177,151,123,222,1,61,203,46,42,5,143,45,65,126,211,70,97,212,45,80,66,130,74,95,205,181,22,183],"id":[3,41,213,172,226,28,227,142,249,215,77,236,126,155,189,11,11,38,7,122,206,168,34,24,130,182,156,100,206,108,209,23,2],"type":"node"}

basice2e/nodeID-4.json

+{"salt":[4,197,186,106,177,151,123,222,1,61,203,46,42,5,143,45,65,126,211,70,97,212,45,80,66,130,74,95,205,181,22,183],"id":[4,41,213,172,226,28,227,142,249,215,77,236,126,155,189,11,11,38,7,122,206,168,34,24,130,182,156,100,206,108,209,23,2],"type":"node"}

basice2e/nodeID-5.json

+{"salt":[5,197,186,106,177,151,123,222,1,61,203,46,42,5,143,45,65,126,211,70,97,212,45,80,66,130,74,95,205,181,22,183],"id":[5,41,213,172,226,28,227,142,249,215,77,236,126,155,189,11,11,38,7,122,206,168,34,24,130,182,156,100,206,108,209,23,2],"type":"node"}

basice2e/permissioning.yaml

@@ -8,6 +8,8 @@ logLevel: 1
 # Path to log file
 logPath: "results/permissioning.log"
 
+ndfOutputPath: "results/ndf.json"
+
 # The listening port of this server
 port: 18000
 
@@ -19,14 +21,6 @@ dbAddress: ""
 
 minimumNodes: 5
 
-# List of Node registration codes (in order of network placement)
-registrationCodes:
-  - "AAAA"
-  - "BBBB"
-  - "CCCC"
-  - "DDDD"
-  - "EEEE"
-
 clientRegCodes:
   - "FFFF"
   - "GGGG"

basice2e/server-1.yaml

@@ -11,8 +11,8 @@ logLevel: 1
 useGpu: false
 
 node:
-    id: ""
     paths:
+        idf:  "nodeID-1.json"
         cert: "../keys/cmix.rip.crt"
         key:  "../keys/cmix.rip.key"
         log:  "results/servers/server-1.log"

basice2e/server-2.yaml

@@ -11,8 +11,8 @@ logLevel: 1
 useGpu: false
 
 node:
-    id: ""
     paths:
+        idf:  "nodeID-2.json"
         cert: "../keys/cmix.rip.crt"
         key:  "../keys/cmix.rip.key"
         log:  "results/servers/server-2.log"

basice2e/server-3.yaml

@@ -11,8 +11,8 @@ logLevel: 1
 useGpu: false
 
 node:
-    id: ""
     paths:
+        idf:  "nodeID-3.json"
         cert: "../keys/cmix.rip.crt"
         key:  "../keys/cmix.rip.key"
         log:  "results/servers/server-3.log"

basice2e/server-4.yaml

@@ -11,8 +11,8 @@ logLevel: 1
 useGpu: false
 
 node:
-    id: ""
     paths:
+        idf:  "nodeID-4.json"
         cert: "../keys/cmix.rip.crt"
         key:  "../keys/cmix.rip.key"
         log:  "results/servers/server-4.log"

basice2e/server-5.yaml

@@ -11,8 +11,8 @@ logLevel: 1
 useGpu: false
 
 node:
-    id: ""
     paths:
+        idf:  "nodeID-5.json"
         cert: "../keys/cmix.rip.crt"
         key:  "../keys/cmix.rip.key"
         log:  "results/servers/server-5.log"