From e73caa67417ab6c628cf8fac1ac730e550de7bbc Mon Sep 17 00:00:00 2001 From: spisarski Date: Thu, 3 Aug 2017 13:23:39 -0600 Subject: Refactored neutron_utils#get_subnet_by_name() to get_subnet() Renamed utility function and added a subnet_settings parameter to hold a SubnetSettings object to help make the query more robust by being able to leverage values on the settings object. JIRA: SNAPS-165 Change-Id: I226a1217dc4ba7bb50f7d985ecfaf3b7bc4f610b Signed-off-by: spisarski --- snaps/openstack/create_instance.py | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) (limited to 'snaps/openstack/create_instance.py') diff --git a/snaps/openstack/create_instance.py b/snaps/openstack/create_instance.py index 252f2fe..02f1a44 100644 --- a/snaps/openstack/create_instance.py +++ b/snaps/openstack/create_instance.py @@ -164,8 +164,9 @@ class OpenStackVmInstance: ext_gateway = self.__ext_gateway_by_router( floating_ip_setting.router_name) if ext_gateway: - subnet = neutron_utils.get_subnet_by_name( - self.__neutron, floating_ip_setting.subnet_name) + subnet = neutron_utils.get_subnet( + self.__neutron, + subnet_name=floating_ip_setting.subnet_name) floating_ip = neutron_utils.create_floating_ip( self.__neutron, ext_gateway) self.__floating_ip_dict[floating_ip_setting.name] = floating_ip @@ -350,8 +351,8 @@ class OpenStackVmInstance: port = self.get_port_by_name(port_name) if port: if subnet_name: - subnet = neutron_utils.get_subnet_by_name(self.__neutron, - subnet_name) + subnet = neutron_utils.get_subnet( + self.__neutron, subnet_name=subnet_name) if not subnet: logger.warning('Cannot retrieve port IP as subnet could ' 'not be located with name - %s', -- cgit 1.2.3-korg