Merge lp:~rackspace-titan/nova/nova-manage-address-not-found-lp831627 into lp:~hudson-openstack/nova/trunk

[Alex Meade]

Fixes bug 831627 where nova-manage does not exit when given a non-existent network address

[Devin Carlen (devcamcar)]

lgtm

review: Approve

[Brian Waldon (bcwaldon)]

Hardcore.

review: Approve

=== modified file 'bin/nova-manage'
--- bin/nova-manage	2011-08-15 20:33:37 +0000
+++ bin/nova-manage	2011-08-22 21:41:25 +0000
@@ -611,6 +611,8 @@
 
         try:
             fixed_ip = db.fixed_ip_get_by_address(ctxt, address)
+            if fixed_ip is None:
+                raise exception.NotFound('Could not find address')
             db.fixed_ip_update(ctxt, fixed_ip['address'],
                                 {'reserved': reserved})
         except exception.NotFound as ex:

=== modified file 'nova/tests/test_nova_manage.py'
--- nova/tests/test_nova_manage.py	2011-08-22 20:39:05 +0000
+++ nova/tests/test_nova_manage.py	2011-08-22 21:41:25 +0000
@@ -55,8 +55,18 @@
                                              '192.168.0.100')
         self.assertEqual(address['reserved'], True)
 
+    def test_reserve_nonexistent_address(self):
+        self.assertRaises(SystemExit,
+                          self.commands.reserve,
+                          '55.55.55.55')
+
     def test_unreserve(self):
         self.commands.unreserve('192.168.0.100')
         address = db.fixed_ip_get_by_address(context.get_admin_context(),
                                              '192.168.0.100')
         self.assertEqual(address['reserved'], False)
+
+    def test_unreserve_nonexistent_address(self):
+        self.assertRaises(SystemExit,
+                          self.commands.unreserve,
+                          '55.55.55.55')