diff --git a/neutron_lbaas/tests/tempest/v2/api/test_listeners_non_admin.py b/neutron_lbaas/tests/tempest/v2/api/test_listeners_non_admin.py index 1fd5af156..3a122cc63 100644 --- a/neutron_lbaas/tests/tempest/v2/api/test_listeners_non_admin.py +++ b/neutron_lbaas/tests/tempest/v2/api/test_listeners_non_admin.py @@ -184,7 +184,7 @@ class ListenersTestJSON(base.BaseTestCase): self._create_listener, loadbalancer_id=self.load_balancer_id, protocol_port=self.port, - protocol="UDP") + protocol="PIGEON") self._check_status_tree(load_balancer_id=self.load_balancer_id, listener_ids=[self.listener_id]) diff --git a/neutron_lbaas/tests/tempest/v2/api/test_pools_admin.py b/neutron_lbaas/tests/tempest/v2/api/test_pools_admin.py index c6aa0a226..ec655dc8f 100644 --- a/neutron_lbaas/tests/tempest/v2/api/test_pools_admin.py +++ b/neutron_lbaas/tests/tempest/v2/api/test_pools_admin.py @@ -128,7 +128,9 @@ class TestPools(base.BaseAdminTestCase): self._update_pool(new_pool.get('id'), session_persistence=session_persistence) 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): """ @@ -141,13 +143,18 @@ class TestPools(base.BaseAdminTestCase): self._update_pool(new_pool.get('id'), session_persistence=session_persistence) 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'), session_persistence={"type": "HTTP_COOKIE"}) pool = self.pools_client.get_pool(new_pool.get('id')) session_persistence = {"type": "HTTP_COOKIE", "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') def test_delete_pool(self): diff --git a/neutron_lbaas/tests/tempest/v2/api/test_pools_non_admin.py b/neutron_lbaas/tests/tempest/v2/api/test_pools_non_admin.py index 85cea525e..d0e5c78ca 100644 --- a/neutron_lbaas/tests/tempest/v2/api/test_pools_non_admin.py +++ b/neutron_lbaas/tests/tempest/v2/api/test_pools_non_admin.py @@ -209,7 +209,7 @@ class TestPools(base.BaseTestCase): def test_create_pool_invalid_protocol(self): """Test create pool with an invalid protocol""" self.assertRaises(ex.BadRequest, self._create_pool, - protocol='UDP', + protocol='PIGEON', lb_algorithm='ROUND_ROBIN', listener_id=self.listener['id'])