From 9a9a247166e5818ba16bc19d90d926a006216db1 Mon Sep 17 00:00:00 2001 From: helenyao Date: Mon, 26 Dec 2016 01:44:54 -0500 Subject: Enable the tenant related features JIRA: FUNCTEST-670 The tenant related features were enabled for OpenStack snapshot and cleanup. Change-Id: Ie9a4012c0d29f57ed5a14139ccb5f8e29b6000dd Signed-off-by: helenyao --- functest/utils/openstack_clean.py | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) (limited to 'functest/utils/openstack_clean.py') diff --git a/functest/utils/openstack_clean.py b/functest/utils/openstack_clean.py index b1ad9664..15a8f33d 100755 --- a/functest/utils/openstack_clean.py +++ b/functest/utils/openstack_clean.py @@ -397,7 +397,7 @@ def main(): default_security_groups = snapshot_yaml.get('secgroups') default_floatingips = snapshot_yaml.get('floatingips') default_users = snapshot_yaml.get('users') - # default_tenants = snapshot_yaml.get('tenants') + default_tenants = snapshot_yaml.get('tenants') if not os_utils.check_credentials(): logger.error("Please source the openrc credentials and run " @@ -418,10 +418,8 @@ def main(): separator() remove_users(keystone_client, default_users) separator() - # TODO (Helen) tenant does not exist in V3 - # need to figure our anohter general verification point - # remove_tenants(keystone_client, default_tenants) - # separator() + remove_tenants(keystone_client, default_tenants) + separator() if __name__ == '__main__': -- cgit 1.2.3-korg