review sims/tpce process management in 2.2.1 tests

[transportpce.git] / tests / transportpce_tests / 2.2.1 / test_tapi.py

diff --git a/tests/transportpce_tests/2.2.1/test_tapi.py b/tests/transportpce_tests/2.2.1/test_tapi.py
index 3814042a943503387fddf5015d6a0204d005d8c7..6f7eb37a6c7ccc0eec4bfe3a6f7111af39121486 100644 (file)
--- a/tests/transportpce_tests/2.2.1/test_tapi.py
+++ b/tests/transportpce_tests/2.2.1/test_tapi.py
@@ -26,20 +26,14 @@ CREATED_SUCCESSFULLY = 'Result message should contain Xponder Roadm Link created
 
 
 class TransportTapitesting(unittest.TestCase):
-    odl_process = None
-    sim_process1 = None
-    sim_process2 = None
-    sim_process3 = None
-    sim_process4 = None
-    sim_process5 = None
 
-    # START_IGNORE_XTESTING
+    processes = None
 
     @classmethod
     def setUpClass(cls):
         cls.init_failed = False
 
-        cls.odl_process = test_utils.start_tpce()
+        cls.processes = test_utils.start_tpce()
         # TAPI feature is not installed by default in Karaf
         if "USE_LIGHTY" not in os.environ or os.environ['USE_LIGHTY'] != 'True':
             print("installing tapi feature...")
@@ -47,28 +41,20 @@ class TransportTapitesting(unittest.TestCase):
             if result.returncode != 0:
                 cls.init_failed = True
             print("Restarting opendaylight...")
-            test_utils.shutdown_process(cls.odl_process)
-            cls.odl_process = test_utils.start_tpce()
+            test_utils.shutdown_process(cls.processes[0])
+            cls.processes = test_utils.start_tpce()
             cls.init_failed = not test_utils.wait_until_log_contains(
                 test_utils.karaf_log, test_utils.KARAF_OK_START_MSG, time_to_wait=60)
         if cls.init_failed:
             print("tapi installaiton feature failed...")
-            test_utils.shutdown_process(cls.odl_process)
+            test_utils.shutdown_process(cls.odl_processes[0])
             exit(2)
-        cls.sim_process1 = test_utils.start_sim('xpdra')
-        cls.sim_process2 = test_utils.start_sim('roadma')
-        cls.sim_process3 = test_utils.start_sim('roadmc')
-        cls.sim_process4 = test_utils.start_sim('xpdrc')
-        cls.sim_process5 = test_utils.start_sim('spdrav2')
+        cls.processes = test_utils.start_sims(['xpdra', 'roadma', 'roadmc', 'xpdrc', 'spdrav2'])
 
     @classmethod
     def tearDownClass(cls):
-        test_utils.shutdown_process(cls.odl_process)
-        test_utils.shutdown_process(cls.sim_process1)
-        test_utils.shutdown_process(cls.sim_process2)
-        test_utils.shutdown_process(cls.sim_process3)
-        test_utils.shutdown_process(cls.sim_process4)
-        test_utils.shutdown_process(cls.sim_process5)
+        for process in cls.processes:
+            test_utils.shutdown_process(process)
         print("all processes killed")
 
     def setUp(self):  # instruction executed before each test method
@@ -76,9 +62,8 @@ class TransportTapitesting(unittest.TestCase):
             self.fail('Feature installation failed')
         print("execution of {}".format(self.id().split(".")[-1]))
 
-    # END_IGNORE_XTESTING
-
     #  connect netconf devices
+
     def test_00_connect_spdr_sa1(self):
         url = ("{}/config/network-topology:"
                "network-topology/topology/topology-netconf/node/SPDR-SA1"