aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJose Lausuch <jose.lausuch@ericsson.com>2015-12-29 17:04:32 +0000
committerGerrit Code Review <gerrit@172.30.200.206>2015-12-29 17:04:32 +0000
commit4f7e44541bd8c1d20d547891170e48e521f5db3c (patch)
tree89cfb4304ca2945caff76c06c39c1a8dd70ea230
parent7e19ef72f9d5740b04988679f568dd883881e96c (diff)
parent675652f37c57fe61900d2ac5735b0be9b6269252 (diff)
Merge "Support for removing hanging ports"
-rw-r--r--testcases/VIM/OpenStack/CI/libraries/clean_openstack.py82
-rw-r--r--testcases/functest_utils.py13
2 files changed, 54 insertions, 41 deletions
diff --git a/testcases/VIM/OpenStack/CI/libraries/clean_openstack.py b/testcases/VIM/OpenStack/CI/libraries/clean_openstack.py
index e76034b8..dca188f5 100644
--- a/testcases/VIM/OpenStack/CI/libraries/clean_openstack.py
+++ b/testcases/VIM/OpenStack/CI/libraries/clean_openstack.py
@@ -164,29 +164,44 @@ def remove_networks(neutron_client):
networks = functest_utils.get_network_list(neutron_client)
if networks == None:
logger.debug("There are no networks in the deployment. ")
- return
-
- logger.debug("Existing networks:")
- for network in networks:
- net_id = network['id']
- net_name = network['name']
- logger.debug(" '%s', ID=%s " %(net_name,net_id))
- if net_name not in default_networks:
- logger.debug(" > this is not a default network and will be deleted.")
- network_ids.append(net_id)
- else:
- logger.debug(" > this is a default network and will NOT be deleted.")
-
+ else:
+ logger.debug("Existing networks:")
+ for network in networks:
+ net_id = network['id']
+ net_name = network['name']
+ logger.debug(" '%s', ID=%s " %(net_name,net_id))
+ if net_name not in default_networks:
+ logger.debug(" > this is not a default network and will be deleted.")
+ network_ids.append(net_id)
+ else:
+ logger.debug(" > this is a default network and will NOT be deleted.")
- #remove interfaces router and delete ports
+ #delete ports
ports = functest_utils.get_port_list(neutron_client)
if ports is None:
logger.debug("There are no ports in the deployment. ")
- return
+ else:
+ remove_ports(neutron_client, ports, network_ids)
+
+ #remove routers
+ routers = functest_utils.get_router_list(neutron_client)
+ if routers is None:
+ logger.debug("There are no routers in the deployment. ")
+ else:
+ remove_routers(neutron_client, routers)
+
+ #remove networks
+ if network_ids != None:
+ for net_id in network_ids:
+ logger.debug("Removing network %s ..." % net_id)
+ if functest_utils.delete_neutron_net(neutron_client, net_id):
+ logger.debug(" > Done!")
+ else:
+ logger.info(" > ERROR: There has been a problem removing the "
+ "network %s..." % net_id)
- #debug information (to be removed when it works many times in a row)
- print ports
+def remove_ports(neutron_client, ports, network_ids):
for port in ports:
if port['network_id'] in network_ids:
port_id = port['id']
@@ -195,7 +210,6 @@ def remove_networks(neutron_client):
except:
logger.info(" > WARNING: Port %s does not contain 'fixed_ips'" % port_id)
print port
-
router_id = port['device_id']
if len(port['fixed_ips']) == 0 and router_id == '':
logger.debug("Removing port %s ..." % port_id)
@@ -215,21 +229,19 @@ def remove_networks(neutron_client):
else:
logger.info(" > ERROR: There has been a problem removing the "
"interface %s from router %s..." %(subnet_id,router_id))
- #print port
else:
+ logger.debug("Clearing device_owner for port %s ..." % port_id)
+ functest_utils.update_neutron_port(neutron_client,
+ port_id,
+ device_owner='clear')
logger.debug("Removing port %s ..." % port_id)
if functest_utils.delete_neutron_port(neutron_client, port_id):
logger.debug(" > Done!")
else:
- logger.info(" > ERROR: There has been a problem removing the "
- "port %s ..." %port_id)
- #print port
+ logger.debug(" > Port %s could not be removed directly" % port_id)
- #remove routers
- routers = functest_utils.get_router_list(neutron_client)
- if routers is None:
- logger.debug("There are no routers in the deployment. ")
- return
+
+def remove_routers(neutron_client, routers):
for router in routers:
router_id = router['id']
router_name = router['name']
@@ -242,26 +254,14 @@ def remove_networks(neutron_client):
else:
logger.info(" > ERROR: There has been a problem removing "
"the gateway...")
- #print router
-
else:
logger.debug("Router is not connected to anything. Ready to remove...")
- logger.debug("Removing router %s(%s) ..." % (router_name,router_id))
+ logger.debug("Removing router %s(%s) ..." % (router_name, router_id))
if functest_utils.delete_neutron_router(neutron_client, router_id):
logger.debug(" > Done!")
else:
logger.info(" > ERROR: There has been a problem removing the "
- "router '%s'(%s)..." % (router_name,router_id))
-
-
- #remove networks
- for net_id in network_ids:
- logger.debug("Removing network %s ..." % net_id)
- if functest_utils.delete_neutron_net(neutron_client, net_id):
- logger.debug(" > Done!")
- else:
- logger.info(" > ERROR: There has been a problem removing the "
- "network %s..." % net_id)
+ "router '%s'(%s)..." % (router_name, router_id))
def remove_security_groups(neutron_client):
diff --git a/testcases/functest_utils.py b/testcases/functest_utils.py
index 87506083..00a7b305 100644
--- a/testcases/functest_utils.py
+++ b/testcases/functest_utils.py
@@ -235,6 +235,19 @@ def create_neutron_port(neutron_client, name, network_id, ip):
return False
+def update_neutron_port(neutron_client, port_id, device_owner):
+ json_body = {'port': {
+ 'device_owner': device_owner,
+ }}
+ try:
+ port = neutron_client.update_port(port=port_id,
+ body=json_body)
+ return port['port']['id']
+ except:
+ print "Error:", sys.exc_info()[0]
+ return False
+
+
def delete_neutron_port(neutron_client, port_id):
try:
neutron_client.delete_port(port_id)