Merge lp:~jtran/nova/lp761827 into lp:~hudson-openstack/nova/trunk

[John Tran]

network api release_floating_ip method will now check to see if an instance is associated to it, prior to releasing.

network api release_floating_ip method will now check to see if an instance is associated to it, prior to releasing.

[lp:~jtran/nova/lp761827]

1284. By John Tran on 2011-07-19

move import network to the top

[Brian Lamar (blamar)]

Seems like a good straight-forward fix to me.

review: Approve

[Brian Waldon (bcwaldon)]

Looks good, John.

review: Approve

[Jason Kölker (jason-koelker)]

Is Bueno.

review: Approve

=== modified file 'nova/network/api.py'
--- nova/network/api.py	2011-07-07 16:45:00 +0000
+++ nova/network/api.py	2011-07-19 21:16:44 +0000
@@ -61,6 +61,9 @@
                             affect_auto_assigned=False):
         """Removes floating ip with address from a project."""
         floating_ip = self.db.floating_ip_get_by_address(context, address)
+        if floating_ip['fixed_ip']:
+            raise exception.ApiError(_('Floating ip is in use.  '
+                             'Disassociate it before releasing.'))
         if not affect_auto_assigned and floating_ip.get('auto_assigned'):
             return
         # NOTE(vish): We don't know which network host should get the ip

=== modified file 'nova/tests/test_cloud.py'
--- nova/tests/test_cloud.py	2011-07-18 23:42:02 +0000
+++ nova/tests/test_cloud.py	2011-07-19 21:16:44 +0000
@@ -15,6 +15,7 @@
 #    WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
 #    License for the specific language governing permissions and limitations
 #    under the License.
+import mox
 
 from base64 import b64decode
 from M2Crypto import BIO
@@ -29,6 +30,7 @@
 from nova import exception
 from nova import flags
 from nova import log as logging
+from nova import network
 from nova import rpc
 from nova import test
 from nova import utils
@@ -132,6 +134,33 @@
                           allocate,
                           self.context)
 
+    def test_release_address(self):
+        address = "10.10.10.10"
+        allocate = self.cloud.allocate_address
+        db.floating_ip_create(self.context,
+                              {'address': address,
+                               'host': self.network.host})
+        result = self.cloud.release_address(self.context, address)
+        self.assertEqual(result['releaseResponse'], ['Address released.'])
+
+    def test_release_address_still_associated(self):
+        address = "10.10.10.10"
+        fixed_ip = {'instance': {'id': 1}}
+        floating_ip = {'id': 0,
+                       'address': address,
+                       'fixed_ip_id': 0,
+                       'fixed_ip': fixed_ip,
+                       'project_id': None,
+                       'auto_assigned': False}
+        network_api = network.api.API()
+        self.mox.StubOutWithMock(network_api.db, 'floating_ip_get_by_address')
+        network_api.db.floating_ip_get_by_address(mox.IgnoreArg(),
+                                mox.IgnoreArg()).AndReturn(floating_ip)
+        self.mox.ReplayAll()
+        release = self.cloud.release_address
+        # ApiError: Floating ip is in use.  Disassociate it before releasing.
+        self.assertRaises(exception.ApiError, release, self.context, address)
+
     @test.skip_test("Skipping this pending future merge")
     def test_associate_disassociate_address(self):
         """Verifies associate runs cleanly without raising an exception"""