From: Tony Mack <tmack@cs.princeton.edu>
Date: Thu, 19 Aug 2010 17:05:17 +0000 (+0000)
Subject: slice manager sets 'geni_compressed' option to False when calling ListResources at... 
X-Git-Tag: sfa-1.0-0~34
X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=bcc009b4ec7ca82555a761228b0396a2939e0223;p=sfa.git

slice manager sets 'geni_compressed' option to False when calling ListResources at aggregates.
---

diff --git a/sfa/managers/slice_manager_pl.py b/sfa/managers/slice_manager_pl.py
index b3da52da..1103bdc1 100644
--- a/sfa/managers/slice_manager_pl.py
+++ b/sfa/managers/slice_manager_pl.py
@@ -23,6 +23,7 @@ from sfa.util.threadmanager import ThreadManager
 import sfa.util.xmlrpcprotocol as xmlrpcprotocol     
 from sfa.util.debug import log
 import sfa.plc.peers as peers
+from copy import copy
 
 def get_version():
     version = {}
@@ -108,7 +109,7 @@ def get_ticket(api, xrn, creds, rspec, users):
             # we may have a peer that knows about this aggregate
             for agg in api.aggregates:
                 target_aggs = api.aggregates[agg].get_aggregates(credential, net_urn)
-                if not target_aggs or not 'hrn' not target_aggs[0]:
+                if not target_aggs or not 'hrn' in target_aggs[0]:
                     continue
                 # send the request to this address 
                 url = target_aggs[0]['url']
@@ -263,7 +264,9 @@ def get_rspec(api, creds, options):
         if aggregate not in [api.auth.client_cred.get_gid_caller().get_hrn()]:   
             # get the rspec from the aggregate
             server = api.aggregates[aggregate]
-            threads.run(server.ListResources, cred, options)
+            my_opts = copy(options)
+            my_opts['geni_compressed'] = False
+            threads.run(server.ListResources, cred, my_opts)
             #threads.run(server.get_resources, cred, xrn, origin_hrn)