review SPDR sims nomenclature

Signed-off-by: guillaume.lambert <guillaume.lambert@orange.com>
Change-Id: I597e787bf9d9dc835ae0a7d46d16563774f5efb3

diff --git a/tests/Xtesting/DockerSims/dockercmd_profile.sh b/tests/Xtesting/DockerSims/dockercmd_profile.sh
index 5a8b2db5688515004bfce52b4391f48f7265b65d..64692f48a07b23f577e56fa99f4bf0a84435c30f 100755 (executable)
--- a/tests/Xtesting/DockerSims/dockercmd_profile.sh
+++ b/tests/Xtesting/DockerSims/dockercmd_profile.sh
@@ -22,8 +22,8 @@ IMAGE221_LIST="40:xpdra-2.2.1:2.2.1/oper-XPDRA.xml
 42:roadmb-2.2.1:2.2.1/oper-ROADMB.xml
 43:roadmc-2.2.1:2.2.1/oper-ROADMC.xml
 44:xpdrc-2.2.1:2.2.1/oper-XPDRC.xml
-45:spdrav2-2.2.1:2.2.1/oper-SPDRAv2.xml
-46:spdrav1-2.2.1:2.2.1/oper-SPDRAv1.xml
+45:spdra-2.2.1:2.2.1/oper-SPDRA.xml
+25:spdra_no_interface-2.2.1:2.2.1/oper-SPDRA_no_interface.xml
 "
 
 case "$DEVICE_VERSION" in

diff --git a/tests/sample_configs/openroadm/2.2.1/oper-SPDRAv2.xml b/tests/sample_configs/openroadm/2.2.1/oper-SPDRA.xml
similarity index 100%
rename from tests/sample_configs/openroadm/2.2.1/oper-SPDRAv2.xml
rename to tests/sample_configs/openroadm/2.2.1/oper-SPDRA.xml

diff --git a/tests/sample_configs/openroadm/2.2.1/oper-SPDRAv1.xml b/tests/sample_configs/openroadm/2.2.1/oper-SPDRA_no_interface.xml
similarity index 100%
rename from tests/sample_configs/openroadm/2.2.1/oper-SPDRAv1.xml
rename to tests/sample_configs/openroadm/2.2.1/oper-SPDRA_no_interface.xml

