From: Ilya Shakhat <ishakhat@mirantis.com>
Date: Thu, 10 Jan 2013 15:51:40 +0000 (+0400)
Subject: Fix for loadbalancer vips list
X-Git-Url: https://review.fuel-infra.org/gitweb?a=commitdiff_plain;h=3558d4445974bd5fd29562254893f9c24d8ccc56;p=openstack-build%2Fneutron-build.git

Fix for loadbalancer vips list

Fixes bug 1098165

Change-Id: I86106d39afc9d5d8c6d2d0bbdcd829baf2c1b66b
---

diff --git a/quantum/plugins/services/loadbalancer/loadbalancerPlugin.py b/quantum/plugins/services/loadbalancer/loadbalancerPlugin.py
index 0edb6e52c..e1b37606c 100644
--- a/quantum/plugins/services/loadbalancer/loadbalancerPlugin.py
+++ b/quantum/plugins/services/loadbalancer/loadbalancerPlugin.py
@@ -98,7 +98,7 @@ class LoadBalancerPlugin(loadbalancer_db.LoadBalancerPluginDb):
         return res
 
     def get_vips(self, context, filters=None, fields=None):
-        res = super(LoadBalancerPlugin, self).get_vips_db(
+        res = super(LoadBalancerPlugin, self).get_vips(
             context, filters, fields)
         LOG.debug(_("Get vips"))
         return res
diff --git a/quantum/tests/unit/db/loadbalancer/test_db_loadbalancer.py b/quantum/tests/unit/db/loadbalancer/test_db_loadbalancer.py
index 6938725aa..81f5b1202 100644
--- a/quantum/tests/unit/db/loadbalancer/test_db_loadbalancer.py
+++ b/quantum/tests/unit/db/loadbalancer/test_db_loadbalancer.py
@@ -456,6 +456,22 @@ class TestLoadBalancer(LoadBalancerPluginDbTestCase):
             for k, v in keys:
                 self.assertEqual(res['vip'][k], v)
 
+    def test_list_vips(self):
+        name = "vips_list"
+        keys = [('name', name),
+                ('subnet_id', self._subnet_id),
+                ('address', "172.16.1.123"),
+                ('port', 80),
+                ('protocol', 'HTTP'),
+                ('connection_limit', -1),
+                ('admin_state_up', True),
+                ('status', 'PENDING_CREATE')]
+        with self.vip(name=name):
+            req = self.new_list_request('vips')
+            res = self.deserialize('json', req.get_response(self.ext_api))
+            for k, v in keys:
+                self.assertEqual(res['vips'][0][k], v)
+
     def test_create_pool(self):
         name = "pool1"
         keys = [('name', name),