diff options
author | Linda Wang <wangwulin@huawei.com> | 2017-09-30 02:29:30 +0000 |
---|---|---|
committer | Cedric Ollivier <cedric.ollivier@orange.com> | 2017-09-30 11:23:02 +0000 |
commit | 82f52235de1d6ebfc4a54f4fc40c8b8aa8fa44e0 (patch) | |
tree | 9e21ec3977617dbb81acaab577dadd5901fe6109 /functest/opnfv_tests/openstack/vping/vping_userdata.py | |
parent | f83d8530bf34c1f2aa29fef0a3030a11a9ed4fa7 (diff) |
Fix userdata issue for vping and orchestra
1. When creating VM, the type of the param userdata should be str, to
conform with that in snaps [1].
2. Remove the infinite loop for vping in userdata
3. Fix the criteria for vping_userdata and vping_ssh
[1]: https://git.opnfv.org/snaps/tree/snaps/openstack/utils/nova_utils.py#n92
Change-Id: I262a7ebb93ec90bb6f8f3acb5d564f210abcfc4b
Signed-off-by: Linda Wang <wangwulin@huawei.com>
(cherry picked from commit 5a24cb4a7db33e693a063f5c2a66406283aa5cfb)
Diffstat (limited to 'functest/opnfv_tests/openstack/vping/vping_userdata.py')
-rw-r--r-- | functest/opnfv_tests/openstack/vping/vping_userdata.py | 6 |
1 files changed, 3 insertions, 3 deletions
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 |