From: Jithin Jose <Jithin.Jose@riftio.com>
Date: Tue, 11 Apr 2017 07:44:37 +0000 (-0400)
Subject: Clean up openstack network after failed instantiate
X-Git-Tag: v2.0.0~5
X-Git-Url: https://osm.etsi.org/gitweb/?a=commitdiff_plain;h=54347661382b1211cf8e154f2cfdde15d04ef5b1;p=osm%2FSO.git

Clean up openstack network after failed instantiate

Signed-off-by: Jithin Jose <Jithin.Jose@riftio.com>
---

diff --git a/rwcal/plugins/vala/rwcal_openstack/rwcal_openstack.py b/rwcal/plugins/vala/rwcal_openstack/rwcal_openstack.py
index 68702bbb..e06e311d 100644
--- a/rwcal/plugins/vala/rwcal_openstack/rwcal_openstack.py
+++ b/rwcal/plugins/vala/rwcal_openstack/rwcal_openstack.py
@@ -904,8 +904,13 @@ class RwcalOpenstackPlugin(GObject.Object, RwCal.Cloud):
             drv.neutron_subnet_create(**kwargs)
         except Exception as e:
             self.log.error("Encountered exceptions during network creation. Exception: %s", str(e))
-            raise
-
+            # This is to delete the network if neutron_subnet_create fails after creation of network
+            # Note:- Any subnet created will be implicitly deleted. 
+            try:
+                drv.neutron_network_delete(network_id)
+            except Exception as delete_exception:
+                self.log.debug("Exception while deleting the network after failure of neutron_subnet_create or make_subnet_args: %s", str(delete_exception))
+            raise e
         return network_id