Create a unique machine name

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

diff --git a/VNFs/DPPD-PROX/helper-scripts/rapid/runrapid.py b/VNFs/DPPD-PROX/helper-scripts/rapid/runrapid.py
index f3d489d..f5b722c 100755 (executable)
--- a/VNFs/DPPD-PROX/helper-scripts/rapid/runrapid.py
+++ b/VNFs/DPPD-PROX/helper-scripts/rapid/runrapid.py
@@ -43,6 +43,12 @@ class RapidTestManager(object):
     """
     RapidTestManager Class
     """
+    def __init__(self):
+        """
+        Init Function
+        """
+        self.machines = []
+
     def __del__(self):
         for machine in self.machines:
             machine.close_prox()
@@ -57,9 +63,17 @@ class RapidTestManager(object):
         monitor_gen = monitor_sut = False
         background_machines = []
         sut_machine = gen_machine = None
-        self.machines = []
         configonly = test_params['configonly']
+        machine_names = []
+        machine_counter = {}
         for machine_params in test_params['machines']:
+            if machine_params['name'] not in machine_names:
+                machine_names.append(machine_params['name'])
+                machine_counter[machine_params['name']] = 1
+            else:
+                machine_counter[machine_params['name']] += 1
+                machine_params['name'] = '{}_{}'.format(machine_params['name'],
+                        machine_counter[machine_params['name']])
             if 'gencores' in machine_params.keys():
                 machine = RapidGeneratorMachine(test_params['key'],
                         test_params['user'], test_params['password'],
@@ -109,7 +123,8 @@ class RapidTestManager(object):
                             test_params['TestName'],
                             test_params['environment_file'],
                             gen_machine,
-                            sut_machine, background_machines)
+                            sut_machine, background_machines,
+                            test_params['sleep_time'])
                 elif test_param['test'] in ['corestatstest']:
                     test = CoreStatsTest(test_param,
                             test_params['runtime'],
@@ -168,7 +183,12 @@ def main():
     test_params = RapidCli.process_cli(test_params)
     _, test_file_name = os.path.split(test_params['test_file'])
     _, environment_file_name = os.path.split(test_params['environment_file'])
-    log_file = 'RUN{}.{}.log'.format(environment_file_name, test_file_name)
+    if 'resultsdir' in test_params:
+        res_dir = test_params['resultsdir']
+        log_file = '{}/RUN{}.{}.log'.format(res_dir,environment_file_name,
+                test_file_name)
+    else:
+        log_file = 'RUN{}.{}.log'.format(environment_file_name, test_file_name)
     RapidLog.log_init(log_file, test_params['loglevel'],
             test_params['screenloglevel'] , test_params['version']  )
     test_manager = RapidTestManager()