diff --git a/basice2e/GeoBinDb.ico b/basice2e/GeoBinDb.ico new file mode 100644 index 0000000000000000000000000000000000000000..eb3ad759eaa4d668c2a0b9360c21dc72cb556f6d Binary files /dev/null and b/basice2e/GeoBinDb.ico differ diff --git a/basice2e/permissioning.yaml b/basice2e/permissioning.yaml index 7dda38cf91cebf51237fb3391b8d17b092d0c695..7df1a74afa47ad412419d33ebd927435b561ac2a 100644 --- a/basice2e/permissioning.yaml +++ b/basice2e/permissioning.yaml @@ -94,5 +94,7 @@ addressSpace: 32 disableGeoBinning: true +geoIPDBFile: "GeoBinDb.ico" + # Public address used in NDF to give to client registrationAddress: "0.0.0.0:11421" diff --git a/basice2e/registration.json b/basice2e/registration.json index 676f2d1a2ea2f72c6922e020f1b0d0d42203d3b2..50f648cc201b0e9053914d9536254882862d282b 100644 --- a/basice2e/registration.json +++ b/basice2e/registration.json @@ -1,12 +1,12 @@ { - "TeamSize": 5, + "TeamSize": 3, "BatchSize": 32, - "RandomOrdering": true, - "MinimumDelay": 1000, - "RealtimeDelay": 5000, + "MinimumDelay": 60, + "RealtimeDelay": 120, + "SemiOptimalOrdering": true, "Threshold": 3, "NodeCleanUpInterval": 3, - "ResourceQueueTimeout": 300000, - "Secure": false + "ResourceQueueTimeout": 300000 - } + +} diff --git a/smokeinfra/GeoBinDb.ico b/smokeinfra/GeoBinDb.ico new file mode 100644 index 0000000000000000000000000000000000000000..eb3ad759eaa4d668c2a0b9360c21dc72cb556f6d Binary files /dev/null and b/smokeinfra/GeoBinDb.ico differ diff --git a/smokeinfra/permissioning.yaml b/smokeinfra/permissioning.yaml index 14c9682b7cdf9b1218e3ee4d1f5a9e510931a5fe..73ef054bd4a965077789792bb632962170e2ae34 100644 --- a/smokeinfra/permissioning.yaml +++ b/smokeinfra/permissioning.yaml @@ -93,4 +93,6 @@ schedulingConfigPath: "registration.json" # placement) RegCodesFilePath: "regCodes.json" -disableGeoBinning: true +disableGeoBinning: false + +geoIPDBFile: "GeoBinDb.ico" diff --git a/smokeinfra/registration.json b/smokeinfra/registration.json index f84d6b3a4779ce296b49c9fafba035e90089f579..4d492b8600aa9f565f1ff46b3dfa433c0337cc64 100644 --- a/smokeinfra/registration.json +++ b/smokeinfra/registration.json @@ -1,12 +1,12 @@ { "TeamSize": 3, "BatchSize": 32, - "RandomOrdering": true, "MinimumDelay": 60, "RealtimeDelay": 120, + "SemiOptimalOrdering": true, "Threshold": 3, "NodeCleanUpInterval": 3, - "ResourceQueueTimeout": 300000, - "Secure": false + "ResourceQueueTimeout": 300000 + }