Use generate_defaults instead of os_defaults fixed parameters

JIRA: FUNCTEST-131

Running generate_defaults.py in prepare_env.sh (before running any test)
will create a file with the CURRENT OpenStack objects in
the deployment. After each test, the cleanup script will take into
consideration those parameters instead of the specified in
os_defaults.yaml

Keep os_defaults.yaml for the moment

Change-Id: I5f38fef47f0a6d79407d1d582b1e7d3713503e07
Signed-off-by: jose.lausuch <jose.lausuch@ericsson.com>
(cherry picked from commit 47635924e6def36be3c44a047d91018e47a439eb)

4 files changed, 36 insertions, 27 deletions

diff --git a/docker/prepare_env.sh b/docker/prepare_env.sh
index 4106e3bde..ea82ea1c0 100755
--- a/docker/prepare_env.sh
+++ b/docker/prepare_env.sh
@@ -221,7 +221,7 @@ if [ $RETVAL -ne 0 ]; then
 fi
 
 # Prepare Functest Environment
-info "Functest: prepare Functest environment"
+info "Preparing Functest environment..."
 python ${FUNCTEST_REPO_DIR}/testcases/config_functest.py --debug start
 retval=$?
 if [ $retval != 0 ]; then
@@ -229,6 +229,12 @@ if [ $retval != 0 ]; then
     exit $retval
 fi
 
+
+# Generate OpenStack defaults
+info "Generating OpenStack defaults..."
+python ${FUNCTEST_REPO_DIR}/testcases/VIM/OpenStack/CI/libraries/generate_defaults.py -d
+
+
 ifconfig eth0 mtu 1450
 
 echo "1" > ${FUNCTEST_CONF_DIR}/env_active
diff --git a/testcases/VIM/OpenStack/CI/libraries/clean_openstack.py b/testcases/VIM/OpenStack/CI/libraries/clean_openstack.py
index 464defcc9..100342304 100644
--- a/testcases/VIM/OpenStack/CI/libraries/clean_openstack.py
+++ b/testcases/VIM/OpenStack/CI/libraries/clean_openstack.py
@@ -59,20 +59,24 @@ if not os.path.exists(REPO_PATH):
 sys.path.append(REPO_PATH + "testcases/")
 import functest_utils
 
-with open(REPO_PATH+"testcases/VIM/OpenStack/CI/libraries/os_defaults.yaml") as f:
-    defaults_yaml = yaml.safe_load(f)
-f.close()
-
-installer = os.environ["INSTALLER_TYPE"]
+DEFAULTS_FILE = '/home/opnfv/functest/conf/os_defaults.yaml'
+
+try:
+    with open(DEFAULTS_FILE) as f:
+        defaults_yaml = yaml.safe_load(f)
+except Exception, e:
+    logger.info("The file %s does not exist. Please run generate_defaults.py "
+                "to create the OpenStack defaults. "
+                "Aborting cleanup..." % DEFAULTS_FILE)
+    exit(0)
 
-default_images = defaults_yaml.get(installer).get("images")
-default_networks = defaults_yaml.get(installer).get("networks") +\
-    defaults_yaml.get("common").get("networks")
-default_routers = defaults_yaml.get(installer).get("routers") +\
-    defaults_yaml.get("common").get("routers")
-default_security_groups = defaults_yaml.get(installer).get("security_groups")
-default_users = defaults_yaml.get(installer).get("users")
-default_tenants = defaults_yaml.get(installer).get("tenants")
+default_images = defaults_yaml.get('images')
+default_instances = defaults_yaml.get('instances')
+default_networks = defaults_yaml.get('networks')
+default_routers = defaults_yaml.get('routers')
+default_security_groups = defaults_yaml.get('secgroups')
+default_users = defaults_yaml.get('users')
+default_tenants = defaults_yaml.get('tenants')
 
 def separator():
     logger.info("-------------------------------------------")
@@ -116,7 +120,7 @@ def remove_images(nova_client):
         image_name = getattr(image, 'name')
         image_id = getattr(image, 'id')
         logger.debug("'%s', ID=%s " %(image_name,image_id))
-        if image_name not in default_images:
+        if image_id not in default_images:
             logger.debug("Removing image '%s', ID=%s ..." % (image_name,image_id))
             if functest_utils.delete_glance_image(nova_client, image_id):
                 logger.debug("  > Done!")
@@ -189,7 +193,7 @@ def remove_networks(neutron_client):
             net_id = network['id']
             net_name = network['name']
             logger.debug(" '%s', ID=%s " %(net_name,net_id))
