diff options
| -rw-r--r-- | INFO.yaml | 26 | ||||
| -rw-r--r-- | src/onaptests/scenario/cds_resource_resolution.py | 17 | ||||
| -rw-r--r-- | src/onaptests/scenario/pnf_macro.py | 17 |
3 files changed, 32 insertions, 28 deletions
@@ -31,21 +31,11 @@ repositories: - 'testsuite/pythonsdk-tests' committers: - <<: *onap_integration_ptl - - name: 'Christophe Closset' - email: 'cc697w@intl.att.com' - company: 'ATT' - id: 'ChrisC' - timezone: 'Belgium/Namur' - name: 'Catherine Lefevre' email: 'cl664y@att.com' company: 'AT&T' id: 'Katel34' timezone: 'Europe/Belgium' - - name: 'Brian Freeman' - email: 'bf1936@att.com' - company: 'AT&T' - id: 'bdfreeman1421' - timezone: 'America/New_York' - name: 'Morgan Richomme' email: 'morgan.richomme@orange.com' company: 'orange' @@ -91,6 +81,16 @@ committers: company: 'Samsung' id: 'aalexanderr' timezone: 'Europe/Warsaw' + - name: 'Maciej Lisowski' + email: 'm.lisowski2@partner.samsung.com' + company: 'Samsung' + id: 'mlisowski' + timezone: 'Europe/Warsaw' + - name: 'Marcin Sebastian Krasowski' + email: 'm.krasowski@samsung.com' + company: 'Samsung' + id: 'mkrasowski' + timezone: 'Europe/Warsaw' tsc: # yamllint disable rule:line-length approval: 'https://lists.onap.org/g/onap-tsc/message/6408?p=,,,20,0,0,0::relevance,,new+repository+for+integration+team+testsuite%2Fpythonsdk-tests,20,2,0,74178111' @@ -116,3 +116,9 @@ tsc: - type: 'Deletion' name: 'Bartosz Gardziejewski' link: 'https://lists.onap.org/g/onap-tsc/message/8286' + - type: 'Deletion' + name: 'Christophe Closset, Brian Freeman' + link: 'https://lists.onap.org/g/onap-tsc/message/8449' + - type: 'Addition' + name: 'Maciej Lisowski, Marcin Sebastian Krasowski' + link: 'https://lists.onap.org/g/onap-tsc/message/8449' diff --git a/src/onaptests/scenario/cds_resource_resolution.py b/src/onaptests/scenario/cds_resource_resolution.py index 608734b..8c40916 100644 --- a/src/onaptests/scenario/cds_resource_resolution.py +++ b/src/onaptests/scenario/cds_resource_resolution.py @@ -79,15 +79,14 @@ class CDSResourceResolution(testcase.TestCase): self.__logger.debug("CDS resource resolution run") self.start_time = time.time() try: - self.test.execute() - self.test.cleanup() - self.result = 100 - except OnapTestException as exc: - self.result = 0 - self.__logger.error(exc.error_message) - except SDKException: - self.result = 0 - self.__logger.error("SDK Exception") + for test_phase in (self.test.execute, self.test.cleanup): + try: + test_phase() + self.result += 50 + except OnapTestException as exc: + self.__logger.error(exc.error_message) + except SDKException: + self.__logger.error("SDK Exception") finally: self.stop_time = time.time() diff --git a/src/onaptests/scenario/pnf_macro.py b/src/onaptests/scenario/pnf_macro.py index 931a332..b3c7d3e 100644 --- a/src/onaptests/scenario/pnf_macro.py +++ b/src/onaptests/scenario/pnf_macro.py @@ -119,15 +119,14 @@ class PnfMacro(testcase.TestCase): """Run PNF macro test.""" self.start_time = time.time() try: - self.test.execute() - self.test.cleanup() - self.result = 100 - except OnapTestException as exc: - self.result = 0 - self.__logger.error(exc.error_message) - except SDKException: - self.result = 0 - self.__logger.error("SDK Exception") + for test_phase in (self.test.execute, self.test.cleanup): + try: + test_phase() + self.result += 50 + except OnapTestException as exc: + self.__logger.error(exc.error_message) + except SDKException: + self.__logger.error("SDK Exception") finally: self.stop_time = time.time() |