From: Oleg Bondarev <obondarev@mirantis.com>
Date: Thu, 24 Oct 2013 09:59:10 +0000 (+0400)
Subject: LBaaS: when returning VIP include session_persistence even if None
X-Git-Url: https://review.fuel-infra.org/gitweb?a=commitdiff_plain;h=338569c7c30509bce8565272023dfd791f4e9609;p=openstack-build%2Fneutron-build.git

LBaaS: when returning VIP include session_persistence even if None

Closes-Bug: #1231915
Change-Id: I3dc5e17118995fb49dd381d08c9d92cb60b80abb
---

diff --git a/neutron/db/loadbalancer/loadbalancer_db.py b/neutron/db/loadbalancer/loadbalancer_db.py
index 02d2a7b15..041e0bc96 100644
--- a/neutron/db/loadbalancer/loadbalancer_db.py
+++ b/neutron/db/loadbalancer/loadbalancer_db.py
@@ -233,6 +233,7 @@ class LoadBalancerPluginDb(LoadBalancerPluginBase,
                'protocol_port': vip['protocol_port'],
                'protocol': vip['protocol'],
                'pool_id': vip['pool_id'],
+               'session_persistence': None,
                'connection_limit': vip['connection_limit'],
                'admin_state_up': vip['admin_state_up'],
                'status': vip['status'],
diff --git a/neutron/tests/unit/db/loadbalancer/test_db_loadbalancer.py b/neutron/tests/unit/db/loadbalancer/test_db_loadbalancer.py
index c54c72939..fcdcf08f8 100644
--- a/neutron/tests/unit/db/loadbalancer/test_db_loadbalancer.py
+++ b/neutron/tests/unit/db/loadbalancer/test_db_loadbalancer.py
@@ -472,9 +472,7 @@ class TestLoadBalancer(LoadBalancerPluginDbTestCase):
             req = self.new_update_request('vips', update_info, v['vip']['id'])
             res = self.deserialize(self.fmt, req.get_response(self.ext_api))
 
-            # If session persistence has been removed, it won't be present in
-            # the response.
-            self.assertNotIn('session_persistence', res['vip'])
+            self.assertIsNone(res['vip']['session_persistence'])
 
     def test_update_vip(self):
         name = 'new_vip'