git://git.onelab.eu
/
sfa.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
ab7e905
)
calls to AM's ListResources ignore the compressed flag
author
Josh Karlin
<jkarlin@bbn.com>
Wed, 18 Aug 2010 16:45:42 +0000
(16:45 +0000)
committer
Josh Karlin
<jkarlin@bbn.com>
Wed, 18 Aug 2010 16:45:42 +0000
(16:45 +0000)
sfa/managers/slice_manager_pl.py
patch
|
blob
|
history
diff --git
a/sfa/managers/slice_manager_pl.py
b/sfa/managers/slice_manager_pl.py
index
b3da52d
..
1103bdc
100644
(file)
--- 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
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 = {}
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)
# 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']
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]
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)
#threads.run(server.get_resources, cred, xrn, origin_hrn)