From 621175e38ba170e499a621a850ef127f6bc39d17 Mon Sep 17 00:00:00 2001
From: Steve Baker <sbaker@redhat.com>
Date: Fri, 7 Dec 2012 11:33:16 +1300
Subject: [PATCH] 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
---
 heat/engine/resources/quantum/floatingip.py | 14 ++++----------
 heat/engine/resources/quantum/net.py        |  5 +----
 heat/engine/resources/quantum/port.py       |  5 +----
 heat/engine/resources/quantum/router.py     | 21 ++++++---------------
 heat/engine/resources/quantum/subnet.py     |  5 +----
 5 files changed, 13 insertions(+), 37 deletions(-)

diff --git a/heat/engine/resources/quantum/floatingip.py b/heat/engine/resources/quantum/floatingip.py
index b17e3628..3dbe08d5 100644
--- 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 645c2a03..d6efc6e6 100644
--- 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 04af5738..a6d65511 100644
--- 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 19fffbce..bebe388d 100644
--- 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 81014934..48357eba 100644
--- 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(
-- 
2.45.2