From 3aaf0df6141f2ac468c20ab838ea8f6433bd7a65 Mon Sep 17 00:00:00 2001 From: Periyasamy Palanisamy Date: Wed, 8 Nov 2017 16:02:26 +0100 Subject: remove flavor at the end of the test JIRA: SDNVPN-122 Change-Id: I89f457e0d5a7c7c98bab223e722a5eb5a23387b6 Signed-off-by: Periyasamy Palanisamy --- sdnvpn/lib/utils.py | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) (limited to 'sdnvpn/lib/utils.py') diff --git a/sdnvpn/lib/utils.py b/sdnvpn/lib/utils.py index 1afccf7..8310217 100644 --- a/sdnvpn/lib/utils.py +++ b/sdnvpn/lib/utils.py @@ -592,7 +592,13 @@ def cleanup_neutron(neutron_client, floatingip_ids, bgpvpn_ids, interfaces, return True -def cleanup_nova(nova_client, instance_ids): +def cleanup_nova(nova_client, instance_ids, flavor_ids=None): + if flavor_ids is not None and len(flavor_ids) != 0: + for flavor_id in flavor_ids: + if not nova_client.flavors.delete(flavor_id): + logging.error('Fail to delete flavor. ' + 'Flavor with id {} was not deleted.'. + format(flavor_id)) if len(instance_ids) != 0: for instance_id in instance_ids: if not os_utils.delete_instance(nova_client, instance_id): -- cgit 1.2.3-korg