diff --git a/tests/transportpce_tests/2.2.1/simulators.py b/tests/transportpce_tests/2.2.1/simulators.py
index 730acbab7464a79290b3e6f50a98ffc0c0678e28..7114e02b6680d78820dcb808574bf365c7034534 100644 (file)
--- a/tests/transportpce_tests/2.2.1/simulators.py
+++ b/tests/transportpce_tests/2.2.1/simulators.py
@@ -16,8 +16,8 @@ SIMS = {
     'roadmb': {'port': '17842', 'configfile': 'oper-ROADMB.xml', 'logfile': 'oper-ROADMB.log'},
     'roadmc': {'port': '17843', 'configfile': 'oper-ROADMC.xml', 'logfile': 'oper-ROADMC.log'},
     'xpdrc': {'port': '17844', 'configfile': 'oper-XPDRC.xml', 'logfile': 'oper-XPDRC.log'},
-    'spdrav2': {'port': '17845', 'configfile': 'oper-SPDRAv2.xml', 'logfile': 'oper-SPDRAv2.log'},
-    'spdrav1': {'port': '17846', 'configfile': 'oper-SPDRAv1.xml', 'logfile': 'oper-SPDRAv1.log'}
+    'spdra': {'port': '17845', 'configfile': 'oper-SPDRA.xml', 'logfile': 'oper-SPDRA.log'},
+    'spdra_no_interface': {'port': '17825', 'configfile': 'oper-SPDRA_no_interface.xml', 'logfile': 'oper-SPDRA.log'}
 }
 
 HONEYNODE_EXECUTABLE = os.path.join(

diff --git a/tests/transportpce_tests/2.2.1/test_otn_renderer.py b/tests/transportpce_tests/2.2.1/test_otn_renderer.py
index 8a3b86e4110d07e20d3140d065c62b04b0c1eb83..0cc60cf91aa0ceafddfe6a61116b62a50fd071ed 100644 (file)
--- a/tests/transportpce_tests/2.2.1/test_otn_renderer.py
+++ b/tests/transportpce_tests/2.2.1/test_otn_renderer.py
@@ -23,7 +23,7 @@ class TransportPCEtesting(unittest.TestCase):
     @classmethod
     def setUpClass(cls):
         cls.processes = test_utils.start_tpce()
-        cls.processes = test_utils.start_sims(['spdrav2'])
+        cls.processes = test_utils.start_sims(['spdra'])
 
     @classmethod
     def tearDownClass(cls):
@@ -35,7 +35,7 @@ class TransportPCEtesting(unittest.TestCase):
         time.sleep(5)
 
     def test_01_connect_SPDR_SA1(self):
-        response = test_utils.mount_device("SPDR-SA1", 'spdrav2')
+        response = test_utils.mount_device("SPDR-SA1", 'spdra')
         self.assertEqual(response.status_code, requests.codes.created, test_utils.CODE_SHOULD_BE_201)
         time.sleep(10)
 

diff --git a/tests/transportpce_tests/2.2.1/test_otn_topology.py b/tests/transportpce_tests/2.2.1/test_otn_topology.py
index 97b6d4e9234fc832b872cccdf7fbf670577d4f10..42bb7bcc53c68a0370df62bd2670ebf3be49bbc2 100644 (file)
--- a/tests/transportpce_tests/2.2.1/test_otn_topology.py
+++ b/tests/transportpce_tests/2.2.1/test_otn_topology.py
@@ -23,7 +23,7 @@ class TransportPCEtesting(unittest.TestCase):
     @classmethod
     def setUpClass(cls):
         cls.processes = test_utils.start_tpce()
-        cls.processes = test_utils.start_sims(['spdrav2'])
+        cls.processes = test_utils.start_sims(['spdra'])
 
     @classmethod
     def tearDownClass(cls):
@@ -35,7 +35,7 @@ class TransportPCEtesting(unittest.TestCase):
         time.sleep(5)
 
     def test_01_connect_SPDR_SA1(self):
-        response = test_utils.mount_device("SPDR-SA1", 'spdrav2')
+        response = test_utils.mount_device("SPDR-SA1", 'spdra')
         self.assertEqual(response.status_code, requests.codes.created, test_utils.CODE_SHOULD_BE_201)
         time.sleep(10)
 

diff --git a/tests/transportpce_tests/2.2.1/test_tapi.py b/tests/transportpce_tests/2.2.1/test_tapi.py
index 773718def313dc7672d7c13f09138a1f27176e7d..2225e75de8ef98dd9891db71ba7ca8c7e93c25c7 100644 (file)
--- a/tests/transportpce_tests/2.2.1/test_tapi.py
+++ b/tests/transportpce_tests/2.2.1/test_tapi.py
@@ -45,7 +45,7 @@ class TransportTapitesting(unittest.TestCase):
             print("tapi installation feature failed...")
             test_utils.shutdown_process(cls.processes[0])
             sys.exit(2)
-        cls.processes = test_utils.start_sims(['xpdra', 'roadma', 'roadmc', 'xpdrc', 'spdrav2'])
+        cls.processes = test_utils.start_sims(['xpdra', 'roadma', 'roadmc', 'xpdrc', 'spdra'])
 
     @classmethod
     def tearDownClass(cls):
@@ -59,7 +59,7 @@ class TransportTapitesting(unittest.TestCase):
         print("execution of {}".format(self.id().split(".")[-1]))
 
     def test_00_connect_spdr_sa1(self):
-        response = test_utils.mount_device("SPDR-SA1", 'spdrav2')
+        response = test_utils.mount_device("SPDR-SA1", 'spdra')
         self.assertEqual(response.status_code, requests.codes.created, test_utils.CODE_SHOULD_BE_201)
         time.sleep(10)
         # TODO replace connect and disconnect timers with test_utils.wait_until_log_contains