From a084c9359a3bc8a954d70c0a88718e3419ea27ed Mon Sep 17 00:00:00 2001 From: "guillaume.lambert" Date: Thu, 8 Sep 2022 08:50:50 +0200 Subject: [PATCH] Improve feature install in functional tests There is no more need to restart the controller to take the feature installation into account. Signed-off-by: guillaume.lambert Change-Id: I9c7a39b3c41d6e1066817236e8832937820a2975 --- .../transportpce_tests/tapi/test01_abstracted_topology.py | 6 ------ tests/transportpce_tests/tapi/test02_full_topology.py | 6 ------ .../tapi/test03_tapi_device_change_notifications.py | 8 -------- .../with_docker/test02_nbinotifications.py | 6 ------ .../with_docker/test03_tapi_nbinotifications.py | 6 ------ 5 files changed, 32 deletions(-) diff --git a/tests/transportpce_tests/tapi/test01_abstracted_topology.py b/tests/transportpce_tests/tapi/test01_abstracted_topology.py index 9f33dd822..9394a24ee 100644 --- a/tests/transportpce_tests/tapi/test01_abstracted_topology.py +++ b/tests/transportpce_tests/tapi/test01_abstracted_topology.py @@ -152,12 +152,6 @@ class TransportTapitesting(unittest.TestCase): 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.processes[0]) - cls.processes[0] = test_utils.start_karaf() - test_utils.process_list[0] = cls.processes[0] - 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 installation feature failed...") test_utils.shutdown_process(cls.processes[0]) diff --git a/tests/transportpce_tests/tapi/test02_full_topology.py b/tests/transportpce_tests/tapi/test02_full_topology.py index 64ddc4394..ec8cc1e68 100644 --- a/tests/transportpce_tests/tapi/test02_full_topology.py +++ b/tests/transportpce_tests/tapi/test02_full_topology.py @@ -109,12 +109,6 @@ class TransportPCEtesting(unittest.TestCase): 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.processes[0]) - cls.processes[0] = test_utils.start_karaf() - test_utils.process_list[0] = cls.processes[0] - 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 installation feature failed...") test_utils.shutdown_process(cls.processes[0]) diff --git a/tests/transportpce_tests/tapi/test03_tapi_device_change_notifications.py b/tests/transportpce_tests/tapi/test03_tapi_device_change_notifications.py index 2c0a5db62..d6fc59e4b 100644 --- a/tests/transportpce_tests/tapi/test03_tapi_device_change_notifications.py +++ b/tests/transportpce_tests/tapi/test03_tapi_device_change_notifications.py @@ -118,18 +118,10 @@ class TransportPCEFulltesting(unittest.TestCase): 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.processes[0]) - cls.processes[0] = test_utils.start_karaf() - test_utils.process_list[0] = cls.processes[0] -# cause troubles after Chlorine bump -# 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 installation feature failed...") test_utils.shutdown_process(cls.processes[0]) sys.exit(2) - cls.processes = test_utils.start_tpce() cls.processes = test_utils.start_sims([('xpdra', cls.NODE_VERSION_221), ('roadma', cls.NODE_VERSION_221), ('roadmc', cls.NODE_VERSION_221), diff --git a/tests/transportpce_tests/with_docker/test02_nbinotifications.py b/tests/transportpce_tests/with_docker/test02_nbinotifications.py index d8e837af3..f7dd69e95 100644 --- a/tests/transportpce_tests/with_docker/test02_nbinotifications.py +++ b/tests/transportpce_tests/with_docker/test02_nbinotifications.py @@ -90,12 +90,6 @@ class TransportNbiNotificationstesting(unittest.TestCase): result = test_utils.install_karaf_feature("odl-transportpce-nbinotifications") if result.returncode != 0: cls.init_failed = True - print("Restarting OpenDaylight...") - test_utils.shutdown_process(cls.processes[0]) - cls.processes[0] = test_utils.start_karaf() - test_utils.process_list[0] = cls.processes[0] - 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("NBI notification installation feature failed...") test_utils.shutdown_process(cls.processes[0]) diff --git a/tests/transportpce_tests/with_docker/test03_tapi_nbinotifications.py b/tests/transportpce_tests/with_docker/test03_tapi_nbinotifications.py index b557610f3..571549fb0 100644 --- a/tests/transportpce_tests/with_docker/test03_tapi_nbinotifications.py +++ b/tests/transportpce_tests/with_docker/test03_tapi_nbinotifications.py @@ -156,12 +156,6 @@ class TransportNbiNotificationstesting(unittest.TestCase): result = test_utils.install_karaf_feature("odl-transportpce-tapi") if result.returncode != 0: cls.init_failed_tapi = True - print("Restarting OpenDaylight...") - test_utils.shutdown_process(cls.processes[0]) - cls.processes[0] = test_utils.start_karaf() - test_utils.process_list[0] = cls.processes[0] - 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_nbi: print("NBI notification installation feature failed...") test_utils.shutdown_process(cls.processes[0]) -- 2.36.6