diff options
Diffstat (limited to 'functest')
4 files changed, 6 insertions, 6 deletions
diff --git a/functest/opnfv_tests/openstack/vping/vping_ssh.py b/functest/opnfv_tests/openstack/vping/vping_ssh.py index 5cacddb55..f94d20b20 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 8088a4db5..deaacfccd 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 6a111603a..944d50abe 100644 --- a/functest/opnfv_tests/vnf/ims/orchestra_clearwaterims.py +++ b/functest/opnfv_tests/vnf/ims/orchestra_clearwaterims.py @@ -466,7 +466,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 0821e42ae..775415438 100644 --- a/functest/opnfv_tests/vnf/ims/orchestra_openims.py +++ b/functest/opnfv_tests/vnf/ims/orchestra_openims.py @@ -460,7 +460,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) |