-            if net_name in default_networks:
+            if net_id in default_networks:
                 logger.debug("   > this is a default network and will NOT be deleted.")
             elif network['router:external'] == True:
                 logger.debug("   > this is an external network and will NOT be deleted.")
@@ -273,7 +277,7 @@ def remove_routers(neutron_client, routers):
     for router in routers:
         router_id = router['id']
         router_name = router['name']
-        if router_name not in default_routers:
+        if router_id not in default_routers:
             logger.debug("Checking '%s' with ID=(%s) ..." % (router_name,router_id))
             if router['external_gateway_info'] != None:
                 logger.debug("Router has gateway to external network. Removing link...")
@@ -303,7 +307,7 @@ def remove_security_groups(neutron_client):
         secgroup_name = secgroup['name']
         secgroup_id = secgroup['id']
         logger.debug("'%s', ID=%s " %(secgroup_name,secgroup_id))
-        if secgroup_name not in default_security_groups:
+        if secgroup_id not in default_security_groups:
             logger.debug(" Removing '%s'..." % secgroup_name)
             if functest_utils.delete_security_group(neutron_client, secgroup_id):
                 logger.debug("  > Done!")
@@ -326,7 +330,7 @@ def remove_users(keystone_client):
         user_name = getattr(user, 'name')
         user_id = getattr(user, 'id')
         logger.debug("'%s', ID=%s " %(user_name,user_id))
-        if user_name not in default_users:
+        if user_id not in default_users:
             logger.debug(" Removing '%s'..." % user_name)
             if functest_utils.delete_user(keystone_client,user_id):
                 logger.debug("  > Done!")
@@ -348,7 +352,7 @@ def remove_tenants(keystone_client):
         tenant_name=getattr(tenant, 'name')
         tenant_id = getattr(tenant, 'id')
         logger.debug("'%s', ID=%s " %(tenant_name,tenant_id))
-        if tenant_name not in default_tenants:
+        if tenant_id not in default_tenants:
             logger.debug(" Removing '%s'..." % tenant_name)
             if functest_utils.delete_tenant(keystone_client,tenant_id):
                 logger.debug("  > Done!")
diff --git a/testcases/VIM/OpenStack/CI/libraries/generate_defaults.py b/testcases/VIM/OpenStack/CI/libraries/generate_defaults.py
index 0c88c2fd8..0e34d6c7b 100644
--- a/testcases/VIM/OpenStack/CI/libraries/generate_defaults.py
+++ b/testcases/VIM/OpenStack/CI/libraries/generate_defaults.py
@@ -86,7 +86,7 @@ def get_images(nova_client):
 
 
 def get_networks(neutron_client):
-    logger.info("Getting networks")
+    logger.debug("Getting networks")
     dic_networks = {}
     networks = functest_utils.get_network_list(neutron_client)
     if networks != None:
@@ -95,7 +95,7 @@ def get_networks(neutron_client):
     return {'networks': dic_networks}
 
 def get_routers(neutron_client):
-    logger.info("Getting routers")
+    logger.debug("Getting routers")
     dic_routers = {}
     routers = functest_utils.get_router_list(neutron_client)
     if routers != None:
@@ -105,7 +105,7 @@ def get_routers(neutron_client):
 
 
 def get_security_groups(neutron_client):
-    logger.info("Getting Security groups...")
+    logger.debug("Getting Security groups...")
     dic_secgroups = {}
     secgroups = functest_utils.get_security_groups(neutron_client)
     if not (secgroups is None or len(secgroups) == 0):
@@ -167,7 +167,10 @@ def main():
     with open(DEFAULTS_FILE, 'w+') as yaml_file:
         yaml_file.write(yaml.safe_dump(defaults, default_flow_style=False))
         yaml_file.seek(0)
+        logger.info("Openstack Defaults found in the deployment:")
         print yaml_file.read()
+        logger.debug("NOTE: These objects will NOT be deleted after "+\
+                     "running the tests.")
 
     exit(0)
 
diff --git a/testcases/config_functest.py b/testcases/config_functest.py
index d1a197601..265328df0 100755
--- a/testcases/config_functest.py
+++ b/testcases/config_functest.py
@@ -214,10 +214,6 @@ def action_clean():
         logger.debug("Removing Result directory")
         shutil.rmtree(RALLY_RESULT_DIR,ignore_errors=True)
 
-    logger.debug("Cleaning up the OpenStack deployment...")
-    cmd='python ' + FUNCTEST_REPO + \
-        '/testcases/VIM/OpenStack/CI/libraries/clean_openstack.py --debug'
-    functest_utils.execute_command(cmd,logger)
     logger.info("Functest environment clean!")