diff options
| author |   Cedric Ollivier <cedric.ollivier@orange.com> | 2017-12-07 15:26:32 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@opnfv.org> | 2017-12-07 15:26:32 +0000 |
| commit | 04886b12a4f5c3f18c71f0ca78fdbcf8a545f5f6 (patch) | |
| tree | 90e5139ed774f620b336296f8829fbc7a6a7247c /functest/opnfv_tests/openstack/vping | |
| parent | 2800b22d762e938727ec4b466178eca4de05006d (diff) | |
| parent | fa0a614c8ea3e757440c82380707e0221079e32a (diff) | |
Merge "Fix the yamllint errors in functest/ci"
Diffstat (limited to 'functest/opnfv_tests/openstack/vping')
| -rw-r--r-- | functest/opnfv_tests/openstack/vping/vping_base.py | 6 |
1 files changed, 2 insertions, 4 deletions
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() |