diff options
| author |   Linda Wang <wangwulin@huawei.com> | 2017-09-30 02:29:30 +0000 |
|---|---|---|
| committer | Linda Wang <wangwulin@huawei.com> | 2017-09-30 09:26:47 +0000 |
| commit | 5a24cb4a7db33e693a063f5c2a66406283aa5cfb (patch) | |
| tree | a4d3f5cd8b3dcc4848d0968ee5d66db1b38ab712 /functest/opnfv_tests/vnf/ims/orchestra_clearwaterims.py | |
| parent | f36d607e1b8f7660bbcb4c06d589d4eeb76158e3 (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>
Diffstat (limited to 'functest/opnfv_tests/vnf/ims/orchestra_clearwaterims.py')
| -rw-r--r-- | functest/opnfv_tests/vnf/ims/orchestra_clearwaterims.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/functest/opnfv_tests/vnf/ims/orchestra_clearwaterims.py b/functest/opnfv_tests/vnf/ims/orchestra_clearwaterims.py index 6a111603..944d50ab 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) |