Ensure project IDs are handled correctly for Network/Subnets

[snaps.git] / snaps / openstack / utils / heat_utils.py

diff --git a/snaps/openstack/utils/heat_utils.py b/snaps/openstack/utils/heat_utils.py
index e440717..6e54dc6 100644 (file)
--- a/snaps/openstack/utils/heat_utils.py
+++ b/snaps/openstack/utils/heat_utils.py
@@ -257,13 +257,14 @@ def get_stack_security_groups(heat_cli, neutron, stack):
     return out
 
 
-def get_stack_servers(heat_cli, nova, neutron, stack):
+def get_stack_servers(heat_cli, nova, neutron, stack, project_id):
     """
     Returns a list of VMInst domain objects associated with a Stack
     :param heat_cli: the OpenStack heat client object
     :param nova: the OpenStack nova client object
     :param neutron: the OpenStack neutron client object
     :param stack: the SNAPS-OO Stack domain object
+    :param project_id: the associated project ID
     :return: a list of VMInst domain objects
     """
 
@@ -272,7 +273,7 @@ def get_stack_servers(heat_cli, nova, neutron, stack):
     for resource in srvr_res:
         try:
             server = nova_utils.get_server_object_by_id(
-                nova, neutron, resource.id)
+                nova, neutron, resource.id, project_id)
             if server:
                 out.append(server)
         except NotFound:
@@ -286,7 +287,7 @@ def get_stack_servers(heat_cli, nova, neutron, stack):
                 heat_cli, res_res.id, 'OS::Nova::Server')
             for res_srvr in res_res_srvrs:
                 server = nova_utils.get_server_object_by_id(
-                    nova, neutron, res_srvr.id)
+                    nova, neutron, res_srvr.id, project_id)
                 if server:
                     out.append(server)