Added MTU network config and updated flavor_metadata test support

[snaps.git] / snaps / openstack / create_router.py

diff --git a/snaps/openstack/create_router.py b/snaps/openstack/create_router.py
index 260fc03..3269bbd 100644 (file)
--- a/snaps/openstack/create_router.py
+++ b/snaps/openstack/create_router.py
@@ -111,7 +111,7 @@ class OpenStackRouter(OpenStackNetworkObject):
                         self.__internal_router_interface = router_intf
                 else:
                     raise RouterCreationError(
-                        'Subnet not found with name ' + internal_subnet.name)
+                        'Subnet not found with name {}'.format(sub_config))
 
             for port_setting in self.router_settings.port_settings:
                 port = neutron_utils.get_port(
@@ -149,10 +149,6 @@ class OpenStackRouter(OpenStackNetworkObject):
         :param sub_config:
         :return:
         """
-        if isinstance(sub_config, str):
-            return neutron_utils.get_subnet_by_name(
-                self._neutron, self._keystone,
-                subnet_name=sub_config)
         if isinstance(sub_config, dict):
             sub_dict = sub_config['subnet']
             network = neutron_utils.get_network(
@@ -163,6 +159,11 @@ class OpenStackRouter(OpenStackNetworkObject):
                 return neutron_utils.get_subnet(
                     self._neutron, network,
                     subnet_name=sub_dict['subnet_name'])
+        else:
+            return neutron_utils.get_subnet_by_name(
+                self._neutron, self._keystone,
+                subnet_name=sub_config,
+                project_name=self._os_creds.project_name)
 
     def clean(self):
         """