From fa0a614c8ea3e757440c82380707e0221079e32a Mon Sep 17 00:00:00 2001 From: Linda Wang Date: Mon, 4 Dec 2017 06:36:06 +0000 Subject: Fix the yamllint errors in functest/ci And also, remove the params "tempest_use_custom_images" and "unique_names" of vping, rally and tempest. Change-Id: Ic4243ef2f5e965910e5befa87db8d585cad34fa2 Signed-off-by: Linda Wang --- functest/opnfv_tests/openstack/vping/vping_base.py | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) (limited to 'functest/opnfv_tests/openstack/vping') diff --git a/functest/opnfv_tests/openstack/vping/vping_base.py b/functest/opnfv_tests/openstack/vping/vping_base.py index 318e9c45f..f3d4d50f5 100644 --- a/functest/opnfv_tests/openstack/vping/vping_base.py +++ b/functest/opnfv_tests/openstack/vping/vping_base.py @@ -60,9 +60,7 @@ class VPingBase(testcase.TestCase): self.router_creator = None # Shared metadata - self.guid = '' - if CONST.__getattribute__('vping_unique_names'): - self.guid = '-' + str(uuid.uuid4()) + self.guid = '-' + str(uuid.uuid4()) self.router_name = CONST.__getattribute__( 'vping_router_name') + self.guid @@ -197,7 +195,7 @@ class VPingBase(testcase.TestCase): Cleanup all OpenStack objects. Should be called on completion :return: """ - if CONST.__getattribute__('vping_cleanup_objects'): + if CONST.__getattribute__('vping_cleanup_objects') == 'True': for creator in reversed(self.creators): try: creator.clean() -- cgit 1.2.3-korg