openstack
/
neutron-lbaas
Code Issues Proposed changes

Update L7-proxy gate to allow new Octavia features 

Specifically: UDP is now a valid protocol, and session_persistence has
some new fields.

Change-Id: I6f2ab6cad89714773655481a17a88348900261ad
This commit is contained in:
Adam Harwell 2018-09-12 11:05:59 -06:00
parent eb47e20e87
commit 28ede08e8c
3 changed files with 12 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
neutron_lbaas/tests/tempest/v2/api/test_listeners_non_admin.py
View File

@ -184,7 +184,7 @@ class ListenersTestJSON(base.BaseTestCase):
self._create_listener, self._create_listener,
loadbalancer_id=self.load_balancer_id, loadbalancer_id=self.load_balancer_id,
protocol_port=self.port, protocol_port=self.port,
protocol="UDP") protocol="PIGEON")
self._check_status_tree(load_balancer_id=self.load_balancer_id, self._check_status_tree(load_balancer_id=self.load_balancer_id,
listener_ids=[self.listener_id]) listener_ids=[self.listener_id])

13
neutron_lbaas/tests/tempest/v2/api/test_pools_admin.py
View File

@ -128,7 +128,9 @@ class TestPools(base.BaseAdminTestCase):
self._update_pool(new_pool.get('id'), self._update_pool(new_pool.get('id'),
session_persistence=session_persistence) session_persistence=session_persistence)
pool = self.pools_client.get_pool(new_pool.get('id')) pool = self.pools_client.get_pool(new_pool.get('id'))
self.assertEqual(session_persistence, pool.get('session_persistence')) result_sp = pool.get('session_persistence')
for key in session_persistence:
self.assertEqual(session_persistence[key], result_sp[key])
def test_update_pool_sesssion_persistence_app_to_http(self): def test_update_pool_sesssion_persistence_app_to_http(self):
""" """
@ -141,13 +143,18 @@ class TestPools(base.BaseAdminTestCase):
self._update_pool(new_pool.get('id'), self._update_pool(new_pool.get('id'),
session_persistence=session_persistence) session_persistence=session_persistence)
pool = self.pools_client.get_pool(new_pool.get('id')) pool = self.pools_client.get_pool(new_pool.get('id'))
self.assertEqual(session_persistence, pool.get('session_persistence')) result_sp = pool.get('session_persistence')
for key in session_persistence:
self.assertEqual(session_persistence[key], result_sp[key])
self._update_pool(new_pool.get('id'), self._update_pool(new_pool.get('id'),
session_persistence={"type": "HTTP_COOKIE"}) session_persistence={"type": "HTTP_COOKIE"})
pool = self.pools_client.get_pool(new_pool.get('id')) pool = self.pools_client.get_pool(new_pool.get('id'))
session_persistence = {"type": "HTTP_COOKIE", session_persistence = {"type": "HTTP_COOKIE",
"cookie_name": None} "cookie_name": None}
self.assertEqual(session_persistence, pool.get('session_persistence')) result_sp = pool.get('session_persistence')
for key in session_persistence:
self.assertEqual(session_persistence[key], result_sp[key])
@decorators.attr(type='smoke') @decorators.attr(type='smoke')
def test_delete_pool(self): def test_delete_pool(self):

2
neutron_lbaas/tests/tempest/v2/api/test_pools_non_admin.py
View File

@ -209,7 +209,7 @@ class TestPools(base.BaseTestCase):
def test_create_pool_invalid_protocol(self): def test_create_pool_invalid_protocol(self):
"""Test create pool with an invalid protocol""" """Test create pool with an invalid protocol"""
self.assertRaises(ex.BadRequest, self._create_pool, self.assertRaises(ex.BadRequest, self._create_pool,
protocol='UDP', protocol='PIGEON',
lb_algorithm='ROUND_ROBIN', lb_algorithm='ROUND_ROBIN',
listener_id=self.listener['id']) listener_id=self.listener['id'])