From 2e670932bd45a936561b04381e1881e98779885a Mon Sep 17 00:00:00 2001 From: josh <josh@elixxir.io> Date: Tue, 15 Mar 2022 16:10:09 -0700 Subject: [PATCH] Small refactor --- .../gateway_template.yaml} | 0 localNetwork/{configGen => configFileGeneration}/gen.py | 8 ++++---- .../permissioning_template.yaml} | 2 +- .../registration_template.json} | 0 .../server_template.yaml} | 0 5 files changed, 5 insertions(+), 5 deletions(-) rename localNetwork/{configGen/gateway.yaml => configFileGeneration/gateway_template.yaml} (100%) rename localNetwork/{configGen => configFileGeneration}/gen.py (95%) rename localNetwork/{configGen/permissioning.yaml => configFileGeneration/permissioning_template.yaml} (98%) rename localNetwork/{configGen/registration.json => configFileGeneration/registration_template.json} (100%) rename localNetwork/{configGen/server.yaml => configFileGeneration/server_template.yaml} (100%) diff --git a/localNetwork/configGen/gateway.yaml b/localNetwork/configFileGeneration/gateway_template.yaml similarity index 100% rename from localNetwork/configGen/gateway.yaml rename to localNetwork/configFileGeneration/gateway_template.yaml diff --git a/localNetwork/configGen/gen.py b/localNetwork/configFileGeneration/gen.py similarity index 95% rename from localNetwork/configGen/gen.py rename to localNetwork/configFileGeneration/gen.py index a166e6f..88799a5 100644 --- a/localNetwork/configGen/gen.py +++ b/localNetwork/configFileGeneration/gen.py @@ -16,19 +16,19 @@ node_ports = [] node_regCodes = [] server_template = "" -with open("server.yaml") as f: +with open("server_template.yaml") as f: server_template = f.read() gateway_template = "" -with open("gateway.yaml") as f: +with open("gateway_template.yaml") as f: gateway_template = f.read() reg_template = "" -with open("permissioning.yaml") as f: +with open("permissioning_template.yaml") as f: reg_template = f.read() reg_json_template = "" -with open("registration.json") as f: +with open("registration_template.json") as f: reg_json_template = f.read() # Generate a list of all ports servers and gateways occupy. Doing this as a diff --git a/localNetwork/configGen/permissioning.yaml b/localNetwork/configFileGeneration/permissioning_template.yaml similarity index 98% rename from localNetwork/configGen/permissioning.yaml rename to localNetwork/configFileGeneration/permissioning_template.yaml index a04f7f1..7f55fe1 100644 --- a/localNetwork/configGen/permissioning.yaml +++ b/localNetwork/configFileGeneration/permissioning_template.yaml @@ -86,7 +86,7 @@ groups: generator: "2" # Path to file with config for scheduling algorithem within the user directory -schedulingConfigPath: "registration.json" +schedulingConfigPath: "registration_template.json" # Path to JSON file with list of Node registration codes (in order of network # placement) diff --git a/localNetwork/configGen/registration.json b/localNetwork/configFileGeneration/registration_template.json similarity index 100% rename from localNetwork/configGen/registration.json rename to localNetwork/configFileGeneration/registration_template.json diff --git a/localNetwork/configGen/server.yaml b/localNetwork/configFileGeneration/server_template.yaml similarity index 100% rename from localNetwork/configGen/server.yaml rename to localNetwork/configFileGeneration/server_template.yaml -- GitLab