Fix userdata issue for vping and orchestra 77/43777/1
authorLinda Wang <wangwulin@huawei.com>
Sat, 30 Sep 2017 02:29:30 +0000 (02:29 +0000)
committerCedric Ollivier <cedric.ollivier@orange.com>
Sat, 30 Sep 2017 11:23:02 +0000 (11:23 +0000)
commit82f52235de1d6ebfc4a54f4fc40c8b8aa8fa44e0
tree9e21ec3977617dbb81acaab577dadd5901fe6109
parentf83d8530bf34c1f2aa29fef0a3030a11a9ed4fa7
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)
functest/opnfv_tests/openstack/vping/vping_ssh.py
functest/opnfv_tests/openstack/vping/vping_userdata.py
functest/opnfv_tests/vnf/ims/orchestra_clearwaterims.py
functest/opnfv_tests/vnf/ims/orchestra_openims.py