From: Andy Bavier <acb@cs.princeton.edu>
Date: Tue, 5 Jul 2011 19:46:47 +0000 (-0400)
Subject: GENICloud should only return the resources managed by its aggregates
X-Git-Tag: sfa-1.0-27~24^2~7
X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=acec986308b0584bf670fa27d0718871833f5c75;p=sfa.git

GENICloud should only return the resources managed by its aggregates
(not by GENICloud Central)
---

diff --git a/sfa/managers/slice_manager_pl.py b/sfa/managers/slice_manager_pl.py
index 4ac41a43..c7d6fedd 100644
--- a/sfa/managers/slice_manager_pl.py
+++ b/sfa/managers/slice_manager_pl.py
@@ -128,6 +128,11 @@ def ListResources(api, creds, options, call_id):
         # unless the caller is the aggregate's SM
         if caller_hrn == aggregate and aggregate != api.hrn:
             continue
+
+        # For GENICloud
+        if aggregate == api.hrn:
+            continue
+
         # get the rspec from the aggregate
         server = api.aggregates[aggregate]
         #threads.run(server.ListResources, credentials, my_opts, call_id)