Do not wrap exceptions during quantum resource delete

The stack should go into the DELETE_FAILED state, and a delete
is attempted on all resources regardless of failures.

Change-Id: Ib707c8112d9053a8627c733f4323f514d30628e9

diff --git a/heat/engine/resources/quantum/floatingip.py b/heat/engine/resources/quantum/floatingip.py
index b17e3628c2d64ac42fe4192fb29d831fab39aafa..3dbe08d5a1788d052d903eaaaf2410e6f6bd3a8a 100644 (file)
--- a/heat/engine/resources/quantum/floatingip.py
+++ b/heat/engine/resources/quantum/floatingip.py
@@ -36,10 +36,7 @@ class FloatingIP(quantum.QuantumResource):
 
     def handle_delete(self):
         client = self.quantum()
-        try:
-            client.delete_floatingip(self.resource_id)
-        except:
-            pass
+        client.delete_floatingip(self.resource_id)
 
     def FnGetAtt(self, key):
         attributes = self.quantum().show_floatingip(
@@ -69,12 +66,9 @@ class FloatingIPAssociation(quantum.QuantumResource):
 
     def handle_delete(self):
         client = self.quantum()
-        try:
-            (floatingip_id, port_id) = self.resource_id.split(':')
-            client.update_floatingip(floatingip_id,
-                {'floatingip': {'port_id': None}})
-        except:
-            pass
+        (floatingip_id, port_id) = self.resource_id.split(':')
+        client.update_floatingip(floatingip_id,
+            {'floatingip': {'port_id': None}})
 
 
 def resource_mapping():

diff --git a/heat/engine/resources/quantum/net.py b/heat/engine/resources/quantum/net.py
index 645c2a03b7a52563d8d46e5e4b21aaf1afcc900d..d6efc6e6a7d9386be5da83093729e6193fdd8445 100644 (file)
--- a/heat/engine/resources/quantum/net.py
+++ b/heat/engine/resources/quantum/net.py
@@ -37,10 +37,7 @@ class Net(quantum.QuantumResource):
 
     def handle_delete(self):
         client = self.quantum()
-        try:
-            client.delete_network(self.resource_id)
-        except:
-            pass
+        client.delete_network(self.resource_id)
 
     def FnGetAtt(self, key):
         attributes = self.quantum().show_network(

diff --git a/heat/engine/resources/quantum/port.py b/heat/engine/resources/quantum/port.py
index 04af57380aa9ef7e5612eff7b8352c2b860a5fc3..a6d65511b6125cfb9332094a2557981924fae06f 100644 (file)
--- a/heat/engine/resources/quantum/port.py
+++ b/heat/engine/resources/quantum/port.py
@@ -50,10 +50,7 @@ class Port(quantum.QuantumResource):
 
     def handle_delete(self):
         client = self.quantum()
-        try:
-            client.delete_port(self.resource_id)
-        except:
-            pass
+        client.delete_port(self.resource_id)
 
     def FnGetAtt(self, key):
         attributes = self.quantum().show_port(

diff --git a/heat/engine/resources/quantum/router.py b/heat/engine/resources/quantum/router.py
index 19fffbcef5241aa7299ab7e87f7b3c712b1b3524..bebe388d3f6f324dc83b37291a4698bb4b67d2af 100644 (file)
--- a/heat/engine/resources/quantum/router.py
+++ b/heat/engine/resources/quantum/router.py
@@ -38,10 +38,7 @@ class Router(quantum.QuantumResource):
 
     def handle_delete(self):
         client = self.quantum()
-        try:
-            client.delete_router(self.resource_id)
-        except:
-            pass
+        client.delete_router(self.resource_id)
 
     def FnGetAtt(self, key):
         attributes = self.quantum().show_router(
@@ -68,12 +65,9 @@ class RouterInterface(quantum.QuantumResource):
 
     def handle_delete(self):
         client = self.quantum()
-        try:
-            (router_id, subnet_id) = self.resource_id.split(':')
-            client.remove_interface_router(router_id,
-                {'subnet_id': subnet_id})
-        except:
-            pass
+        (router_id, subnet_id) = self.resource_id.split(':')
+        client.remove_interface_router(router_id,
+            {'subnet_id': subnet_id})
 
 
 class RouterGateway(quantum.QuantumResource):
@@ -95,11 +89,8 @@ class RouterGateway(quantum.QuantumResource):
 
     def handle_delete(self):
         client = self.quantum()
-        try:
-            (router_id, network_id) = self.resource_id.split(':')
-            client.remove_gateway_router(router_id)
-        except:
-            pass
+        (router_id, network_id) = self.resource_id.split(':')
+        client.remove_gateway_router(router_id)
 
 
 def resource_mapping():

diff --git a/heat/engine/resources/quantum/subnet.py b/heat/engine/resources/quantum/subnet.py
index 81014934bf32949eaaccacf875dbe7403a254210..48357eba879565e59079acb1abf35ebc35b84888 100644 (file)
--- a/heat/engine/resources/quantum/subnet.py
+++ b/heat/engine/resources/quantum/subnet.py
@@ -58,10 +58,7 @@ class Subnet(quantum.QuantumResource):
 
     def handle_delete(self):
         client = self.quantum()
-        try:
-            client.delete_subnet(self.resource_id)
-        except:
-            pass
+        client.delete_subnet(self.resource_id)
 
     def FnGetAtt(self, key):
         attributes = self.quantum().show_subnet(