From: Roman Prykhodchenko <rprikhodchenko@mirantis.com>
Date: Tue, 29 Jan 2013 18:33:17 +0000 (+0200)
Subject: Resetting session persisnence for a VIP.
X-Git-Url: https://review.fuel-infra.org/gitweb?a=commitdiff_plain;h=35cb218adb9a370fa1013b6ef2593e9ef081461e;p=openstack-build%2Fneutron-build.git

Resetting session persisnence for a VIP.

This change allows to reset session persistence, if it
was configured for a VIP. It's possible by passing None
value for session persistence through the REST API.

Change-Id: I8690850d0589065502a8eb774d51fe40851624f8
Fixes: bug #1109101
---

diff --git a/quantum/api/v2/attributes.py b/quantum/api/v2/attributes.py
index cb0c1dec7..96c9b29a6 100644
--- a/quantum/api/v2/attributes.py
+++ b/quantum/api/v2/attributes.py
@@ -338,6 +338,10 @@ def convert_none_to_empty_list(value):
     return [] if value is None else value
 
 
+def convert_none_to_empty_dict(value):
+    return {} if value is None else value
+
+
 def convert_to_list(data):
     if data is None:
         return []
diff --git a/quantum/db/loadbalancer/loadbalancer_db.py b/quantum/db/loadbalancer/loadbalancer_db.py
index 61d2949e4..2556cf756 100644
--- a/quantum/db/loadbalancer/loadbalancer_db.py
+++ b/quantum/db/loadbalancer/loadbalancer_db.py
@@ -260,7 +260,7 @@ class LoadBalancerPluginDb(LoadBalancerPluginBase):
         with context.session.begin(subtransactions=True):
             pool_db.update({'vip_id': vip_id})
 
-    def _update_vip_session_persistence_info(self, context, vip_id, info):
+    def _update_vip_session_persistence(self, context, vip_id, info):
         vip = self._get_resource(context, Vip, vip_id)
 
         with context.session.begin(subtransactions=True):
@@ -279,10 +279,10 @@ class LoadBalancerPluginDb(LoadBalancerPluginBase):
                 vip.session_persistence = sesspersist_db
             context.session.add(vip)
 
-    def _delete_sessionpersistence(self, context, id):
+    def _delete_session_persistence(self, context, vip_id):
         with context.session.begin(subtransactions=True):
             sess_qry = context.session.query(SessionPersistence)
-            sess_qry.filter_by(vip_id=id).delete()
+            sess_qry.filter_by(vip_id=vip_id).delete()
 
     def create_vip(self, context, vip):
         v = vip['vip']
@@ -325,12 +325,12 @@ class LoadBalancerPluginDb(LoadBalancerPluginBase):
     def update_vip(self, context, id, vip):
         v = vip['vip']
 
-        sesspersist_info = v.pop('session_persistence', None)
+        sess_persist = v.pop('session_persistence', None)
         with context.session.begin(subtransactions=True):
-            if sesspersist_info:
-                self._update_vip_session_persistence_info(context,
-                                                          id,
-                                                          sesspersist_info)
+            if sess_persist:
+                self._update_vip_session_persistence(context, id, sess_persist)
+            else:
+                self._delete_session_persistence(context, id)
 
             vip_db = self._get_resource(context, Vip, id)
             old_pool_id = vip_db['pool_id']
diff --git a/quantum/extensions/loadbalancer.py b/quantum/extensions/loadbalancer.py
index 46e252607..4bd9ef369 100644
--- a/quantum/extensions/loadbalancer.py
+++ b/quantum/extensions/loadbalancer.py
@@ -88,6 +88,7 @@ RESOURCE_ATTRIBUTE_MAP = {
                     'validate': {'type:uuid': None},
                     'is_visible': True},
         'session_persistence': {'allow_post': True, 'allow_put': True,
+                                'convert_to': attr.convert_none_to_empty_dict,
                                 'default': {},
                                 'validate': {'type:dict': None},
                                 'is_visible': True},
diff --git a/quantum/tests/unit/db/loadbalancer/test_db_loadbalancer.py b/quantum/tests/unit/db/loadbalancer/test_db_loadbalancer.py
index 8d85a718e..9037a0099 100644
--- a/quantum/tests/unit/db/loadbalancer/test_db_loadbalancer.py
+++ b/quantum/tests/unit/db/loadbalancer/test_db_loadbalancer.py
@@ -438,6 +438,26 @@ class TestLoadBalancer(LoadBalancerPluginDbTestCase):
             for k, v in keys:
                 self.assertEqual(vip['vip'][k], v)
 
+    def test_reset_session_persistence(self):
+        name = 'vip4'
+        session_persistence = {'type': "HTTP_COOKIE",
+                               'cookie_name': "cookie_name"}
+
+        update_info = {'vip': {'session_persistence': None}}
+
+        with self.vip(name=name, session_persistence=session_persistence) as v:
+            # Ensure that vip has been created properly
+            self.assertEqual(v['vip']['session_persistence'],
+                             session_persistence)
+
+            # Try resetting session_persistence
+            req = self.new_update_request('vips', update_info, v['vip']['id'])
+            res = self.deserialize('json', 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'])
+
     def test_update_vip(self):
         name = 'new_vip'
         keys = [('name', name),