Merge "Updated vims to support keystone v3"

[functest.git] / functest / utils / openstack_clean.py

diff --git a/functest/utils/openstack_clean.py b/functest/utils/openstack_clean.py
index bf582de..b1ad966 100755 (executable)
--- a/functest/utils/openstack_clean.py
+++ b/functest/utils/openstack_clean.py
@@ -9,6 +9,8 @@
 #       - Neutron networks, subnets and ports
 #       - Routers
 #       - Users and tenants
+#       - Tacker VNFDs and VNFs
+#       - Tacker SFCs and SFC classifiers
 #
 # Author:
 #    jose.lausuch@ericsson.com
@@ -21,16 +23,16 @@
 #
 
 import time
-import functest.utils.functest_logger as ft_logger
-import functest.utils.functest_utils as ft_utils
-import functest.utils.openstack_utils as os_utils
+
 import yaml
 
+import functest.utils.functest_logger as ft_logger
+import functest.utils.openstack_utils as os_utils
+from functest.utils.constants import CONST
 
 logger = ft_logger.Logger("openstack_clean").getLogger()
 
-OS_SNAPSHOT_FILE = \
-    ft_utils.get_functest_config("general.openstack.snapshot_file")
+OS_SNAPSHOT_FILE = CONST.openstack_snapshot_file
 
 
 def separator():
@@ -107,7 +109,7 @@ def remove_volumes(cinder_client, default_volumes):
 
     for volume in volumes:
         volume_id = getattr(volume, 'id')
-        volume_name = getattr(volume, 'display_name')
+        volume_name = getattr(volume, 'name')
         logger.debug("'%s', ID=%s " % (volume_name, volume_id))
         if (volume_id not in default_volumes and
                 volume_name not in default_volumes.values()):
@@ -395,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 "
@@ -416,8 +418,10 @@ def main():
     separator()
     remove_users(keystone_client, default_users)
     separator()
-    remove_tenants(keystone_client, default_tenants)
-    separator()
+    # TODO (Helen) tenant does not exist in V3
+    # need to figure our anohter general verification point
+    # remove_tenants(keystone_client, default_tenants)
+    # separator()
 
 
 if __name__ == '__main__':