Merge lp:~tpatil/nova/bug745152 into lp:~hudson-openstack/nova/trunk

[Tushar Patil]

If the floating ip address is not allocated or is allocated to another project, then the user trying to associate the floating ip address to an instance should get a proper error message.

If the floating ip address is not allocated or is allocated to another project, then the user trying to associate the floating ip address to an instance should get a proper error message.

[Vish Ishaya (vishvananda)]

you need to fix the i18n of the strings or it will fail the test. For multiple replacement strings you need to use the dictionary format "%(address)s %(project)s" % {'address': xxxx, 'project': xxxx}

Otherwise it looks good

review: Needs Fixing

[termie (termie)]

lgtm

review: Approve

[lp:~tpatil/nova/bug745152]

924. By Tushar Patil on 2011-03-30

fixed review comment for i18n string multiple replacement strings need to use dictionary format

925. By Tushar Patil on 2011-03-30

fixed review comment for i18n string multiple replacement strings need to use dictionary format

[Tushar Patil (tpatil)]

Fixed the review comments. Please review the code.

[Devin Carlen (devcamcar)]

lgtm

review: Approve

=== modified file 'nova/network/api.py'
--- nova/network/api.py	2011-02-22 23:50:42 +0000
+++ nova/network/api.py	2011-03-30 22:13:14 +0000
@@ -66,6 +66,21 @@
         if isinstance(fixed_ip, str) or isinstance(fixed_ip, unicode):
             fixed_ip = self.db.fixed_ip_get_by_address(context, fixed_ip)
         floating_ip = self.db.floating_ip_get_by_address(context, floating_ip)
+        # Check if the floating ip address is allocated
+        if floating_ip['project_id'] is None:
+            raise exception.ApiError(_("Address (%s) is not allocated") %
+                                       floating_ip['address'])
+        # Check if the floating ip address is allocated to the same project
+        if floating_ip['project_id'] != context.project_id:
+            LOG.warn(_("Address (%(address)s) is not allocated to your "
+                       "project (%(project)s)"),
+                       {'address': floating_ip['address'],
+                       'project': context.project_id})
+            raise exception.ApiError(_("Address (%(address)s) is not "
+                                       "allocated to your project"
+                                       "(%(project)s)") %
+                                        {'address': floating_ip['address'],
+                                        'project': context.project_id})
         # NOTE(vish): Perhaps we should just pass this on to compute and
         #             let compute communicate with network.
         host = fixed_ip['network']['host']