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
first step to merge senslab upstream:
[sfa.git]
/
sfa
/
methods
/
ListResources.py
diff --git
a/sfa/methods/ListResources.py
b/sfa/methods/ListResources.py
index
386b7f2
..
04359a0
100644
(file)
--- a/
sfa/methods/ListResources.py
+++ b/
sfa/methods/ListResources.py
@@
-1,5
+1,5
@@
import zlib
import zlib
-import sys
+
from sfa.util.xrn import urn_to_hrn
from sfa.util.method import Method
from sfa.util.sfatablesRuntime import run_sfatables
from sfa.util.xrn import urn_to_hrn
from sfa.util.method import Method
from sfa.util.sfatablesRuntime import run_sfatables
@@
-23,12
+23,15
@@
class ListResources(Method):
]
returns = Parameter(str, "List of resources")
]
returns = Parameter(str, "List of resources")
- def call(self, creds, options
={}
):
+ def call(self, creds, options):
self.api.logger.info("interface: %s\tmethod-name: %s" % (self.api.interface, self.name))
# client must specify a version
if not options.get('geni_rspec_version'):
self.api.logger.info("interface: %s\tmethod-name: %s" % (self.api.interface, self.name))
# client must specify a version
if not options.get('geni_rspec_version'):
- raise SfaInvalidArgument('Must specify an rspec version option. geni_rspec_version cannot be null')
+ if options.get('rspec_version'):
+ options['geni_rspec_version'] = options['rspec_version']
+ 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', '')
# get slice's hrn from options
xrn = options.get('geni_slice_urn', '')
@@
-39,10
+42,8
@@
class ListResources(Method):
# get hrn of the original caller
origin_hrn = options.get('origin_hrn', None)
# 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()
if not origin_hrn:
origin_hrn = Credential(string=valid_creds[0]).get_gid_caller().get_hrn()
- print >>sys.stderr, " \r\n \r\n \t Lsitresources.py call :self.api.interface %s origin_hrn %s options %s \r\n \t creds %s " %(self.api.interface,origin_hrn,options, creds)
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
@@
-50,8
+51,7
@@
class ListResources(Method):
chain_name = 'OUTGOING'
elif self.api.interface in ['slicemgr']:
chain_name = 'FORWARD-OUTGOING'
chain_name = 'OUTGOING'
elif self.api.interface in ['slicemgr']:
chain_name = 'FORWARD-OUTGOING'
- self.api.logger.debug("ListResources: sfatables on chain %s"%chain_name)
- print >>sys.stderr, " \r\n \r\n \t Listresources.py call : chain_name %s hrn %s origine_hrn %s " %(chain_name, hrn, origin_hrn)
+ self.api.logger.debug("ListResources: sfatables on chain %s"%chain_name)
filtered_rspec = run_sfatables(chain_name, hrn, origin_hrn, rspec)
if options.has_key('geni_compressed') and options['geni_compressed'] == True:
filtered_rspec = run_sfatables(chain_name, hrn, origin_hrn, rspec)
if options.has_key('geni_compressed') and options['geni_compressed'] == True: