New test case: gen versus swap via gateway

[samplevnf.git] / VNFs / DPPD-PROX / helper-scripts / rapid / createrapid.py

diff --git a/VNFs/DPPD-PROX/helper-scripts/rapid/createrapid.py b/VNFs/DPPD-PROX/helper-scripts/rapid/createrapid.py
index efdf5e1..af1da30 100755 (executable)
--- a/VNFs/DPPD-PROX/helper-scripts/rapid/createrapid.py
+++ b/VNFs/DPPD-PROX/helper-scripts/rapid/createrapid.py
@@ -32,6 +32,8 @@ class RapidStackManager(object):
         options = config.options(section)
         for option in options:
             rapid_stack_params[option] = config.get(section, option)
+        if 'dataplane_subnet_mask' not in rapid_stack_params.keys():
+            rapid_stack_params['dataplane_subnet_mask'] = 24
         return (rapid_stack_params)
 
     @staticmethod
@@ -40,25 +42,22 @@ class RapidStackManager(object):
         stack_name = rapid_stack_params['stack_name']
         heat_template = rapid_stack_params['heat_template']
         heat_param = rapid_stack_params['heat_param']
-        keypair_name = rapid_stack_params['keypair_name']
         user = rapid_stack_params['user']
-        push_gateway = rapid_stack_params['push_gateway']
+        dataplane_subnet_mask = rapid_stack_params['dataplane_subnet_mask']
         deployment = StackDeployment(cloud_name)
-        deployment.deploy(stack_name, keypair_name, heat_template, heat_param)
-        deployment.generate_env_file(user, push_gateway)
+        deployment.deploy(stack_name, heat_template, heat_param)
+        deployment.generate_env_file(user, dataplane_subnet_mask)
 
 def main():
     rapid_stack_params = {}
     RapidStackManager.parse_config(rapid_stack_params)
     log_file = 'CREATE{}.log'.format(rapid_stack_params['stack_name'])
-    RapidLog.log_init(log_file, 'DEBUG', 'INFO', '2020.05.05')
+    RapidLog.log_init(log_file, 'DEBUG', 'INFO', '2021.03.15')
     #cloud_name = 'openstackL6'
     #stack_name = 'rapid'
     #heat_template = 'openstack-rapid.yaml'
     #heat_param = 'params_rapid.yaml'
-    #keypair_name = 'prox_key'
     #user = 'centos'
-    #push_gateway = None
     RapidStackManager.deploy_stack(rapid_stack_params)
 
 if __name__ == "__main__":