From 09772f5bf3140a6f4cbaace50ead8d25a874cbb0 Mon Sep 17 00:00:00 2001
From: Jake Dahn <jake@ansolabs.com>
Date: Fri, 5 Aug 2011 14:37:44 -0700
Subject: [PATCH 1/6] If ip is deallocated from project, but attached to a
 fixed ip, it is now detached

---
 nova/api/openstack/contrib/floating_ips.py | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/nova/api/openstack/contrib/floating_ips.py b/nova/api/openstack/contrib/floating_ips.py
index 3d8049324e..616388e808 100644
--- a/nova/api/openstack/contrib/floating_ips.py
+++ b/nova/api/openstack/contrib/floating_ips.py
@@ -97,8 +97,13 @@ class FloatingIPController(object):
 
     def delete(self, req, id):
         context = req.environ['nova.context']
-
         ip = self.network_api.get_floating_ip(context, id)
+        try:
+            if 'fixed_ip' in ip:
+                self.disassociate(req, id, '')
+        except:
+            pass
+
         self.network_api.release_floating_ip(context, address=ip)
 
         return {'released': {

From ccea6c91b2314311587466d67d20f1583ddba1ee Mon Sep 17 00:00:00 2001
From: Jake Dahn <jake@ansolabs.com>
Date: Fri, 5 Aug 2011 15:28:10 -0700
Subject: [PATCH 2/6] adding logging to exception in delete method

---
 nova/api/openstack/contrib/floating_ips.py | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/nova/api/openstack/contrib/floating_ips.py b/nova/api/openstack/contrib/floating_ips.py
index 616388e808..49ab88bb64 100644
--- a/nova/api/openstack/contrib/floating_ips.py
+++ b/nova/api/openstack/contrib/floating_ips.py
@@ -24,6 +24,9 @@ from nova.api.openstack import faults
 from nova.api.openstack import extensions
 
 
+LOG = logging.getLogger('nova.api.openstack.contrib.floating_ips')
+
+
 def _translate_floating_ip_view(floating_ip):
     result = {'id': floating_ip['id'],
               'ip': floating_ip['address']}
@@ -98,11 +101,12 @@ class FloatingIPController(object):
     def delete(self, req, id):
         context = req.environ['nova.context']
         ip = self.network_api.get_floating_ip(context, id)
+
         try:
             if 'fixed_ip' in ip:
                 self.disassociate(req, id, '')
-        except:
-            pass
+        except Exception, e:
+            LOG.exception(_("Error disassociating fixed_ip %s"), e)
 
         self.network_api.release_floating_ip(context, address=ip)
 

From fe7f229c8ad91b1ae9187b8c541fdefd535eed9b Mon Sep 17 00:00:00 2001
From: Jake Dahn <jake@ansolabs.com>
Date: Fri, 5 Aug 2011 16:20:53 -0700
Subject: [PATCH 3/6] moving try/except block, and changing syntax of except
 statement

---
 nova/api/openstack/contrib/floating_ips.py | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/nova/api/openstack/contrib/floating_ips.py b/nova/api/openstack/contrib/floating_ips.py
index 49ab88bb64..996a42abea 100644
--- a/nova/api/openstack/contrib/floating_ips.py
+++ b/nova/api/openstack/contrib/floating_ips.py
@@ -101,12 +101,12 @@ class FloatingIPController(object):
     def delete(self, req, id):
         context = req.environ['nova.context']
         ip = self.network_api.get_floating_ip(context, id)
-
-        try:
-            if 'fixed_ip' in ip:
+        
+        if 'fixed_ip' in ip:
+            try:
                 self.disassociate(req, id, '')
-        except Exception, e:
-            LOG.exception(_("Error disassociating fixed_ip %s"), e)
+            except Exception as e:
+                LOG.exception(_("Error disassociating fixed_ip %s"), e)
 
         self.network_api.release_floating_ip(context, address=ip)
 

From c600b2cf3697fc3587fe5519fda8dd4b82d67234 Mon Sep 17 00:00:00 2001
From: Jake Dahn <admin@jakedahn.com>
Date: Mon, 8 Aug 2011 12:10:14 -0700
Subject: [PATCH 4/6] adding forgotten import for logging

---
 nova/api/openstack/contrib/floating_ips.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/nova/api/openstack/contrib/floating_ips.py b/nova/api/openstack/contrib/floating_ips.py
index 996a42abea..52c9c6cf93 100644
--- a/nova/api/openstack/contrib/floating_ips.py
+++ b/nova/api/openstack/contrib/floating_ips.py
@@ -18,6 +18,7 @@
 from webob import exc
 
 from nova import exception
+from nova import log as logging
 from nova import network
 from nova import rpc
 from nova.api.openstack import faults

From c95954ca1a704b6f6e53e7b37f797ad51cb5efa9 Mon Sep 17 00:00:00 2001
From: Jake Dahn <admin@jakedahn.com>
Date: Tue, 9 Aug 2011 14:17:56 -0700
Subject: [PATCH 5/6] adding myself to authors

---
 Authors | 1 +
 1 file changed, 1 insertion(+)

diff --git a/Authors b/Authors
index b216873dfb..e639cbf765 100644
--- a/Authors
+++ b/Authors
@@ -37,6 +37,7 @@ Hisaharu Ishii <ishii.hisaharu@lab.ntt.co.jp>
 Hisaki Ohara <hisaki.ohara@intel.com>
 Ilya Alekseyev <ilyaalekseyev@acm.org>
 Isaku Yamahata <yamahata@valinux.co.jp>
+Jake Dahn <jake@ansolabs.com>
 Jason Cannavale <jason.cannavale@rackspace.com>
 Jason Koelker <jason@koelker.net>
 Jay Pipes <jaypipes@gmail.com>

From cfa2303fcb0b59e64504d079256e4356fa3bf01f Mon Sep 17 00:00:00 2001
From: Jake Dahn <admin@jakedahn.com>
Date: Tue, 9 Aug 2011 14:45:31 -0700
Subject: [PATCH 6/6] adding other emails to mailmap

---
 .mailmap | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/.mailmap b/.mailmap
index 76e7bc6693..5c8df80e0c 100644
--- a/.mailmap
+++ b/.mailmap
@@ -18,6 +18,8 @@
 <devin.carlen@gmail.com> <devcamcar@illian.local>
 <ewan.mellor@citrix.com> <emellor@silver>
 <itoumsn@nttdata.co.jp> <itoumsn@shayol>
+<jake@ansolabs.com> <jake@markupisart.com>
+<jake@ansolabs.com> <admin@jakedahn.com>
 <jaypipes@gmail.com> <jpipes@serialcoder>
 <jmckenty@gmail.com> <jmckenty@joshua-mckentys-macbook-pro.local>
 <jmckenty@gmail.com> <jmckenty@yyj-dhcp171.corp.flock.com>