1 files changed, 61 insertions, 22 deletions

diff --git a/sfc/lib/cleanup.py b/sfc/lib/cleanup.py
index 7a2f4053..e97034ad 100644
--- a/sfc/lib/cleanup.py
+++ b/sfc/lib/cleanup.py
@@ -1,8 +1,9 @@
+import logging
 import sys
 import time
-import logging
 import sfc.lib.openstack_utils as os_sfc_utils
 import sfc.lib.odl_utils as odl_utils
+from openstack import connection
 
 
 logger = logging.getLogger(__name__)
@@ -73,15 +74,6 @@ def delete_vims():
         os_sfc_utils.delete_vim(t, vim_id=vim)
 
 
-# Creators is a list full of SNAPs objects
-def delete_openstack_objects(creators):
-    for creator in reversed(creators):
-        try:
-            creator.clean()
-        except Exception as e:
-            logger.error('Unexpected error cleaning - %s', e)
-
-
 # Networking-odl generates a new security group when creating a router
 # which is not tracked by SNAPs
 def delete_untracked_security_groups():
@@ -91,32 +83,79 @@ def delete_untracked_security_groups():
 
 def cleanup_odl(odl_ip, odl_port):
     delete_odl_resources(odl_ip, odl_port, 'service-function-forwarder')
-    delete_odl_resources(odl_ip, odl_port, 'service-function-chain')
-    delete_odl_resources(odl_ip, odl_port, 'service-function-path')
-    delete_odl_resources(odl_ip, odl_port, 'service-function')
+    # delete_odl_resources(odl_ip, odl_port, 'service-function-chain')
+    # delete_odl_resources(odl_ip, odl_port, 'service-function-path')
+    # delete_odl_resources(odl_ip, odl_port, 'service-function')
     delete_odl_ietf_access_lists(odl_ip, odl_port)
 
 
-def cleanup(creators, odl_ip=None, odl_port=None):
+def cleanup_nsfc_objects():
+    '''
+    cleanup the networking-sfc objects created for the test
+    '''
+    # TODO Add n-sfc to snaps so that it can be removed through
+    # delete_openstack_objects
+    openstack_sfc = os_sfc_utils.OpenStackSFC()
+    openstack_sfc.delete_chain()
+    openstack_sfc.delete_port_groups()
+
+
+def cleanup_tacker_objects():
+    '''
+    cleanup the tacker objects created for the test
+    '''
     delete_vnffgs()
     delete_vnffgds()
     delete_vnfs()
     time.sleep(20)
     delete_vnfds()
     delete_vims()
-    delete_openstack_objects(creators)
+
+
+def cleanup_mano_objects(mano):
+    '''
+    Cleanup the mano objects (chains, classifiers, etc)
+    '''
+    if mano == 'tacker':
+        cleanup_tacker_objects()
+    elif mano == 'no-mano':
+        cleanup_nsfc_objects()
+
+
+def delete_openstack_objects(testcase_config, creators):
+    conn = connection.from_config(verify=False)
+    for creator in creators:
+        if creator.name == testcase_config.subnet_name:
+            subnet_obj = creator
+
+    for creator in reversed(creators):
+        try:
+            logger.info("Deleting " + creator.name)
+            if creator.name == testcase_config.router_name:
+                logger.info("Removing subnet from router")
+                conn.network.remove_interface_from_router(
+                    creator.id, subnet_obj.id)
+                time.sleep(2)
+                logger.info("Deleting router")
+                conn.network.delete_router(creator)
+            else:
+                creator.delete(conn.session)
+            time.sleep(2)
+            creators.remove(creator)
+        except Exception as e:
+            logger.error('Unexpected error cleaning - %s', e)
+
+
+def cleanup(testcase_config, creators, mano, odl_ip=None, odl_port=None):
+    cleanup_mano_objects(mano)
+    delete_openstack_objects(testcase_config, creators)
     delete_untracked_security_groups()
     if odl_ip is not None and odl_port is not None:
         cleanup_odl(odl_ip, odl_port)
 
 
-def cleanup_from_bash(odl_ip=None, odl_port=None):
-    delete_vnffgs()
-    delete_vnffgds()
-    delete_vnfs()
-    time.sleep(20)
-    delete_vnfds()
-    delete_vims()
+def cleanup_from_bash(odl_ip=None, odl_port=None, mano='no-mano'):
+    cleanup_mano_objects(mano=mano)
     if odl_ip is not None and odl_port is not None:
         cleanup_odl(odl_ip, odl_port)