Delete floating port and floatingip in the same transaction

Bug #1080516 Change-Id: Icb5b71e29af582cb0e381e22909f46b325063d71
openstack · Nov 19, 2012 · ce538eb · ce538eb
1 parent 513307f
commit ce538eb
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/quantum/db/l3_db.py b/quantum/db/l3_db.py
@@ -606,9 +606,9 @@ def delete_floatingip(self, context, id):
         floatingip = self._get_floatingip(context, id)
         with context.session.begin(subtransactions=True):
             context.session.delete(floatingip)
-        self.delete_port(context.elevated(),
-                         floatingip['floating_port_id'],
-                         l3_port_check=False)
+            self.delete_port(context.elevated(),
+                             floatingip['floating_port_id'],
+                             l3_port_check=False)
 
     def get_floatingip(self, context, id, fields=None):
         floatingip = self._get_floatingip(context, id)