From a1e310aaa9f0ef829e2857c524be140541f3a13d Mon Sep 17 00:00:00 2001
From: Ilya Alekseyev <ialekseev@griddynamics.com>
Date: Thu, 16 Jun 2011 20:31:09 +0400
Subject: floating_ips extension is loading to api now

---
 nova/api/openstack/contrib/floating_ips.py | 45 ++++++++++++++++++++++++++++--
 nova/network/api.py                        |  5 ++++
 tools/pip-requires                         |  2 +-
 3 files changed, 49 insertions(+), 3 deletions(-)

diff --git a/nova/api/openstack/contrib/floating_ips.py b/nova/api/openstack/contrib/floating_ips.py
index b67b8b4ec..6c08f52e5 100644
--- a/nova/api/openstack/contrib/floating_ips.py
+++ b/nova/api/openstack/contrib/floating_ips.py
@@ -19,11 +19,16 @@ from webob import exc
 from nova import exception
 from nova import network
 from nova.api.openstack import faults
+from nova.api.openstack import extensions
 
 def _translate_floating_ip_detail_view(context, floating_ip):
     #TODO(enugaev) implement view
     return None
 
+def _translate_floating_ips_view(context, floating_ips):
+    #TODO(adiantum) implement view
+    return []
+
 class FloatingIPController(object):
     """The Volumes API controller for the OpenStack API."""
 
@@ -50,5 +55,41 @@ class FloatingIPController(object):
         except exception.NotFound:
             return faults.Fault(exc.HTTPNotFound())
 
-        return {'volume': _translate_floating_ip_detail_view(context,
-                                                             floating_ip)}
\ No newline at end of file
+        return {'floating_ips': _translate_floating_ip_detail_view(context,
+                                                             floating_ip)}
+
+    def index(self, req):
+        context = req.environ['nova.context']
+
+        floating_ips = self.network_api.list(context)
+
+        return {'floating_ips' : _translate_floating_ips_view(context,
+                                                              floating_ips)}
+
+
+class Floating_ips(extensions.ExtensionDescriptor):
+    def get_name(self):
+        return "Floating_ips"
+
+    def get_alias(self):
+        return "FLOATING_IPS"
+
+    def get_description(self):
+        return "Floating IPs support"
+
+    def get_namespace(self):
+        return "http://docs.openstack.org/ext/floating_ips/api/v1.1"
+
+    def get_updated(self):
+        return "2011-06-16T00:00:00+00:00"
+
+    def get_resources(self):
+        resources = []
+
+        res = extensions.ResourceExtension('floating_ips',
+                                        FloatingIPController(),
+                                        collection_actions={})
+        resources.append(res)
+
+        return resources
+
diff --git a/nova/network/api.py b/nova/network/api.py
index e5c4d6718..001c5a6f6 100644
--- a/nova/network/api.py
+++ b/nova/network/api.py
@@ -38,6 +38,11 @@ class API(base.Base):
         rv = self.db.floating_ip_get(context)
         return dict(rv.iteritems())
 
+    def list(self, context):
+        ips = self.db.floating_ip_get_all_by_project(context,
+                                                     context.project_id)
+        return ips
+
     def allocate_floating_ip(self, context):
         if quota.allowed_floating_ips(context, 1) < 1:
             LOG.warn(_('Quota exceeeded for %s, tried to allocate '
diff --git a/tools/pip-requires b/tools/pip-requires
index 168dacd40..f43e015f8 100644
--- a/tools/pip-requires
+++ b/tools/pip-requires
@@ -10,7 +10,7 @@ boto==1.9b
 carrot==0.10.5
 eventlet==0.9.12
 lockfile==0.8
-python-novaclient==2.5
+python-novaclient>=2.5
 python-daemon==1.5.5
 python-gflags==1.3
 redis==2.0.0
-- 
cgit