From 652da5487159d5ee94fe2f8e62c34fdb0d26f4e5 Mon Sep 17 00:00:00 2001 From: spisarski Date: Wed, 2 Aug 2017 13:19:58 -0600 Subject: 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 --- snaps/openstack/create_network.py | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) (limited to 'snaps/openstack/create_network.py') diff --git a/snaps/openstack/create_network.py b/snaps/openstack/create_network.py index 2f26c43..4caef12 100644 --- a/snaps/openstack/create_network.py +++ b/snaps/openstack/create_network.py @@ -53,8 +53,8 @@ class OpenStackNetwork: logger.info( 'Creating neutron network %s...' % self.network_settings.name) net_inst = neutron_utils.get_network( - self.__neutron, self.network_settings.name, - self.network_settings.get_project_id(self.__os_creds)) + self.__neutron, network_settings=self.network_settings, + project_id=self.network_settings.get_project_id(self.__os_creds)) if net_inst: self.__network = net_inst else: @@ -498,9 +498,8 @@ class PortSettings: project_id = project.id if not self.network: - self.network = neutron_utils.get_network(neutron, - self.network_name, - project_id) + self.network = neutron_utils.get_network( + neutron, network_name=self.network_name, project_id=project_id) if not self.network: raise PortSettingsError( 'Cannot locate network with name - ' + self.network_name) -- cgit 1.2.3-korg