review issues fixed

5 files changed, 24 insertions, 24 deletions

diff --git a/nova/api/openstack/contrib/floating_ips.py b/nova/api/openstack/contrib/floating_ips.py
index 467b46712..ca192f501 100644
--- a/nova/api/openstack/contrib/floating_ips.py
+++ b/nova/api/openstack/contrib/floating_ips.py
@@ -65,7 +65,7 @@ class FloatingIPController(object):
         context = req.environ['nova.context']
 
         try:
-            floating_ip = self.network_api.get(context, id)
+            floating_ip = self.network_api.get_floating_ip(context, id)
         except exception.NotFound:
             return faults.Fault(exc.HTTPNotFound())
 
@@ -74,7 +74,7 @@ class FloatingIPController(object):
     def index(self, req):
         context = req.environ['nova.context']
 
-        floating_ips = self.network_api.list(context)
+        floating_ips = self.network_api.list_floating_ips(context)
 
         return _translate_floating_ips_view(floating_ips)
 
@@ -97,7 +97,7 @@ class FloatingIPController(object):
     def delete(self, req, id):
         context = req.environ['nova.context']
 
-        ip = self.network_api.get(context, id)
+        ip = self.network_api.get_floating_ip(context, id)
         self.network_api.release_floating_ip(context, address=ip)
 
         return {'released': {
@@ -126,7 +126,7 @@ class FloatingIPController(object):
     def disassociate(self, req, id, body):
         """ POST /floating_ips/{id}/disassociate """
         context = req.environ['nova.context']
-        floating_ip = self.network_api.get(context, id)
+        floating_ip = self.network_api.get_floating_ip(context, id)
         address = floating_ip['address']
         fixed_ip = floating_ip['fixed_ip']['address']
 
@@ -140,7 +140,7 @@ class FloatingIPController(object):
 
     def _get_ip_by_id(self, context, value):
         """Checks that value is id and then returns its address."""
-        return self.network_api.get(context, value)['address']
+        return self.network_api.get_floating_ip(context, value)['address']
 
 
 class Floating_ips(extensions.ExtensionDescriptor):
@@ -148,7 +148,7 @@ class Floating_ips(extensions.ExtensionDescriptor):
         return "Floating_ips"
 
     def get_alias(self):
-        return "FLOATING_IPS"
+        return "os-floating-ips"
 
     def get_description(self):
         return "Floating IPs support"
@@ -163,10 +163,10 @@ class Floating_ips(extensions.ExtensionDescriptor):
         resources = []
 
         res = extensions.ResourceExtension('floating_ips',
-                                        FloatingIPController(),
-                                        member_actions={
-                                            'associate': 'POST',
-                                            'disassociate': 'POST'})
+                         FloatingIPController(),
+                         member_actions={
+                            'associate': 'POST',
+                            'disassociate': 'POST'})
         resources.append(res)
 
         return resources
diff --git a/nova/db/sqlalchemy/api.py b/nova/db/sqlalchemy/api.py
index 426ea5127..55badb9e0 100644
--- a/nova/db/sqlalchemy/api.py
+++ b/nova/db/sqlalchemy/api.py
@@ -448,7 +448,7 @@ def floating_ip_get(context, ip_id):
                          filter_by(deleted=False).\
                          first()
     if not result:
-        raise exception.FloatingIpNotFound()
+        raise exception.FloatingIpNotFoundForFixedAddress()
 
     return result
 
@@ -605,7 +605,7 @@ def floating_ip_get_by_address(context, address, session=None):
                      filter_by(deleted=can_read_deleted(context)).\
                      first()
     if not result:
-        raise exception.FloatingIpNotFound(fixed_ip=address)
+        raise exception.FloatingIpNotFoundForFixedAddress(fixed_ip=address)
 
     return result
 
@@ -621,7 +621,7 @@ def floating_ip_get_by_ip(context, ip, session=None):
                 first()
 
     if not result:
-        raise exception.FloatingIpNotDefined(floating_ip=ip)
+        raise exception.FloatingIpNotFound(floating_ip=ip)
 
     return result
 
@@ -761,7 +761,7 @@ def fixed_ip_get_by_address(context, address, session=None):
                      options(joinedload('instance')).\
                      first()
     if not result:
-        raise exception.FloatingIpNotFound(fixed_ip=address)
+        raise exception.FloatingIpNotFoundForFixedAddress(fixed_ip=address)
 
     if is_user_context(context):
         authorize_project_context(context, result.instance.project_id)
diff --git a/nova/exception.py b/nova/exception.py
index 8230c2b26..8a63a79f2 100644
--- a/nova/exception.py
+++ b/nova/exception.py
@@ -360,11 +360,11 @@ class NoFixedIpsFoundForInstance(NotFound):
     message = _("Instance %(instance_id)s has zero fixed ips.")
 
 
-class FloatingIpNotDefined(NotFound):
+class FloatingIpNotFound(NotFound):
     message = _("Floating ip %(floating_ip)s not found")
 
 
-class FloatingIpNotFound(NotFound):
+class FloatingIpNotFoundForFixedAddress(NotFound):
     message = _("Floating ip not found for fixed address %(fixed_ip)s.")
 
 
diff --git a/nova/network/api.py b/nova/network/api.py
index f1c2dd1f6..dd3ed1709 100644
--- a/nova/network/api.py
+++ b/nova/network/api.py
@@ -34,7 +34,7 @@ LOG = logging.getLogger('nova.network')
 class API(base.Base):
     """API for interacting with the network manager."""
 
-    def get(self, context, id):
+    def get_floating_ip(self, context, id):
         rv = self.db.floating_ip_get(context, id)
         return dict(rv.iteritems())
 
@@ -42,7 +42,7 @@ class API(base.Base):
         res = self.db.floating_ip_get_by_ip(context, address)
         return dict(res.iteritems())
 
-    def list(self, context):
+    def list_floating_ips(self, context):
         ips = self.db.floating_ip_get_all_by_project(context,
                                                      context.project_id)
         return ips
diff --git a/nova/tests/api/openstack/contrib/test_floating_ips.py b/nova/tests/api/openstack/contrib/test_floating_ips.py
index 4e26994dd..4a74861bd 100644
--- a/nova/tests/api/openstack/contrib/test_floating_ips.py
+++ b/nova/tests/api/openstack/contrib/test_floating_ips.py
@@ -28,12 +28,12 @@ from nova.api.openstack.contrib.floating_ips import FloatingIPController
 from nova.api.openstack.contrib.floating_ips import _translate_floating_ip_view
 
 
-def network_api_get(self, context, id):
+def network_api_get_floating_ip(self, context, id):
     return {'id': 1, 'address': '10.10.10.10',
             'fixed_ip': {'address': '11.0.0.1'}}
 
 
-def network_api_list(self, context):
+def network_api_list_floating_ips(self, context):
     return [{'id': 1,
              'address': '10.10.10.10',
              'instance': {'id': 11},
@@ -80,10 +80,10 @@ class FloatingIpTest(test.TestCase):
         fakes.stub_out_networking(self.stubs)
         fakes.stub_out_rate_limiting(self.stubs)
         fakes.stub_out_auth(self.stubs)
-        self.stubs.Set(network.api.API, "get",
-                       network_api_get)
-        self.stubs.Set(network.api.API, "list",
-                       network_api_list)
+        self.stubs.Set(network.api.API, "get_floating_ip",
+                       network_api_get_floating_ip)
+        self.stubs.Set(network.api.API, "list_floating_ips",
+                       network_api_list_floating_ips)
         self.stubs.Set(network.api.API, "allocate_floating_ip",
                        network_api_allocate)
         self.stubs.Set(network.api.API, "release_floating_ip",