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_ssh.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_ssh.py')
| -rw-r--r-- | functest/opnfv_tests/openstack/vping/vping_ssh.py | 2 |
1 files changed, 1 insertions, 1 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): """ |