Merge "Parse and send session persistence info to lbaas driver in cas…

…e of lbaasv2"
Juniper · Apr 5, 2016 · 7aac764 · 7aac764
2 parents 09c1751 + dd13bce
commit 7aac764
Show file tree

Hide file tree

Showing 5 changed files with 15 additions and 4 deletions.
diff --git a/src/config/svc-monitor/svc_monitor/loadbalancer_agent.py b/src/config/svc-monitor/svc_monitor/loadbalancer_agent.py
@@ -392,7 +392,6 @@ def listener_get_reqdict(self, listener):
                'protocol_port': props['protocol_port'],
                'protocol': props['protocol'],
                'loadbalancer_id': listener.loadbalancer,
-               'session_persistence': None,
                'admin_state_up': props['admin_state'],
                'status': self._get_object_status(listener)}
 
@@ -484,6 +483,7 @@ def loadbalancer_pool_get_reqdict(self, pool):
             'name': pool.display_name,
             'description': self._get_object_description(pool),
             'status': self._get_object_status(pool),
+            'session_persistence': None,
         }
 
         props = pool.params
@@ -492,6 +492,12 @@ def loadbalancer_pool_get_reqdict(self, pool):
             if value is not None:
                 res[mapping] = value
 
+        if props['session_persistence']:
+            sp = {'type': props['session_persistence']}
+            if props['session_persistence'] == 'APP_COOKIE':
+                sp['cookie_name'] = props['persistence_cookie_name']
+            res['session_persistence'] = sp
+
         # provider
         res['provider'] = pool.provider
 

diff --git a/src/config/svc-monitor/svc_monitor/tests/test_f5_lb.py b/src/config/svc-monitor/svc_monitor/tests/test_f5_lb.py
@@ -157,7 +157,8 @@ def create_pool(self, uuid, fq_name_str, project=None, vip=None, hm=None):
         pool_obj['loadbalancer_pool_provider'] = 'f5'
         pool_obj['loadbalancer_pool_properties'] = \
             {'protocol': 'HTTP', 'subnet_id': 'pool_subnet_id',
-             'loadbalancer_method': 'ROUND_ROBIN', 'admin_state': 'true'}
+             'loadbalancer_method': 'ROUND_ROBIN', 'admin_state': 'true',
+             'session_persistence': None, 'persistence_cookie_name': None}
         if vip:
             pool_obj['virtual_ip_back_refs']=[{'uuid': vip.uuid}]
         if hm:

diff --git a/src/config/svc-monitor/svc_monitor/tests/test_ha_proxy.py b/src/config/svc-monitor/svc_monitor/tests/test_ha_proxy.py
@@ -171,7 +171,8 @@ def create_pool(self, uuid, fq_name_str, project=None, vip=None, hm=None):
         pool_obj['loadbalancer_pool_provider'] = 'opencontrail'
         pool_obj['loadbalancer_pool_properties'] = \
             {'protocol': 'HTTP', 'subnet_id': 'subnet-id',
-             'loadbalancer_method': 'ROUND_ROBIN', 'admin_state': 'true'}
+             'loadbalancer_method': 'ROUND_ROBIN', 'admin_state': 'true',
+             'session_persistence': None, 'persistence_cookie_name': None}
         if vip:
             pool_obj['virtual_ip_back_refs']=[{'uuid': vip.uuid}]
         if hm:

diff --git a/src/config/svc-monitor/svc_monitor/tests/test_loadbalancer_agent.py b/src/config/svc-monitor/svc_monitor/tests/test_loadbalancer_agent.py
@@ -132,6 +132,8 @@ def create_pool(self, fq_name_str, vip=None, hm=None):
         pool_obj['loadbalancer_pool_properties'] = {'protocol': 'HTTP',
                                                     'subnet_id': 'subnet-id',
                                                     'loadbalancer_method': 'ROUND_ROBIN',
+                                                    'session_persistence': None,
+                                                    'persistence_cookie_name': None,
                                                     'admin_state': 'true'}
         if vip:
             pool_obj['virtual_ip_back_refs']=[{'uuid': vip.uuid}]

diff --git a/src/config/svc-monitor/svc_monitor/tests/test_svc_monitor.py b/src/config/svc-monitor/svc_monitor/tests/test_svc_monitor.py
@@ -674,7 +674,8 @@ def add_pool(self, name, uuid, proj_obj, sas_obj):
         pool_dict['loadbalancer_pool_provider'] = 'Test-SAS'
         pool_dict['loadbalancer_pool_properties'] = \
             {'protocol': 'TCP', 'subnet_id': 'subnet-id',
-             'loadbalancer_method': 'ROUND_ROBIN', 'admin_state': 'true'}
+             'loadbalancer_method': 'ROUND_ROBIN', 'admin_state': 'true',
+             'session_persistence': None, 'persistence_cookie_name': None}
         pool_obj = LoadbalancerPool.from_dict(**pool_dict)
         self._return_obj['loadbalancer_pool'] = pool_dict
         config_db.LoadbalancerPoolSM.locate(uuid)