summaryrefslogtreecommitdiffstats
path: root/snaps/openstack/create_router.py
diff options
context:
space:
mode:
Diffstat (limited to 'snaps/openstack/create_router.py')
-rw-r--r--snaps/openstack/create_router.py10
1 files changed, 6 insertions, 4 deletions
diff --git a/snaps/openstack/create_router.py b/snaps/openstack/create_router.py
index ffdf2e6..89c3431 100644
--- a/snaps/openstack/create_router.py
+++ b/snaps/openstack/create_router.py
@@ -120,7 +120,7 @@ class OpenStackRouter:
for port in self.__ports:
logger.info(
'Removing router interface from router %s and port %s',
- self.router_settings.name, port['port']['name'])
+ self.router_settings.name, port.name)
try:
neutron_utils.remove_interface_router(self.__neutron,
self.__router, port=port)
@@ -199,10 +199,12 @@ class RouterSettings:
self.internal_subnets = list()
self.port_settings = list()
- if kwargs.get('interfaces'):
- interfaces = kwargs['interfaces']
+ if kwargs.get('interfaces', kwargs.get('port_settings')):
+ interfaces = kwargs.get('interfaces', kwargs.get('port_settings'))
for interface in interfaces:
- if interface.get('port'):
+ if isinstance(interface, PortSettings):
+ self.port_settings.append(interface)
+ else:
self.port_settings.append(
PortSettings(**interface['port']))