diff options
| -rw-r--r-- | docker/components/testcases.yaml | 20 | ||||
| -rw-r--r-- | functest/ci/testcases.yaml | 18 | ||||
| -rw-r--r-- | functest/opnfv_tests/openstack/vping/vping_ssh.py | 2 | ||||
| -rw-r--r-- | functest/opnfv_tests/openstack/vping/vping_userdata.py | 6 | ||||
| -rw-r--r-- | functest/opnfv_tests/vnf/ims/orchestra_clearwaterims.py | 2 | ||||
| -rw-r--r-- | functest/opnfv_tests/vnf/ims/orchestra_openims.py | 2 |
6 files changed, 7 insertions, 43 deletions
diff --git a/docker/components/testcases.yaml b/docker/components/testcases.yaml index 1604161a..20fff90a 100644 --- a/docker/components/testcases.yaml +++ b/docker/components/testcases.yaml @@ -23,24 +23,6 @@ tiers: class: 'TempestFullParallel' - - case_name: tempest_custom - project_name: functest - criteria: 100 - blocking: false - description: >- - The test case allows running a customized list of tempest - test cases defined in a file under - <dir_functest_repo>/functest/opnfv_tests/openstack/ - /tempest/custom_tests/test_list.txt - The file is empty and can be customized with the desired tests. - dependencies: - installer: 'unknown' - scenario: 'unknown' - run: - module: 'functest.opnfv_tests.openstack.tempest.tempest' - class: 'TempestCustom' - - - case_name: rally_full project_name: functest criteria: 90 @@ -53,4 +35,4 @@ tiers: scenario: '' run: module: 'functest.opnfv_tests.openstack.rally.rally' - class: 'RallyFull'
\ No newline at end of file + class: 'RallyFull' diff --git a/functest/ci/testcases.yaml b/functest/ci/testcases.yaml index 5c77f846..f127dd38 100644 --- a/functest/ci/testcases.yaml +++ b/functest/ci/testcases.yaml @@ -355,24 +355,6 @@ tiers: class: 'TempestFullParallel' - - case_name: tempest_custom - project_name: functest - criteria: 100 - blocking: false - description: >- - The test case allows running a customized list of tempest - test cases defined in a file under - <dir_functest_repo>/functest/opnfv_tests/openstack/ - /tempest/custom_tests/test_list.txt - The file is empty and can be customized with the desired tests. - dependencies: - installer: 'unknown' - scenario: 'unknown' - run: - module: 'functest.opnfv_tests.openstack.tempest.tempest' - class: 'TempestCustom' - - - case_name: rally_full project_name: functest criteria: 90 diff --git a/functest/opnfv_tests/openstack/vping/vping_ssh.py b/functest/opnfv_tests/openstack/vping/vping_ssh.py index 5cacddb5..f94d20b2 100644 --- a/functest/opnfv_tests/openstack/vping/vping_ssh.py +++ b/functest/opnfv_tests/openstack/vping/vping_ssh.py @@ -160,7 +160,7 @@ class VPingSSH(vping_base.VPingBase): return TestCase.EX_RUN_ERROR return self._do_vping_ssh(ssh, test_ip) else: - return -1 + return TestCase.EX_RUN_ERROR def _transfer_ping_script(self, ssh): """ diff --git a/functest/opnfv_tests/openstack/vping/vping_userdata.py b/functest/opnfv_tests/openstack/vping/vping_userdata.py index 8088a4db..deaacfcc 100644 --- a/functest/opnfv_tests/openstack/vping/vping_userdata.py +++ b/functest/opnfv_tests/openstack/vping/vping_userdata.py @@ -88,7 +88,7 @@ class VPingUserdata(vping_base.VPingBase): Override from super """ self.logger.info("Waiting for ping...") - exit_code = -1 + exit_code = TestCase.EX_TESTCASE_FAILED sec = 0 tries = 0 @@ -100,7 +100,7 @@ class VPingUserdata(vping_base.VPingBase): exit_code = TestCase.EX_OK break elif "failed to read iid from metadata" in p_console or tries > 5: - exit_code = TestCase.EX_TESTCASE_FAILED + self.logger.info("Failed to read iid from metadata") break elif sec == self.ping_timeout: self.logger.info("Timeout reached.") @@ -137,5 +137,5 @@ def _get_userdata(test_ip): " echo 'vPing KO'\n" " fi\n" " sleep 1\n" - "done\n" % test_ip) + "done\n" % str(test_ip)) return None diff --git a/functest/opnfv_tests/vnf/ims/orchestra_clearwaterims.py b/functest/opnfv_tests/vnf/ims/orchestra_clearwaterims.py index 3c3cb40e..71b7a993 100644 --- a/functest/opnfv_tests/vnf/ims/orchestra_clearwaterims.py +++ b/functest/opnfv_tests/vnf/ims/orchestra_clearwaterims.py @@ -441,7 +441,7 @@ class ClearwaterImsVnf(vnf.VnfOnBoarding): flavor=self.mano['details']['flavor']['name'], port_settings=[port_settings], security_group_names=[self.mano['details']['sec_group']], - userdata=userdata) + userdata=str(userdata)) orchestra_vm = OpenStackVmInstance(self.snaps_creds, orchestra_settings, image_settings) diff --git a/functest/opnfv_tests/vnf/ims/orchestra_openims.py b/functest/opnfv_tests/vnf/ims/orchestra_openims.py index 8a638e1b..6192cc54 100644 --- a/functest/opnfv_tests/vnf/ims/orchestra_openims.py +++ b/functest/opnfv_tests/vnf/ims/orchestra_openims.py @@ -435,7 +435,7 @@ class OpenImsVnf(vnf.VnfOnBoarding): flavor=self.mano['details']['flavor']['name'], port_settings=[port_settings], security_group_names=[self.mano['details']['sec_group']], - userdata=userdata) + userdata=str(userdata)) orchestra_vm = OpenStackVmInstance(self.snaps_creds, orchestra_settings, image_settings) |