From df5a03610d6f00ed8e8ee3e153de055fbc5dae94 Mon Sep 17 00:00:00 2001 From: Michal Jagiello Date: Fri, 5 Feb 2021 20:37:02 +0000 Subject: Python SDK 7.4.0 compatibility Use Python SDK exceptions. Issue-ID: TEST-302 Signed-off-by: Michal Jagiello Change-Id: I76996817c0d7b91c0214ad521c3768682ff07e83 --- src/onaptests/scenario/basic_network.py | 5 +++-- src/onaptests/scenario/basic_vm.py | 3 +++ 2 files changed, 6 insertions(+), 2 deletions(-) (limited to 'src/onaptests/scenario') diff --git a/src/onaptests/scenario/basic_network.py b/src/onaptests/scenario/basic_network.py index 8aafd32..7a0b9f7 100644 --- a/src/onaptests/scenario/basic_network.py +++ b/src/onaptests/scenario/basic_network.py @@ -5,6 +5,7 @@ import time from xtesting.core import testcase from onapsdk.configuration import settings +from onapsdk.exceptions import SDKException import onaptests.utils.exceptions as onap_test_exceptions from onaptests.steps.instantiate.vl_ala_carte import YamlTemplateVlAlaCarteInstantiateStep @@ -40,8 +41,8 @@ class BasicNetwork(testcase.TestCase): time.sleep(settings.CLEANUP_ACTIVITY_TIMER) try: self.test.cleanup() - except ValueError as error: - self.__logger.info("service deleted as expected {0}".format(error)) + except SDKException as error: + self.__logger.info("service deletion error {0}".format(error)) self.result = 100 else: self.__logger.info("No cleanup requested. Test completed.") diff --git a/src/onaptests/scenario/basic_vm.py b/src/onaptests/scenario/basic_vm.py index cbf9b7c..8972a8c 100644 --- a/src/onaptests/scenario/basic_vm.py +++ b/src/onaptests/scenario/basic_vm.py @@ -5,6 +5,7 @@ import time from xtesting.core import testcase from onapsdk.configuration import settings +from onapsdk.exceptions import SDKException import onaptests.utils.exceptions as onap_test_exceptions from onaptests.steps.instantiate.vf_module_ala_carte import YamlTemplateVfModuleAlaCarteInstantiateStep @@ -46,6 +47,8 @@ class BasicVm(testcase.TestCase): except onap_test_exceptions.OnapTestException as exc: self.result = 0 self.__logger.error(exc.error_message) + except SDKException as error: + self.__logger.info("service error {0}".format(error)) finally: self.stop_time = time.time() -- cgit 1.2.3-korg