diff options
| author |   spisarski <s.pisarski@cablelabs.com> | 2017-08-02 13:19:58 -0600 |
|---|---|---|
| committer | spisarski <s.pisarski@cablelabs.com> | 2017-08-02 14:19:04 -0600 |
| commit | 652da5487159d5ee94fe2f8e62c34fdb0d26f4e5 (patch) | |
| tree | 2391e24e8bab3c92711fa96f6401b6e1b8c731ef /snaps/openstack/tests | |
| parent | 84d902632f1dd77f891c49cfb1d58af5ae051d1a (diff) | |
Refactor network retrieval API calls.
Refactored neutron_utils#get_network() to also accept a
NetworkSettings object for more robust queries in addition to
the old network_name parameter. Also refactored neutron_utils#
get_network_by_id to add in the ID to list_networks((**{'id': id)
and returning the first item contains the expected ID value.
JIRA: SNAPS-161
Change-Id: Ie670a442dd70633bbef7a1233e630672ebac6b0c
Signed-off-by: spisarski <s.pisarski@cablelabs.com>
Diffstat (limited to 'snaps/openstack/tests')
| -rw-r--r-- | snaps/openstack/tests/create_network_tests.py | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/snaps/openstack/tests/create_network_tests.py b/snaps/openstack/tests/create_network_tests.py index e941c67..936eda9 100644 --- a/snaps/openstack/tests/create_network_tests.py +++ b/snaps/openstack/tests/create_network_tests.py @@ -409,7 +409,7 @@ class CreateNetworkSuccessTests(OSIntegrationTestCase): neutron_utils.delete_network(self.neutron, self.net_creator.get_network()) self.assertIsNone(neutron_utils.get_network( - self.neutron, self.net_creator.network_settings.name)) + self.neutron, network_settings=self.net_creator.network_settings)) # This shall not throw an exception here self.net_creator.clean() @@ -479,7 +479,7 @@ class CreateNetworkSuccessTests(OSIntegrationTestCase): self.net_creator.create() retrieved_net = neutron_utils.get_network( - self.neutron, self.net_config.network_settings.name) + self.neutron, network_settings=self.net_config.network_settings) self.assertEqual(self.net_creator.get_network().id, retrieved_net.id) @@ -509,7 +509,7 @@ class CreateNetworkSuccessTests(OSIntegrationTestCase): self.net_creator.create() retrieved_net = neutron_utils.get_network( - self.neutron, self.net_config.network_settings.name) + self.neutron, network_settings=self.net_config.network_settings) self.assertEqual(self.net_creator.get_network().id, retrieved_net.id) |