From 01e261ef7640be1764586a7a6ad67f45596a8a46 Mon Sep 17 00:00:00 2001
From: Nikos Mimigiannis <nmimi@intracom-telecom.com>
Date: Wed, 31 Oct 2018 11:10:18 +0200
Subject: Migrate SNAPS to Openstack-SDK

JIRA: SFC-137

This patch replaces SNAPS library with openstack_SDK library for
TCs with mano component: no-mano

Change-Id: I99b9a5f54a273f61ecff05a11616440d5e85e55b
Signed-off-by: Nikos Mimigiannis <nmimi@intracom-telecom.com>
---
 sfc/lib/cleanup.py | 39 +++++++++++++++++++++++++++------------
 1 file changed, 27 insertions(+), 12 deletions(-)

(limited to 'sfc/lib/cleanup.py')

diff --git a/sfc/lib/cleanup.py b/sfc/lib/cleanup.py
index ee3ad689..7ac7903a 100644
--- a/sfc/lib/cleanup.py
+++ b/sfc/lib/cleanup.py
@@ -3,6 +3,7 @@ import sys
 import time
 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,16 +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):
-    logger.info("Deleting the openstack objects...")
-    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():
@@ -131,9 +122,33 @@ def cleanup_mano_objects(mano):
         cleanup_nsfc_objects()
 
 
-def cleanup(creators, mano, odl_ip=None, odl_port=None):
+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(creators)
+    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)
-- 
cgit 1.2.3-korg