From 946ab2d6a518501f150a59d86428df1e986c6028 Mon Sep 17 00:00:00 2001 From: Oleg Bondarev Date: Mon, 28 Oct 2013 17:51:05 +0400 Subject: [PATCH] LBaaS UT: use constants vs magic numbers for http error codes Closes-Bug: #1245388 Change-Id: I4192b577182891f6d777a5a5eac237c9961e41bb --- .../db/loadbalancer/test_db_loadbalancer.py | 46 +++++++++++-------- .../drivers/haproxy/test_plugin_driver.py | 7 +-- .../loadbalancer/test_agent_scheduler.py | 2 +- 3 files changed, 31 insertions(+), 24 deletions(-) diff --git a/neutron/tests/unit/db/loadbalancer/test_db_loadbalancer.py b/neutron/tests/unit/db/loadbalancer/test_db_loadbalancer.py index 6ba2b3ff5..4e32c7559 100644 --- a/neutron/tests/unit/db/loadbalancer/test_db_loadbalancer.py +++ b/neutron/tests/unit/db/loadbalancer/test_db_loadbalancer.py @@ -162,7 +162,7 @@ class LoadBalancerTestMixin(object): admin_state_up, subnet_id=tmp_subnet['subnet']['id'], **kwargs) - if res.status_int >= 400: + if res.status_int >= webob.exc.HTTPClientError.code: raise webob.exc.HTTPClientError( explanation=_("Unexpected error code: %s") % res.status_int @@ -186,7 +186,7 @@ class LoadBalancerTestMixin(object): protocol, admin_state_up, **kwargs) - if res.status_int >= 400: + if res.status_int >= webob.exc.HTTPClientError.code: raise webob.exc.HTTPClientError( explanation=_("Unexpected error code: %s") % res.status_int ) @@ -207,7 +207,7 @@ class LoadBalancerTestMixin(object): protocol_port, admin_state_up, **kwargs) - if res.status_int >= 400: + if res.status_int >= webob.exc.HTTPClientError.code: raise webob.exc.HTTPClientError( explanation=_("Unexpected error code: %s") % res.status_int ) @@ -232,7 +232,7 @@ class LoadBalancerTestMixin(object): max_retries, admin_state_up, **kwargs) - if res.status_int >= 400: + if res.status_int >= webob.exc.HTTPClientError.code: raise webob.exc.HTTPClientError( explanation=_("Unexpected error code: %s") % res.status_int ) @@ -455,7 +455,8 @@ class TestLoadBalancer(LoadBalancerPluginDbTestCase): data = {'vip': {'pool_id': pool['pool']['id']}} req = self.new_update_request('vips', data, vip['vip']['id']) res = req.get_response(self.ext_api) - self.assertEqual(res.status_int, 400) + self.assertEqual(res.status_int, + webob.exc.HTTPClientError.code) def test_reset_session_persistence(self): name = 'vip4' @@ -504,7 +505,7 @@ class TestLoadBalancer(LoadBalancerPluginDbTestCase): req = self.new_delete_request('vips', vip['vip']['id']) res = req.get_response(self.ext_api) - self.assertEqual(res.status_int, 204) + self.assertEqual(res.status_int, webob.exc.HTTPNoContent.code) def test_show_vip(self): name = "vip_show" @@ -677,7 +678,7 @@ class TestLoadBalancer(LoadBalancerPluginDbTestCase): req = self.new_delete_request('pools', pool['pool']['id']) res = req.get_response(self.ext_api) - self.assertEqual(res.status_int, 204) + self.assertEqual(res.status_int, webob.exc.HTTPNoContent.code) def test_delete_pool_preserve_state(self): with self.pool(no_delete=True) as pool: @@ -685,12 +686,12 @@ class TestLoadBalancer(LoadBalancerPluginDbTestCase): req = self.new_delete_request('pools', pool['pool']['id']) res = req.get_response(self.ext_api) - self.assertEqual(res.status_int, 409) + self.assertEqual(res.status_int, webob.exc.HTTPConflict.code) req = self.new_show_request('pools', pool['pool']['id'], fmt=self.fmt) res = req.get_response(self.ext_api) - self.assertEqual(res.status_int, 200) + self.assertEqual(res.status_int, webob.exc.HTTPOk.code) res = self.deserialize(self.fmt, req.get_response(self.ext_api)) self.assertEqual(res['pool']['status'], @@ -832,7 +833,7 @@ class TestLoadBalancer(LoadBalancerPluginDbTestCase): req = self.new_delete_request('members', member['member']['id']) res = req.get_response(self.ext_api) - self.assertEqual(res.status_int, 204) + self.assertEqual(res.status_int, webob.exc.HTTPNoContent.code) req = self.new_show_request('pools', pool_id, @@ -941,7 +942,7 @@ class TestLoadBalancer(LoadBalancerPluginDbTestCase): req = self.new_delete_request('health_monitors', monitor['health_monitor']['id']) res = req.get_response(self.ext_api) - self.assertEqual(res.status_int, 204) + self.assertEqual(res.status_int, webob.exc.HTTPNoContent.code) qry = ctx.session.query(ldb.HealthMonitor) qry = qry.filter_by(id=monitor['health_monitor']['id']) self.assertIsNone(qry.first()) @@ -962,7 +963,7 @@ class TestLoadBalancer(LoadBalancerPluginDbTestCase): id=pool['pool']['id'], subresource='health_monitors') res = req.get_response(self.ext_api) - self.assertEqual(res.status_int, 201) + self.assertEqual(res.status_int, webob.exc.HTTPCreated.code) ctx = context.get_admin_context() @@ -976,7 +977,7 @@ class TestLoadBalancer(LoadBalancerPluginDbTestCase): monitor['health_monitor']['id'] ) res = req.get_response(self.ext_api) - self.assertEqual(res.status_int, 204) + self.assertEqual(res.status_int, webob.exc.HTTPNoContent.code) # check if all corresponding Pool associations are deleted qry = ctx.session.query(ldb.PoolMonitorAssociation) qry = qry.filter_by(monitor_id=monitor['health_monitor']['id']) @@ -1108,7 +1109,8 @@ class TestLoadBalancer(LoadBalancerPluginDbTestCase): id=pool['pool']['id'], subresource="health_monitors") res = req.get_response(self.ext_api) - self.assertEqual(res.status_int, 201) + self.assertEqual(res.status_int, + webob.exc.HTTPCreated.code) data = {"health_monitor": { "id": monitor2['health_monitor']['id'], @@ -1120,7 +1122,8 @@ class TestLoadBalancer(LoadBalancerPluginDbTestCase): id=pool['pool']['id'], subresource="health_monitors") res = req.get_response(self.ext_api) - self.assertEqual(res.status_int, 201) + self.assertEqual(res.status_int, + webob.exc.HTTPCreated.code) req = self.new_show_request( 'pools', @@ -1160,7 +1163,8 @@ class TestLoadBalancer(LoadBalancerPluginDbTestCase): id=pool['pool']['id'], subresource="health_monitors") res = req.get_response(self.ext_api) - self.assertEqual(res.status_int, 201) + self.assertEqual(res.status_int, + webob.exc.HTTPCreated.code) data = {"health_monitor": { "id": monitor2['health_monitor']['id'], @@ -1172,7 +1176,8 @@ class TestLoadBalancer(LoadBalancerPluginDbTestCase): id=pool['pool']['id'], subresource="health_monitors") res = req.get_response(self.ext_api) - self.assertEqual(res.status_int, 201) + self.assertEqual(res.status_int, + webob.exc.HTTPCreated.code) # remove one of healthmonitor from the pool req = self.new_delete_request( @@ -1182,7 +1187,8 @@ class TestLoadBalancer(LoadBalancerPluginDbTestCase): sub_id=monitor1['health_monitor']['id'], subresource="health_monitors") res = req.get_response(self.ext_api) - self.assertEqual(res.status_int, 204) + self.assertEqual(res.status_int, + webob.exc.HTTPNoContent.code) req = self.new_show_request( 'pools', @@ -1233,7 +1239,7 @@ class TestLoadBalancer(LoadBalancerPluginDbTestCase): '3', True) health_monitor = self.deserialize(self.fmt, req) - self.assertEqual(req.status_int, 201) + self.assertEqual(req.status_int, webob.exc.HTTPCreated.code) # Associate the health_monitor to the pool data = {"health_monitor": { @@ -1245,7 +1251,7 @@ class TestLoadBalancer(LoadBalancerPluginDbTestCase): id=pool['pool']['id'], subresource="health_monitors") res = req.get_response(self.ext_api) - self.assertEqual(res.status_int, 201) + self.assertEqual(res.status_int, webob.exc.HTTPCreated.code) # Get pool and vip req = self.new_show_request('pools', diff --git a/neutron/tests/unit/services/loadbalancer/drivers/haproxy/test_plugin_driver.py b/neutron/tests/unit/services/loadbalancer/drivers/haproxy/test_plugin_driver.py index 8f18ffbb4..d58e5bd5f 100644 --- a/neutron/tests/unit/services/loadbalancer/drivers/haproxy/test_plugin_driver.py +++ b/neutron/tests/unit/services/loadbalancer/drivers/haproxy/test_plugin_driver.py @@ -17,6 +17,7 @@ # @author: Mark McClain, DreamHost import mock +from webob import exc from neutron.common import exceptions from neutron import context @@ -473,7 +474,7 @@ class TestLoadBalancerPluginNotificationWrapper(TestLoadBalancerPluginBase): req = self.new_delete_request('pools', pool['pool']['id']) res = req.get_response(self.ext_api) - self.assertEqual(res.status_int, 204) + self.assertEqual(res.status_int, exc.HTTPNoContent.code) self.mock_api.destroy_pool.assert_called_once_with( mock.ANY, pool['pool']['id'], 'host') @@ -521,7 +522,7 @@ class TestLoadBalancerPluginNotificationWrapper(TestLoadBalancerPluginBase): req = self.new_delete_request('members', member['member']['id']) res = req.get_response(self.ext_api) - self.assertEqual(res.status_int, 204) + self.assertEqual(res.status_int, exc.HTTPNoContent.code) self.mock_api.modify_pool.assert_called_once_with( mock.ANY, pool_id, 'host') @@ -566,7 +567,7 @@ class TestLoadBalancerPluginNotificationWrapper(TestLoadBalancerPluginBase): id=pool['pool']['id'], subresource='health_monitors') res = req.get_response(self.ext_api) - self.assertEqual(res.status_int, 201) + self.assertEqual(res.status_int, exc.HTTPCreated.code) self.mock_api.modify_pool.assert_called_once_with( mock.ANY, pool['pool']['id'], diff --git a/neutron/tests/unit/services/loadbalancer/test_agent_scheduler.py b/neutron/tests/unit/services/loadbalancer/test_agent_scheduler.py index 7bdd88a2e..b5abea4bc 100644 --- a/neutron/tests/unit/services/loadbalancer/test_agent_scheduler.py +++ b/neutron/tests/unit/services/loadbalancer/test_agent_scheduler.py @@ -193,7 +193,7 @@ class LBaaSAgentSchedulerTestCase(test_agent_ext_plugin.AgentDBTestMixIn, req = self.new_delete_request('pools', pool['pool']['id']) res = req.get_response(self.ext_api) - self.assertEqual(res.status_int, 204) + self.assertEqual(res.status_int, exc.HTTPNoContent.code) pools = self._list_pools_hosted_by_lbaas_agent( lbaas_agent['agent']['id']) self.assertEqual(0, len(pools['pools'])) -- 2.45.2