Ensure project IDs are handled correctly for Network/Subnets

JIRA: SNAPS-265

Change-Id: If58f5817e52e21be377d2b06a5f7c3a413454350
Signed-off-by: spisarski <s.pisarski@cablelabs.com>

1 files changed, 6 insertions, 3 deletions

diff --git a/snaps/openstack/create_router.py b/snaps/openstack/create_router.py
index c9ccdd6..765f7a3 100644
--- a/snaps/openstack/create_router.py
+++ b/snaps/openstack/create_router.py
@@ -80,7 +80,8 @@ class OpenStackRouter(OpenStackNetworkObject):
 
             for port_setting in self.router_settings.port_settings:
                 port = neutron_utils.get_port(
-                    self._neutron, port_settings=port_setting)
+                    self._neutron, port_settings=port_setting,
+                    project_id=self.project_id)
                 if port:
                     self.__ports.append(port)
 
@@ -95,7 +96,8 @@ class OpenStackRouter(OpenStackNetworkObject):
 
         if not self.__router:
             self.__router = neutron_utils.create_router(
-                self._neutron, self._os_creds, self.router_settings)
+                self._neutron, self._os_creds, self.router_settings,
+                self.project_id)
 
             for internal_subnet_name in self.router_settings.internal_subnets:
                 internal_subnet = neutron_utils.get_subnet(
@@ -114,7 +116,8 @@ class OpenStackRouter(OpenStackNetworkObject):
 
             for port_setting in self.router_settings.port_settings:
                 port = neutron_utils.get_port(
-                    self._neutron, port_settings=port_setting)
+                    self._neutron, port_settings=port_setting,
+                    project_id=self.project_id)
                 logger.info(
                     'Retrieved port %s for router - %s', port_setting.name,
                     self.router_settings.name)