creation of tests and configs subdirectories

All test files are now in the tests directory. All PROX config files
moved to the configs directory. When specifying a test on the
runrapid.py command line, you should now also mention the directory:
e.g. --test tests/basicrapid.test
In these test files, you need now to also include the configs
subdirectory when specifying the prox configuration that needs to be
used.
The --map parameter has also changed. It can still take the file name
of the map file, that specifies which PROX instance to use during a
test. On top of that, you can now also specify a list of indices of the
machines to be used during a test: e.g. --map [1,3].

Change-Id: I887cba59834dd8c903a22bc80959b10da2775398
Signed-off-by: Luc Provoost <luc.provoost@intel.com>

1 files changed, 4 insertions, 2 deletions

diff --git a/VNFs/DPPD-PROX/helper-scripts/rapid/runrapid.py b/VNFs/DPPD-PROX/helper-scripts/rapid/runrapid.py
index 3bdb91d1..157bd8cc 100755
--- a/VNFs/DPPD-PROX/helper-scripts/rapid/runrapid.py
+++ b/VNFs/DPPD-PROX/helper-scripts/rapid/runrapid.py
@@ -22,6 +22,7 @@ from __future__ import division
 from future import standard_library
 standard_library.install_aliases()
 from builtins import object
+import os
 import sys
 import concurrent.futures
 from concurrent.futures import ALL_COMPLETED
@@ -141,8 +142,9 @@ def main():
     # When no cli is used, the process_cli can be replaced by code modifying
     # test_params
     test_params = RapidCli.process_cli(test_params)
-    log_file = 'RUN{}.{}.log'.format(test_params['environment_file'],
-            test_params['test_file'])
+    _, 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)
     RapidLog.log_init(log_file, test_params['loglevel'],
             test_params['screenloglevel'] , test_params['version']  )
     test_manager = RapidTestManager()