T-API support in Lighty

[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 159cfbd038ccea62064b63e4e8ced9d1038409cf..ed2ec846f05c237b66ec11f40af0d126a78d9ac2 100644 (file)
--- a/tests/transportpce_tests/2.2.1/test_tapi.py
+++ b/tests/transportpce_tests/2.2.1/test_tapi.py
@@ -36,48 +36,46 @@ class TransportTapitesting(unittest.TestCase):
     # START_IGNORE_XTESTING
 
     @classmethod
-    @unittest.skipIf("USE_LIGHTY" in os.environ and os.environ['USE_LIGHTY'] == 'True',
-                     "not supported for lighty")
     def setUpClass(cls):
         cls.init_failed = False
-        karaf_log = os.path.join(
-            os.path.dirname(os.path.realpath(__file__)),
-            "..", "..", "..", "karaf", "target", "assembly", "data", "log", "karaf.log")
-        searched_expr = re.escape("Blueprint container for bundle "
-                                  "org.opendaylight.netconf.restconf") + ".* was successfully created"
 
         print("starting opendaylight...")
         cls.odl_process = test_utils.start_tpce()
-        found = test_utils.wait_until_log_contains(karaf_log, searched_expr, time_to_wait=60)
-        cls.init_failed = not found
-        if not cls.init_failed:
-            print("opendaylight started")
-
-            print("installing tapi feature...")
-            result = test_utils.install_karaf_feature("odl-transportpce-tapi")
-            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()
+        if "USE_LIGHTY" not in os.environ or os.environ['USE_LIGHTY'] != 'True':
+            karaf_log = os.path.join(
+                os.path.dirname(os.path.realpath(__file__)),
+                "..", "..", "..", "karaf", "target", "assembly", "data", "log", "karaf.log")
+            searched_expr = re.escape("Blueprint container for bundle "
+                                      "org.opendaylight.netconf.restconf") + ".* was successfully created"
             found = test_utils.wait_until_log_contains(karaf_log, searched_expr, time_to_wait=60)
             cls.init_failed = not found
             if not cls.init_failed:
-                print("starting XPDRA...")
-                cls.honeynode_process1 = test_utils.start_xpdra_honeynode()
+                print("opendaylight started")
+                print("installing tapi feature...")
+                result = test_utils.install_karaf_feature("odl-transportpce-tapi")
+                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()
+                found = test_utils.wait_until_log_contains(karaf_log, searched_expr, time_to_wait=60)
+                cls.init_failed = not found
+        if not cls.init_failed:
+            print("starting XPDRA...")
+            cls.honeynode_process1 = test_utils.start_xpdra_honeynode()
 
-                print("starting ROADMA...")
-                cls.honeynode_process2 = test_utils.start_roadma_honeynode()
+            print("starting ROADMA...")
+            cls.honeynode_process2 = test_utils.start_roadma_honeynode()
 
-                print("starting ROADMC...")
-                cls.honeynode_process3 = test_utils.start_roadmc_honeynode()
+            print("starting ROADMC...")
+            cls.honeynode_process3 = test_utils.start_roadmc_honeynode()
 
-                print("starting XPDRC...")
-                cls.honeynode_process4 = test_utils.start_xpdrc_honeynode()
+            print("starting XPDRC...")
+            cls.honeynode_process4 = test_utils.start_xpdrc_honeynode()
 
-                print("starting SPDRA...")
-                cls.honeynode_process5 = test_utils.start_spdra_honeynode()
-                print("all honeynodes started")
+            print("starting SPDRA...")
+            cls.honeynode_process5 = test_utils.start_spdra_honeynode()
+            print("all honeynodes started")
 
     @classmethod
     def tearDownClass(cls):