Changes for smokeinfra for new teaming algorithm

.gitlab-ci.yml

@@ -141,7 +141,7 @@ smokeinfraBatch4:
     - echo $PWD
     - cd smokeinfra
     - git checkout -- .
-    - sed -i 's/\ 42/\ 4/g' *.yaml
+    - sed -i 's/\ 42,/\ 4,/g' registration.json
     - ./run.sh
     - cd ..
   artifacts:

smokeinfra/gateway-1.yaml

@@ -38,8 +38,6 @@ IP_Whitelist_File: whitelist.txt
 
 ### Anything below this line is to be deprecated ###
 
-# Batch size of the cMix Network (to be deprecated)
-batchSize: 42
 groups:
   cmix:
     prime: "F6FAC7E480EE519354C058BF856AEBDC43AD60141BAD5573910476D030A869979A7E23F5FC006B6CE1B1D7CDA849BDE46A145F80EE97C21AA2154FA3A5CF25C75E225C6F3384D3C0C6BEF5061B87E8D583BEFDF790ECD351F6D2B645E26904DE3F8A9861CC3EAD0AA40BD7C09C1F5F655A9E7BA7986B92B73FD9A6A69F54EFC92AC7E21D15C9B85A76084D1EEFBC4781B91E231E9CE5F007BC75A8656CBD98E282671C08A5400C4E4D039DE5FD63AA89A618C5668256B12672C66082F0348B6204DD0ADE58532C967D055A5D2C34C43DF9998820B5DFC4C49C6820191CB3EC81062AA51E23CEEA9A37AB523B24C0E93B440FDC17A50B219AB0D373014C25EE8F"

smokeinfra/gateway-2.yaml

@@ -34,8 +34,6 @@ serverCertPath: "../keys/cmix.rip.crt"
 
 ### Anything below this line is to be deprecated ###
 
-# Batch size of the cMix Network (to be deprecated)
-batchSize: 42
 groups:
   cmix:
     prime: "F6FAC7E480EE519354C058BF856AEBDC43AD60141BAD5573910476D030A869979A7E23F5FC006B6CE1B1D7CDA849BDE46A145F80EE97C21AA2154FA3A5CF25C75E225C6F3384D3C0C6BEF5061B87E8D583BEFDF790ECD351F6D2B645E26904DE3F8A9861CC3EAD0AA40BD7C09C1F5F655A9E7BA7986B92B73FD9A6A69F54EFC92AC7E21D15C9B85A76084D1EEFBC4781B91E231E9CE5F007BC75A8656CBD98E282671C08A5400C4E4D039DE5FD63AA89A618C5668256B12672C66082F0348B6204DD0ADE58532C967D055A5D2C34C43DF9998820B5DFC4C49C6820191CB3EC81062AA51E23CEEA9A37AB523B24C0E93B440FDC17A50B219AB0D373014C25EE8F"

smokeinfra/gateway-3.yaml

@@ -38,7 +38,6 @@ serverCertPath: "../keys/cmix.rip.crt"
 ### Anything below this line is to be deprecated ###
 
 # Batch size of the cMix Network (to be deprecated)
-batchSize: 42
 groups:
   cmix:
     prime: "F6FAC7E480EE519354C058BF856AEBDC43AD60141BAD5573910476D030A869979A7E23F5FC006B6CE1B1D7CDA849BDE46A145F80EE97C21AA2154FA3A5CF25C75E225C6F3384D3C0C6BEF5061B87E8D583BEFDF790ECD351F6D2B645E26904DE3F8A9861CC3EAD0AA40BD7C09C1F5F655A9E7BA7986B92B73FD9A6A69F54EFC92AC7E21D15C9B85A76084D1EEFBC4781B91E231E9CE5F007BC75A8656CBD98E282671C08A5400C4E4D039DE5FD63AA89A618C5668256B12672C66082F0348B6204DD0ADE58532C967D055A5D2C34C43DF9998820B5DFC4C49C6820191CB3EC81062AA51E23CEEA9A37AB523B24C0E93B440FDC17A50B219AB0D373014C25EE8F"

smokeinfra/permissioning.yaml

@@ -8,8 +8,6 @@ logLevel: 1
 # Path to log file
 logPath: "results/permissioning.log"
 
-batchSize: 42
-
 # The listening port of this server
 port: 18000
 
@@ -19,6 +17,21 @@ dbPassword: ""
 dbName: ""
 dbAddress: ""
 
+# Selection of scheduling algorithem to use. Options are:
+#   simple - Schedules multiple teams to maximize performance, does not randomly re-arrange teams, if only a single
+#            only scheduling a single team, will use numerical ordering data for AlphaNet
+#   secure - Schedules new teams randomly, has apropreate buffers to ensure unpredictability, designed for BetaNet
+schedulingAlgorithm: "simple"
+
+# Path to file with config for scheduling algorithem within the user directory
+schedulingConfigPath: "registration.json"
+
+# Path to JSON file with list of Node registration codes (in order of network
+# placement)
+RegCodesFilePath: "regCodes.json"
+
+minimumNodes: 3
+
 # List of Node registration codes (in order of network placement)
 registrationCodes:
   - "AAAA"

smokeinfra/regCodes.json

+[{"RegCode": "AAAA", "Order": "0"},{"RegCode": "BBBB", "Order": "1"},{"RegCode": "CCCC", "Order": "2"}]

smokeinfra/registration.json

+{
+    "TeamSize": 3,
+    "BatchSize": 42,
+    "RandomOrdering": false,
+    "MinimumDelay": 300
+ }

smokeinfra/rid.txt

+INFO 2020/05/11 18:26:39 [BJRMuGLveua8prM/udGT3rfn2pZk8rrdOs7gKgMbsLM=:60002]: RID 1 ReceiveFinishRealtime END

smokeinfra/server-1.yaml

@@ -4,8 +4,6 @@
 ##                                                                             #
 ## All rights reserved.                                                        #
 ################################################################################
-# batch size
-batch: 42
 skipReg: true
 # Log message level
 logLevel: 1

smokeinfra/server-2.yaml

@@ -4,8 +4,6 @@
 ##                                                                             #
 ## All rights reserved.                                                        #
 ################################################################################
-# batch size
-batch: 42
 skipReg: true
 # Log message level
 logLevel: 1

smokeinfra/server-3.yaml

@@ -4,8 +4,6 @@
 ##                                                                             #
 ## All rights reserved.                                                        #
 ################################################################################
-# batch size
-batch: 42
 skipReg: true
 # Log message level
 logLevel: 1