From 82f52235de1d6ebfc4a54f4fc40c8b8aa8fa44e0 Mon Sep 17 00:00:00 2001 From: Linda Wang Date: Sat, 30 Sep 2017 02:29:30 +0000 Subject: 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 (cherry picked from commit 5a24cb4a7db33e693a063f5c2a66406283aa5cfb) --- functest/opnfv_tests/vnf/ims/orchestra_clearwaterims.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'functest/opnfv_tests/vnf/ims/orchestra_clearwaterims.py') 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) -- cgit 1.2.3-korg