Fix the config.yaml including for each testcase

At each testcase, adapt the way config.yaml is included via
sdnvpn.lib.config.TestcaseConfig().
The full path should be included, instead of just the testcase name

JIRA: SDNVPN-180

Change-Id: I34828cc3681f08b843db49c6a221602b5b2022bf
Signed-off-by: tomsou <soth@intracom-telecom.com>

diff --git a/sdnvpn/test/functest/testcase_1.py b/sdnvpn/test/functest/testcase_1.py
index fc45143..937ab7a 100644 (file)
--- a/sdnvpn/test/functest/testcase_1.py
+++ b/sdnvpn/test/functest/testcase_1.py
@@ -20,7 +20,8 @@ from sdnvpn.lib.results import Results
 logger = logging.getLogger(__name__)
 
 COMMON_CONFIG = sdnvpn_config.CommonConfig()
-TESTCASE_CONFIG = sdnvpn_config.TestcaseConfig('testcase_1')
+TESTCASE_CONFIG = sdnvpn_config.TestcaseConfig(
+    'sdnvpn.test.functest.testcase_1')
 
 
 def main():

diff --git a/sdnvpn/test/functest/testcase_10.py b/sdnvpn/test/functest/testcase_10.py
index 15346e6..5c0e99b 100644 (file)
--- a/sdnvpn/test/functest/testcase_10.py
+++ b/sdnvpn/test/functest/testcase_10.py
@@ -29,12 +29,13 @@ parser.add_argument("-r", "--report",
 
 args = parser.parse_args()
 
-logger = logging.getLogger('sdnvpn-testcase-10')
+logger = logging.getLogger('__name__')
 
 std_out_lock = Lock()
 
 COMMON_CONFIG = sdnvpn_config.CommonConfig()
-TESTCASE_CONFIG = sdnvpn_config.TestcaseConfig('testcase_10')
+TESTCASE_CONFIG = sdnvpn_config.TestcaseConfig(
+    'sdnvpn.test.functest.testcase_10')
 
 
 def monitor(in_data, out_data, vm):

diff --git a/sdnvpn/test/functest/testcase_2.py b/sdnvpn/test/functest/testcase_2.py
index c904cfb..853e229 100644 (file)
--- a/sdnvpn/test/functest/testcase_2.py
+++ b/sdnvpn/test/functest/testcase_2.py
@@ -20,7 +20,8 @@ from sdnvpn.lib.results import Results
 logger = logging.getLogger(__name__)
 
 COMMON_CONFIG = sdnvpn_config.CommonConfig()
-TESTCASE_CONFIG = sdnvpn_config.TestcaseConfig('testcase_2')
+TESTCASE_CONFIG = sdnvpn_config.TestcaseConfig(
+    'sdnvpn.test.functest.testcase_2')
 
 
 def main():

diff --git a/sdnvpn/test/functest/testcase_3.py b/sdnvpn/test/functest/testcase_3.py
index 44e7366..e7b8207 100644 (file)
--- a/sdnvpn/test/functest/testcase_3.py
+++ b/sdnvpn/test/functest/testcase_3.py
@@ -27,7 +27,8 @@ from sdnvpn.lib.results import Results
 logger = logging.getLogger(__name__)
 
 COMMON_CONFIG = sdnvpn_config.CommonConfig()
-TESTCASE_CONFIG = sdnvpn_config.TestcaseConfig("testcase_3")
+TESTCASE_CONFIG = sdnvpn_config.TestcaseConfig(
+    "sdnvpn.test.functest.testcase_3")
 
 
 def main():

diff --git a/sdnvpn/test/functest/testcase_4.py b/sdnvpn/test/functest/testcase_4.py
index 7e6677b..e87cd6d 100644 (file)
--- a/sdnvpn/test/functest/testcase_4.py
+++ b/sdnvpn/test/functest/testcase_4.py
@@ -21,7 +21,8 @@ from sdnvpn.lib.results import Results
 logger = logging.getLogger(__name__)
 
 COMMON_CONFIG = sdnvpn_config.CommonConfig()
-TESTCASE_CONFIG = sdnvpn_config.TestcaseConfig('testcase_4')
+TESTCASE_CONFIG = sdnvpn_config.TestcaseConfig(
+    'sdnvpn.test.functest.testcase_4')
 
 
 def main():

diff --git a/sdnvpn/test/functest/testcase_7.py b/sdnvpn/test/functest/testcase_7.py
index 15a8ebf..abee8c8 100644 (file)
--- a/sdnvpn/test/functest/testcase_7.py
+++ b/sdnvpn/test/functest/testcase_7.py
@@ -30,7 +30,8 @@ from sdnvpn.lib.results import Results
 logger = logging.getLogger(__name__)
 
 COMMON_CONFIG = sdnvpn_config.CommonConfig()
-TESTCASE_CONFIG = sdnvpn_config.TestcaseConfig('testcase_7')
+TESTCASE_CONFIG = sdnvpn_config.TestcaseConfig(
+    'sdnvpn.test.functest.testcase_7')
 
 
 def main():

diff --git a/sdnvpn/test/functest/testcase_8.py b/sdnvpn/test/functest/testcase_8.py
index 773f73c..bab767d 100644 (file)
--- a/sdnvpn/test/functest/testcase_8.py
+++ b/sdnvpn/test/functest/testcase_8.py
@@ -30,7 +30,8 @@ from sdnvpn.lib.results import Results
 logger = logging.getLogger(__name__)
 
 COMMON_CONFIG = sdnvpn_config.CommonConfig()
-TESTCASE_CONFIG = sdnvpn_config.TestcaseConfig('testcase_8')
+TESTCASE_CONFIG = sdnvpn_config.TestcaseConfig(
+    'sdnvpn.test.functest.testcase_8')
 
 
 def main():

diff --git a/sdnvpn/test/functest/testcase_9.py b/sdnvpn/test/functest/testcase_9.py
index 053c02e..2fd067e 100644 (file)
--- a/sdnvpn/test/functest/testcase_9.py
+++ b/sdnvpn/test/functest/testcase_9.py
@@ -22,9 +22,10 @@ from sdnvpn.lib import utils as test_utils
 from sdnvpn.lib.results import Results
 
 COMMON_CONFIG = sdnvpn_config.CommonConfig()
-TESTCASE_CONFIG = sdnvpn_config.TestcaseConfig("testcase_9")
+TESTCASE_CONFIG = sdnvpn_config.TestcaseConfig(
+    "sdnvpn.test.functest.testcase_9")
 
-logger = logging.getLogger('sdnvpn-testcase-9')
+logger = logging.getLogger('__name__')
 
 parser = argparse.ArgumentParser()