From 8d71b60aa3fc785627b488383c17ef30a3838030 Mon Sep 17 00:00:00 2001 From: spisarski Date: Mon, 7 Aug 2017 10:30:29 -0600 Subject: Refactored neutron_utils#get_router_by_name() to get_router() Added a router_settings (RouterSettings) object parameter in addition to router_name for more robust query options. JIRA: SNAPS-163 Change-Id: I47672f531171d6ee0c90dabb6641640bf97c1d20 Signed-off-by: spisarski --- snaps/openstack/tests/create_network_tests.py | 8 +++--- snaps/openstack/tests/create_router_tests.py | 36 +++++++++++++-------------- 2 files changed, 22 insertions(+), 22 deletions(-) (limited to 'snaps/openstack/tests') diff --git a/snaps/openstack/tests/create_network_tests.py b/snaps/openstack/tests/create_network_tests.py index 3a7ab4a..51927dc 100644 --- a/snaps/openstack/tests/create_network_tests.py +++ b/snaps/openstack/tests/create_network_tests.py @@ -476,8 +476,8 @@ class CreateNetworkSuccessTests(OSIntegrationTestCase): self.os_creds, self.net_config.router_settings) self.router_creator.create() - retrieved_router = neutron_utils.get_router_by_name( - self.neutron, self.router_creator.get_router().name) + retrieved_router = neutron_utils.get_router( + self.neutron, router_settings=self.router_creator.router_settings) self.assertEqual( self.router_creator.get_router().id, retrieved_router.id) @@ -506,8 +506,8 @@ class CreateNetworkSuccessTests(OSIntegrationTestCase): self.admin_os_creds, self.net_config.router_settings) self.router_creator.create() - retrieved_router = neutron_utils.get_router_by_name( - self.neutron, self.router_creator.get_router().name) + retrieved_router = neutron_utils.get_router( + self.neutron, router_settings=self.router_creator.router_settings) self.assertEqual( self.router_creator.get_router().id, retrieved_router.id) diff --git a/snaps/openstack/tests/create_router_tests.py b/snaps/openstack/tests/create_router_tests.py index 6f37445..db3170e 100644 --- a/snaps/openstack/tests/create_router_tests.py +++ b/snaps/openstack/tests/create_router_tests.py @@ -162,8 +162,8 @@ class CreateRouterSuccessTests(OSIntegrationTestCase): router_settings) self.router_creator.create() - router = neutron_utils.get_router_by_name(self.neutron, - router_settings.name) + router = neutron_utils.get_router(self.neutron, + router_settings=router_settings) self.assertIsNotNone(router) self.assertTrue(verify_router_attributes( @@ -182,8 +182,8 @@ class CreateRouterSuccessTests(OSIntegrationTestCase): self.admin_os_creds, router_settings) self.router_creator.create() - router = neutron_utils.get_router_by_name(self.neutron, - router_settings.name) + router = neutron_utils.get_router(self.neutron, + router_settings=router_settings) self.assertIsNotNone(router) self.assertTrue(verify_router_attributes( @@ -202,8 +202,8 @@ class CreateRouterSuccessTests(OSIntegrationTestCase): self.os_creds, router_settings) self.router_creator.create() - router = neutron_utils.get_router_by_name(self.neutron, - router_settings.name) + router = neutron_utils.get_router(self.neutron, + router_settings=router_settings) self.assertIsNotNone(router) self.assertTrue(verify_router_attributes( @@ -221,14 +221,14 @@ class CreateRouterSuccessTests(OSIntegrationTestCase): self.os_creds, self.router_settings) created_router = self.router_creator.create() self.assertIsNotNone(created_router) - retrieved_router = neutron_utils.get_router_by_name( - self.neutron, self.router_settings.name) + retrieved_router = neutron_utils.get_router( + self.neutron, router_settings=self.router_settings) self.assertIsNotNone(retrieved_router) neutron_utils.delete_router(self.neutron, created_router) - retrieved_router = neutron_utils.get_router_by_name( - self.neutron, self.router_settings.name) + retrieved_router = neutron_utils.get_router( + self.neutron, router_settings=self.router_settings) self.assertIsNone(retrieved_router) # Should not raise an exception @@ -245,8 +245,8 @@ class CreateRouterSuccessTests(OSIntegrationTestCase): router_settings) self.router_creator.create() - router = neutron_utils.get_router_by_name(self.neutron, - router_settings.name) + router = neutron_utils.get_router(self.neutron, + router_settings=router_settings) self.assertIsNotNone(router) self.assertTrue(verify_router_attributes(router, self.router_creator, @@ -263,8 +263,8 @@ class CreateRouterSuccessTests(OSIntegrationTestCase): router_settings) self.router_creator.create() - router = neutron_utils.get_router_by_name(self.neutron, - router_settings.name) + router = neutron_utils.get_router(self.neutron, + router_settings=router_settings) self.assertIsNotNone(router) self.assertTrue(verify_router_attributes(router, self.router_creator, @@ -321,8 +321,8 @@ class CreateRouterSuccessTests(OSIntegrationTestCase): router_settings) self.router_creator.create() - router = neutron_utils.get_router_by_name(self.neutron, - router_settings.name) + router = neutron_utils.get_router(self.neutron, + router_settings=router_settings) self.assertTrue(verify_router_attributes(router, self.router_creator)) @@ -364,8 +364,8 @@ class CreateRouterSuccessTests(OSIntegrationTestCase): router_settings) self.router_creator.create() - router = neutron_utils.get_router_by_name(self.neutron, - router_settings.name) + router = neutron_utils.get_router(self.neutron, + router_settings=router_settings) self.assertTrue(verify_router_attributes( router, self.router_creator, ext_gateway=self.ext_net_name)) -- cgit 1.2.3-korg