git://git.onelab.eu
/
sfa.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge Master in geni-v3 conflict resolution
[sfa.git]
/
sfa
/
methods
/
ListResources.py
diff --git
a/sfa/methods/ListResources.py
b/sfa/methods/ListResources.py
index
04359a0
..
b7ac0b7
100644
(file)
--- a/
sfa/methods/ListResources.py
+++ b/
sfa/methods/ListResources.py
@@
-10,7
+10,7
@@
from sfa.storage.parameter import Parameter, Mixed
class ListResources(Method):
"""
class ListResources(Method):
"""
- Returns information about available resources
or resources allocated to this slice
+ Returns information about available resources
@param credential list
@param options dictionary
@return string
@param credential list
@param options dictionary
@return string
@@
-33,17
+33,13
@@
class ListResources(Method):
else:
raise SfaInvalidArgument('Must specify an rspec version option. geni_rspec_version cannot be null')
else:
raise SfaInvalidArgument('Must specify an rspec version option. geni_rspec_version cannot be null')
- # get slice's hrn from options
- xrn = options.get('geni_slice_urn', '')
- (hrn, _) = urn_to_hrn(xrn)
-
# Find the valid credentials
# Find the valid credentials
- valid_creds = self.api.auth.checkCredentials(creds, 'listnodes'
, hrn
)
+ valid_creds = self.api.auth.checkCredentials(creds, 'listnodes')
# get hrn of the original caller
origin_hrn = options.get('origin_hrn', None)
if not origin_hrn:
# get hrn of the original caller
origin_hrn = options.get('origin_hrn', None)
if not origin_hrn:
- origin_hrn = Credential(
string
=valid_creds[0]).get_gid_caller().get_hrn()
+ origin_hrn = Credential(
cred
=valid_creds[0]).get_gid_caller().get_hrn()
rspec = self.api.manager.ListResources(self.api, creds, options)
# filter rspec through sfatables
rspec = self.api.manager.ListResources(self.api, creds, options)
# filter rspec through sfatables
@@
-52,7
+48,7
@@
class ListResources(Method):
elif self.api.interface in ['slicemgr']:
chain_name = 'FORWARD-OUTGOING'
self.api.logger.debug("ListResources: sfatables on chain %s"%chain_name)
elif self.api.interface in ['slicemgr']:
chain_name = 'FORWARD-OUTGOING'
self.api.logger.debug("ListResources: sfatables on chain %s"%chain_name)
- filtered_rspec = run_sfatables(chain_name,
hrn
, origin_hrn, rspec)
+ filtered_rspec = run_sfatables(chain_name,
''
, origin_hrn, rspec)
if options.has_key('geni_compressed') and options['geni_compressed'] == True:
filtered_rspec = zlib.compress(filtered_rspec).encode('base64')
if options.has_key('geni_compressed') and options['geni_compressed'] == True:
filtered_rspec = zlib.compress(filtered_rspec).encode('base64')