diff --git a/bgpvpn_dashboard/test/api_tests/bgpvpn_tests.py b/bgpvpn_dashboard/test/api_tests/bgpvpn_tests.py index 6d38ce92..9f8ee66b 100755 --- a/bgpvpn_dashboard/test/api_tests/bgpvpn_tests.py +++ b/bgpvpn_dashboard/test/api_tests/bgpvpn_tests.py @@ -20,13 +20,19 @@ from bgpvpn_dashboard.test import helpers as bgpvpn_test from neutronclient.v2_0.client import Client as neutronclient +BGPVPN_OBJECT_PATH = '/bgpvpn/bgpvpns' +BGPVPN_RESOURCE_PATH = '/bgpvpn/bgpvpns/%s' +BGPVPN_NETWORK_ASSOCIATION_PATH = '/bgpvpn/bgpvpns/%s/network_associations' +BGPVPN_ROUTER_ASSOCIATION_PATH = '/bgpvpn/bgpvpns/%s/router_associations' + class BgpvpnApiTests(bgpvpn_test.APITestCase): + @test.create_stubs({neutronclient: ('list_ext',)}) def test_bgpvpn_list(self): bgpvpns = {'bgpvpns': self.api_bgpvpns.list()} - neutronclient.list_ext('bgpvpns', - '/bgpvpn/bgpvpns', True).AndReturn(bgpvpns) + uri = BGPVPN_OBJECT_PATH + neutronclient.list_ext('bgpvpns', uri, True).AndReturn(bgpvpns) self.mox.ReplayAll() ret_val = api.bgpvpn.bgpvpns_list(self.request) for n in ret_val: @@ -39,8 +45,8 @@ class BgpvpnApiTests(bgpvpn_test.APITestCase): 'route_targets': bgpvpn.route_targets, 'tenant_id': bgpvpn.tenant_id} ret_dict = {'bgpvpn': data} - neutronclient.create_ext('/bgpvpn/bgpvpns', - ret_dict).AndReturn(ret_dict) + uri = BGPVPN_OBJECT_PATH + neutronclient.create_ext(uri, ret_dict).AndReturn(ret_dict) self.mox.ReplayAll() ret_val = api.bgpvpn.bgpvpn_create(self.request, **data) self.assertIsInstance(ret_val, api.bgpvpn.Bgpvpn) @@ -49,8 +55,8 @@ class BgpvpnApiTests(bgpvpn_test.APITestCase): def test_bgpvpn_get(self): bgpvpn = self.bgpvpns.first() ret_dict = {'bgpvpn': self.api_bgpvpns.first()} - neutronclient.show_ext('/bgpvpn/bgpvpns/%s', - bgpvpn.id).AndReturn(ret_dict) + uri = BGPVPN_RESOURCE_PATH + neutronclient.show_ext(uri, bgpvpn.id).AndReturn(ret_dict) self.mox.ReplayAll() ret_val = api.bgpvpn.bgpvpn_get(self.request, bgpvpn.id) self.assertIsInstance(ret_val, api.bgpvpn.Bgpvpn) @@ -70,21 +76,19 @@ class BgpvpnApiTests(bgpvpn_test.APITestCase): 'route_targets': bgpvpn.route_targets} form_dict = {'bgpvpn': form_data} ret_dict = {'bgpvpn': bgpvpn_dict} - - neutronclient.update_ext('/bgpvpn/bgpvpns/%s', - bgpvpn.id, form_dict).AndReturn(ret_dict) + uri = BGPVPN_RESOURCE_PATH + neutronclient.update_ext(uri, bgpvpn.id, form_dict).AndReturn(ret_dict) self.mox.ReplayAll() - ret_val = api.bgpvpn.bgpvpn_update(self.request, - bgpvpn.id, - **form_data) + ret_val = api.bgpvpn.bgpvpn_update( + self.request, bgpvpn.id, **form_data) self.assertIsInstance(ret_val, api.bgpvpn.Bgpvpn) @test.create_stubs({neutronclient: ('delete_ext',)}) def test_bgpvpn_delete(self): bgpvpn = self.bgpvpns.first() api_bgpvpn = {'bgpvpn': self.api_bgpvpns.first()} - neutronclient.delete_ext('/bgpvpn/bgpvpns/%s', - bgpvpn.id).AndReturn(api_bgpvpn) + uri = BGPVPN_RESOURCE_PATH + neutronclient.delete_ext(uri, bgpvpn.id).AndReturn(api_bgpvpn) self.mox.ReplayAll() api.bgpvpn.bgpvpn_delete(self.request, bgpvpn.id) @@ -92,10 +96,8 @@ class BgpvpnApiTests(bgpvpn_test.APITestCase): def test_network_association_list(self): bgpvpn = self.bgpvpns.first() na = {'network_associations': self.api_network_associations.list()} - neutronclient.list_ext( - 'network_associations', - '/bgpvpn/bgpvpns/%s/network_associations' % bgpvpn.id, - True).AndReturn(na) + uri = BGPVPN_NETWORK_ASSOCIATION_PATH % bgpvpn.id + neutronclient.list_ext('network_associations', uri, True).AndReturn(na) self.mox.ReplayAll() ret_val = api.bgpvpn.network_association_list(self.request, bgpvpn.id) for n in ret_val: @@ -107,13 +109,11 @@ class BgpvpnApiTests(bgpvpn_test.APITestCase): network = self.networks.first() data = {'network_id': network.id} ret_dict = {'network_association': data} - neutronclient.create_ext( - '/bgpvpn/bgpvpns/%s/network_associations' % bgpvpn.id, - ret_dict).AndReturn(ret_dict) + uri = BGPVPN_NETWORK_ASSOCIATION_PATH % bgpvpn.id + neutronclient.create_ext(uri, ret_dict).AndReturn(ret_dict) self.mox.ReplayAll() - ret_val = api.bgpvpn.network_association_create(self.request, - bgpvpn.id, - **data) + ret_val = api.bgpvpn.network_association_create( + self.request, bgpvpn.id, **data) self.assertIsInstance(ret_val, api.bgpvpn.NetworkAssociation) @test.create_stubs({neutronclient: ('delete_ext',)}) @@ -122,20 +122,18 @@ class BgpvpnApiTests(bgpvpn_test.APITestCase): na = self.network_associations.first() api_bgpvpn = { 'network_association': self.api_network_associations.first()} - neutronclient.delete_ext( - '/bgpvpn/bgpvpns/' + bgpvpn.id + '/network_associations/%s', - na.id).AndReturn(api_bgpvpn) + uri_pattern = BGPVPN_NETWORK_ASSOCIATION_PATH + uri = uri_pattern % bgpvpn.id + "/%s" + neutronclient.delete_ext(uri, na.id).AndReturn(api_bgpvpn) self.mox.ReplayAll() api.bgpvpn.network_association_delete(self.request, na.id, bgpvpn.id) @test.create_stubs({neutronclient: ('list_ext',)}) def test_router_association_list(self): bgpvpn = self.bgpvpns.first() - na = {'router_associations': self.api_network_associations.list()} - neutronclient.list_ext( - 'router_associations', - '/bgpvpn/bgpvpns/%s/router_associations' % bgpvpn.id, - True).AndReturn(na) + ra = {'router_associations': self.api_network_associations.list()} + uri = BGPVPN_ROUTER_ASSOCIATION_PATH % bgpvpn.id + neutronclient.list_ext('router_associations', uri, True).AndReturn(ra) self.mox.ReplayAll() ret_val = api.bgpvpn.router_association_list(self.request, bgpvpn.id) for n in ret_val: @@ -147,24 +145,22 @@ class BgpvpnApiTests(bgpvpn_test.APITestCase): router = self.routers.first() data = {'router_id': router.id} ret_dict = {'router_association': data} - neutronclient.create_ext( - '/bgpvpn/bgpvpns/%s/router_associations' % bgpvpn.id, - ret_dict).AndReturn(ret_dict) + uri = BGPVPN_ROUTER_ASSOCIATION_PATH % bgpvpn.id + neutronclient.create_ext(uri, ret_dict).AndReturn(ret_dict) self.mox.ReplayAll() - ret_val = api.bgpvpn.router_association_create(self.request, - bgpvpn.id, - **data) + ret_val = api.bgpvpn.router_association_create( + self.request, bgpvpn.id, **data) self.assertIsInstance(ret_val, api.bgpvpn.RouterAssociation) @test.create_stubs({neutronclient: ('delete_ext',)}) def test_router_association_delete(self): bgpvpn = self.bgpvpns.first() - na = self.router_associations.first() + ra = self.router_associations.first() api_bgpvpn = { 'router_association': self.api_router_associations.first() } - neutronclient.delete_ext( - '/bgpvpn/bgpvpns/' + bgpvpn.id + '/router_associations/%s', - na.id).AndReturn(api_bgpvpn) + uri_pattern = BGPVPN_ROUTER_ASSOCIATION_PATH + uri = uri_pattern % bgpvpn.id + "/%s" + neutronclient.delete_ext(uri, ra.id).AndReturn(api_bgpvpn) self.mox.ReplayAll() - api.bgpvpn.router_association_delete(self.request, na.id, bgpvpn.id) + api.bgpvpn.router_association_delete(self.request, ra.id, bgpvpn.id)

AltStyle によって変換されたページ (->オリジナル) /