def remove_instances(nova_client, default_instances):
- logger.info("Removing Nova instances...")
+ logger.debug("Removing Nova instances...")
instances = os_utils.get_instances(nova_client)
if instances is None or len(instances) == 0:
logger.debug("No instances found.")
instance_name = getattr(instance, 'name')
instance_id = getattr(instance, 'id')
logger.debug("'%s', ID=%s " % (instance_name, instance_id))
- if instance_id not in default_instances:
+ if (instance_id not in default_instances and
+ instance_name not in default_instances.values()):
logger.debug("Removing instance '%s' ..." % instance_id)
if os_utils.delete_instance(nova_client, instance_id):
logger.debug(" > Request sent.")
def remove_images(nova_client, default_images):
- logger.info("Removing Glance images...")
+ logger.debug("Removing Glance images...")
images = os_utils.get_images(nova_client)
if images is None or len(images) == 0:
logger.debug("No images found.")
image_name = getattr(image, 'name')
image_id = getattr(image, 'id')
logger.debug("'%s', ID=%s " % (image_name, image_id))
- if image_id not in default_images:
+ if (image_id not in default_images and
+ image_name not in default_images.values()):
logger.debug("Removing image '%s', ID=%s ..."
% (image_name, image_id))
if os_utils.delete_glance_image(nova_client, image_id):
def remove_volumes(cinder_client, default_volumes):
- logger.info("Removing Cinder volumes...")
+ logger.debug("Removing Cinder volumes...")
volumes = os_utils.get_volumes(cinder_client)
if volumes is None or len(volumes) == 0:
logger.debug("No volumes found.")
volume_id = getattr(volume, 'id')
volume_name = getattr(volume, 'display_name')
logger.debug("'%s', ID=%s " % (volume_name, volume_id))
- if volume_id not in default_volumes:
+ if (volume_id not in default_volumes and
+ volume_name not in default_volumes.values()):
logger.debug("Removing cinder volume %s ..." % volume_id)
if os_utils.delete_volume(cinder_client, volume_id):
logger.debug(" > Done!")
def remove_floatingips(nova_client, default_floatingips):
- logger.info("Removing floating IPs...")
+ logger.debug("Removing floating IPs...")
floatingips = os_utils.get_floating_ips(nova_client)
if floatingips is None or len(floatingips) == 0:
logger.debug("No floating IPs found.")
fip_id = getattr(fip, 'id')
fip_ip = getattr(fip, 'ip')
logger.debug("'%s', ID=%s " % (fip_ip, fip_id))
- if fip_id not in default_floatingips:
+ if (fip_id not in default_floatingips and
+ fip_ip not in default_floatingips.values()):
logger.debug("Removing floating IP %s ..." % fip_id)
if os_utils.delete_floating_ip(nova_client, fip_id):
logger.debug(" > Done!")
def remove_networks(neutron_client, default_networks, default_routers):
- logger.info("Removing Neutron objects")
+ logger.debug("Removing Neutron objects")
network_ids = []
networks = os_utils.get_network_list(neutron_client)
if networks is None:
net_id = network['id']
net_name = network['name']
logger.debug(" '%s', ID=%s " % (net_name, net_id))
- if net_id in default_networks:
+ if (net_id in default_networks and
+ net_name in default_networks.values()):
logger.debug(" > this is a default network and will "
"NOT be deleted.")
elif network['router:external'] is True:
else:
remove_routers(neutron_client, routers, default_routers)
+ # trozet: wait for Neutron to auto-cleanup HA networks when HA router is
+ # deleted
+ time.sleep(5)
+
# remove networks
if network_ids is not None:
for net_id in network_ids:
+ networks = os_utils.get_network_list(neutron_client)
+ if networks is None:
+ logger.debug("No networks left to remove")
+ break
+ elif not any(network['id'] == net_id for network in networks):
+ logger.debug("Network %s has already been removed" % net_id)
+ continue
logger.debug("Removing network %s ..." % net_id)
if os_utils.delete_neutron_net(neutron_client, net_id):
logger.debug(" > Done!")
try:
subnet_id = port['fixed_ips'][0]['subnet_id']
except:
- logger.info(" > WARNING: Port %s does not contain 'fixed_ips'"
- % port_id)
- print port
+ logger.debug(" > WARNING: Port %s does not contain fixed_ips"
+ % port_id)
+ logger.info(port)
router_id = port['device_id']
if len(port['fixed_ips']) == 0 and router_id == '':
logger.debug("Removing port %s ..." % port_id)
for router in routers:
router_id = router['id']
router_name = router['name']
- if router_id not in default_routers:
+ if (router_id not in default_routers and
+ router_name not in default_routers.values()):
logger.debug("Checking '%s' with ID=(%s) ..." % (router_name,
router_id))
if router['external_gateway_info'] is not None:
def remove_security_groups(neutron_client, default_security_groups):
- logger.info("Removing Security groups...")
+ logger.debug("Removing Security groups...")
secgroups = os_utils.get_security_groups(neutron_client)
if secgroups is None or len(secgroups) == 0:
logger.debug("No security groups found.")
def remove_users(keystone_client, default_users):
- logger.info("Removing Users...")
+ logger.debug("Removing Users...")
users = os_utils.get_users(keystone_client)
if users is None:
logger.debug("There are no users in the deployment. ")
user_name = getattr(user, 'name')
user_id = getattr(user, 'id')
logger.debug("'%s', ID=%s " % (user_name, user_id))
- if user_id not in default_users:
+ if (user_id not in default_users and
+ user_name not in default_users.values()):
logger.debug(" Removing '%s'..." % user_name)
if os_utils.delete_user(keystone_client, user_id):
logger.debug(" > Done!")
def remove_tenants(keystone_client, default_tenants):
- logger.info("Removing Tenants...")
+ logger.debug("Removing Tenants...")
tenants = os_utils.get_tenants(keystone_client)
if tenants is None:
logger.debug("There are no tenants in the deployment. ")
tenant_name = getattr(tenant, 'name')
tenant_id = getattr(tenant, 'id')
logger.debug("'%s', ID=%s " % (tenant_name, tenant_id))
- if tenant_id not in default_tenants:
+ if (tenant_id not in default_tenants and
+ tenant_name not in default_tenants.values()):
logger.debug(" Removing '%s'..." % tenant_name)
if os_utils.delete_tenant(keystone_client, tenant_id):
logger.debug(" > Done!")
Code Review / functest.git / blobdiff