aboutsummaryrefslogtreecommitdiffstats
path: root/functest/opnfv_tests/openstack/vping/vping_base.py
diff options
context:
space:
mode:
Diffstat (limited to 'functest/opnfv_tests/openstack/vping/vping_base.py')
-rw-r--r--functest/opnfv_tests/openstack/vping/vping_base.py6
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()