diff options
Diffstat (limited to 'snaps/openstack')
| -rw-r--r-- | snaps/openstack/create_router.py | 29 | ||||
| -rw-r--r-- | snaps/openstack/utils/neutron_utils.py | 3 |
2 files changed, 17 insertions, 15 deletions
diff --git a/snaps/openstack/create_router.py b/snaps/openstack/create_router.py index bf68347..4f95c3b 100644 --- a/snaps/openstack/create_router.py +++ b/snaps/openstack/create_router.py @@ -64,20 +64,21 @@ class OpenStackRouter(OpenStackNetworkObject): self.__router = neutron_utils.get_router( self._neutron, router_settings=self.router_settings) - for internal_subnet_name in self.router_settings.internal_subnets: - internal_subnet = neutron_utils.get_subnet( - self._neutron, subnet_name=internal_subnet_name) - if internal_subnet: - self.__internal_subnets.append(internal_subnet) - else: - raise RouterCreationError( - 'Subnet not found with name ' + internal_subnet_name) - - for port_setting in self.router_settings.port_settings: - port = neutron_utils.get_port( - self._neutron, port_settings=port_setting) - if port: - self.__ports.append(port) + if self.__router: + for internal_subnet_name in self.router_settings.internal_subnets: + internal_subnet = neutron_utils.get_subnet( + self._neutron, subnet_name=internal_subnet_name) + if internal_subnet: + self.__internal_subnets.append(internal_subnet) + else: + raise RouterCreationError( + 'Subnet not found with name ' + internal_subnet_name) + + for port_setting in self.router_settings.port_settings: + port = neutron_utils.get_port( + self._neutron, port_settings=port_setting) + if port: + self.__ports.append(port) return self.__router diff --git a/snaps/openstack/utils/neutron_utils.py b/snaps/openstack/utils/neutron_utils.py index 9b6379a..e94a40e 100644 --- a/snaps/openstack/utils/neutron_utils.py +++ b/snaps/openstack/utils/neutron_utils.py @@ -499,7 +499,8 @@ def get_port(neutron, port_settings=None, port_name=None): if port_settings.network_name: network = get_network(neutron, network_name=port_settings.network_name) - port_filter['network_id'] = network.id + if network: + port_filter['network_id'] = network.id elif port_name: port_filter['name'] = port_name |