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:
386763d
)
from now on the 'options' arg is mandatory as far as the server-side is concerned
author
Thierry Parmentelat
<thierry.parmentelat@sophia.inria.fr>
Mon, 12 Dec 2011 10:26:44 +0000
(11:26 +0100)
committer
Thierry Parmentelat
<thierry.parmentelat@sophia.inria.fr>
Mon, 12 Dec 2011 10:26:44 +0000
(11:26 +0100)
15 files changed:
sfa/managers/aggregate_manager.py
patch
|
blob
|
history
sfa/managers/aggregate_manager_eucalyptus.py
patch
|
blob
|
history
sfa/managers/aggregate_manager_max.py
patch
|
blob
|
history
sfa/managers/registry_manager.py
patch
|
blob
|
history
sfa/managers/slice_manager.py
patch
|
blob
|
history
sfa/methods/CreateSliver.py
patch
|
blob
|
history
sfa/methods/DeleteSliver.py
patch
|
blob
|
history
sfa/methods/GetTicket.py
patch
|
blob
|
history
sfa/methods/GetVersion.py
patch
|
blob
|
history
sfa/methods/ListSlices.py
patch
|
blob
|
history
sfa/methods/RenewSliver.py
patch
|
blob
|
history
sfa/methods/SliverStatus.py
patch
|
blob
|
history
sfa/methods/UpdateSliver.py
patch
|
blob
|
history
sfa/plc/plshell.py
patch
|
blob
|
history
sfa/util/version.py.in
patch
|
blob
|
history
diff --git
a/sfa/managers/aggregate_manager.py
b/sfa/managers/aggregate_manager.py
index
4a9573b
..
9ccc1f7
100644
(file)
--- a/
sfa/managers/aggregate_manager.py
+++ b/
sfa/managers/aggregate_manager.py
@@
-29,7
+29,7
@@
class AggregateManager:
self.caching=True
#self.caching=False
self.caching=True
#self.caching=False
- def GetVersion(self, api
, options={}
):
+ def GetVersion(self, api):
version_manager = VersionManager()
ad_rspec_versions = []
version_manager = VersionManager()
ad_rspec_versions = []
@@
-50,7
+50,7
@@
class AggregateManager:
}
return version_core(version_more)
}
return version_core(version_more)
- def SliverStatus(self, api, slice_xrn, creds, options
={}
):
+ def SliverStatus(self, api, slice_xrn, creds, options):
call_id = options.get('call_id')
if Callids().already_handled(call_id): return {}
call_id = options.get('call_id')
if Callids().already_handled(call_id): return {}
@@
-101,7
+101,7
@@
class AggregateManager:
result['geni_resources'] = resources
return result
result['geni_resources'] = resources
return result
- def CreateSliver(self, api, slice_xrn, creds, rspec_string, users, options
={}
):
+ def CreateSliver(self, api, slice_xrn, creds, rspec_string, users, options):
"""
Create the sliver[s] (slice) at this aggregate.
Verify HRN and initialize the slice record in PLC if necessary.
"""
Create the sliver[s] (slice) at this aggregate.
Verify HRN and initialize the slice record in PLC if necessary.
@@
-145,7
+145,7
@@
class AggregateManager:
return aggregate.get_rspec(slice_xrn=slice_xrn, version=rspec.version)
return aggregate.get_rspec(slice_xrn=slice_xrn, version=rspec.version)
- def RenewSliver(self, api, xrn, creds, expiration_time, options
={}
):
+ def RenewSliver(self, api, xrn, creds, expiration_time, options):
call_id = options.get('call_id')
if Callids().already_handled(call_id): return True
(hrn, _) = urn_to_hrn(xrn)
call_id = options.get('call_id')
if Callids().already_handled(call_id): return True
(hrn, _) = urn_to_hrn(xrn)
@@
-195,7
+195,7
@@
class AggregateManager:
# XX not implemented at this interface
return 1
# XX not implemented at this interface
return 1
- def DeleteSliver(self, api, xrn, creds, options
={}
):
+ def DeleteSliver(self, api, xrn, creds, options):
call_id = options.get('call_id')
if Callids().already_handled(call_id): return ""
(hrn, _) = urn_to_hrn(xrn)
call_id = options.get('call_id')
if Callids().already_handled(call_id): return ""
(hrn, _) = urn_to_hrn(xrn)
@@
-216,7
+216,7
@@
class AggregateManager:
api.driver.BindObjectToPeer('slice', slice['slice_id'], peer, slice['peer_slice_id'])
return 1
api.driver.BindObjectToPeer('slice', slice['slice_id'], peer, slice['peer_slice_id'])
return 1
- def ListSlices(self, api, creds, options
={}
):
+ def ListSlices(self, api, creds, options):
call_id = options.get('call_id')
if Callids().already_handled(call_id): return []
# look in cache first
call_id = options.get('call_id')
if Callids().already_handled(call_id): return []
# look in cache first
@@
-236,7
+236,7
@@
class AggregateManager:
return slice_urns
return slice_urns
- def ListResources(self, api, creds, options
={}
):
+ def ListResources(self, api, creds, options):
call_id = options.get('call_id')
if Callids().already_handled(call_id): return ""
# get slice's hrn from options
call_id = options.get('call_id')
if Callids().already_handled(call_id): return ""
# get slice's hrn from options
@@
-272,7
+272,7
@@
class AggregateManager:
return rspec
return rspec
- def GetTicket(self, api, xrn, creds, rspec, users, options
={}
):
+ def GetTicket(self, api, xrn, creds, rspec, users, options):
(slice_hrn, _) = urn_to_hrn(xrn)
slices = PlSlices(api)
(slice_hrn, _) = urn_to_hrn(xrn)
slices = PlSlices(api)
diff --git
a/sfa/managers/aggregate_manager_eucalyptus.py
b/sfa/managers/aggregate_manager_eucalyptus.py
index
1021392
..
6fe4720
100644
(file)
--- a/
sfa/managers/aggregate_manager_eucalyptus.py
+++ b/
sfa/managers/aggregate_manager_eucalyptus.py
@@
-447,7
+447,7
@@
class AggregateManagerEucalyptus:
port=eucaPort,
path=srvPath)
port=eucaPort,
path=srvPath)
- def ListResources(api, creds, options
={}
):
+ def ListResources(api, creds, options):
call_id = options.get('call_id')
if Callids().already_handled(call_id): return ""
# get slice's hrn from options
call_id = options.get('call_id')
if Callids().already_handled(call_id): return ""
# get slice's hrn from options
@@
-544,7
+544,7
@@
class AggregateManagerEucalyptus:
"""
Hook called via 'sfi.py create'
"""
"""
Hook called via 'sfi.py create'
"""
- def CreateSliver(api, slice_xrn, creds, xml, users, options
={}
):
+ def CreateSliver(api, slice_xrn, creds, xml, users, options):
call_id = options.get('call_id')
if Callids().already_handled(call_id): return ""
call_id = options.get('call_id')
if Callids().already_handled(call_id): return ""
@@
-682,7
+682,7
@@
class AggregateManagerEucalyptus:
f.write("%s %s %s\n" % (instId, ipaddr, hrn))
f.close()
f.write("%s %s %s\n" % (instId, ipaddr, hrn))
f.close()
- def GetVersion(api
, options={}
):
+ def GetVersion(api):
version_manager = VersionManager()
ad_rspec_versions = []
version_manager = VersionManager()
ad_rspec_versions = []
diff --git
a/sfa/managers/aggregate_manager_max.py
b/sfa/managers/aggregate_manager_max.py
index
b7cdffb
..
ac3a44d
100644
(file)
--- a/
sfa/managers/aggregate_manager_max.py
+++ b/
sfa/managers/aggregate_manager_max.py
@@
-274,12
+274,12
@@
class AggregateManagerMax (AggregateManager):
### GENI AM API Methods
### GENI AM API Methods
- def SliverStatus(self, api, slice_xrn, creds, options
={}
):
+ def SliverStatus(self, api, slice_xrn, creds, options):
call_id = options.get('call_id')
if Callids().already_handled(call_id): return {}
return self.slice_status(api, slice_xrn, creds)
call_id = options.get('call_id')
if Callids().already_handled(call_id): return {}
return self.slice_status(api, slice_xrn, creds)
- def CreateSliver(self, api, slice_xrn, creds, rspec_string, users, options
={}
):
+ def CreateSliver(self, api, slice_xrn, creds, rspec_string, users, options):
call_id = options.get('call_id')
if Callids().already_handled(call_id): return ""
#TODO: create real CreateSliver response rspec
call_id = options.get('call_id')
if Callids().already_handled(call_id): return ""
#TODO: create real CreateSliver response rspec
@@
-289,13
+289,13
@@
class AggregateManagerMax (AggregateManager):
else:
return "<?xml version=\"1.0\" ?> <RSpec type=\"SFA\"> Error! </RSpec>"
else:
return "<?xml version=\"1.0\" ?> <RSpec type=\"SFA\"> Error! </RSpec>"
- def DeleteSliver(self, api, xrn, creds, options
={}
):
+ def DeleteSliver(self, api, xrn, creds, options):
call_id = options.get('call_id')
if Callids().already_handled(call_id): return ""
return self.delete_slice(api, xrn, creds)
# no caching
call_id = options.get('call_id')
if Callids().already_handled(call_id): return ""
return self.delete_slice(api, xrn, creds)
# no caching
- def ListResources(self, api, creds, options
={}
):
+ def ListResources(self, api, creds, options):
call_id = options.get('call_id')
if Callids().already_handled(call_id): return ""
# version_string = "rspec_%s" % (rspec_version.get_version_name())
call_id = options.get('call_id')
if Callids().already_handled(call_id): return ""
# version_string = "rspec_%s" % (rspec_version.get_version_name())
diff --git
a/sfa/managers/registry_manager.py
b/sfa/managers/registry_manager.py
index
899b3d5
..
98c537b
100644
(file)
--- a/
sfa/managers/registry_manager.py
+++ b/
sfa/managers/registry_manager.py
@@
-26,7
+26,7
@@
class RegistryManager:
def __init__ (self): pass
# The GENI GetVersion call
def __init__ (self): pass
# The GENI GetVersion call
- def GetVersion(self, api
, options={}
):
+ def GetVersion(self, api):
peers = dict ( [ (hrn,interface.get_url()) for (hrn,interface) in api.registries.iteritems()
if hrn != api.hrn])
xrn=Xrn(api.hrn)
peers = dict ( [ (hrn,interface.get_url()) for (hrn,interface) in api.registries.iteritems()
if hrn != api.hrn])
xrn=Xrn(api.hrn)
diff --git
a/sfa/managers/slice_manager.py
b/sfa/managers/slice_manager.py
index
24fc7a4
..
947ed70
100644
(file)
--- a/
sfa/managers/slice_manager.py
+++ b/
sfa/managers/slice_manager.py
@@
-25,14
+25,7
@@
class SliceManager:
# self.caching=False
self.caching=True
# self.caching=False
self.caching=True
- def _options_supported(self, api, server):
- """
- Returns true if server supports the extra 'options' arg. to API calls
- """
- server_version = api.get_cached_server_version(server)
- return server_version.has_key ('options_support')
-
- def GetVersion(self, api, options={}):
+ def GetVersion(self, api):
# peers explicitly in aggregates.xml
peers =dict ([ (peername,interface.get_url()) for (peername,interface) in api.aggregates.iteritems()
if peername != api.hrn])
# peers explicitly in aggregates.xml
peers =dict ([ (peername,interface.get_url()) for (peername,interface) in api.aggregates.iteritems()
if peername != api.hrn])
@@
-77,7
+70,8
@@
class SliceManager:
else:
stats_tag = rspec.xml.root.add_element("statistics", call=callname)
else:
stats_tag = rspec.xml.root.add_element("statistics", call=callname)
- stat_tag = stats_tag.add_element("aggregate", name=str(aggname), elapsed=str(elapsed), status=str(status))
+ stat_tag = stats_tag.add_element("aggregate", name=str(aggname),
+ elapsed=str(elapsed), status=str(status))
if exc_info:
exc_tag = stat_tag.add_element("exc_info", name=str(exc_info[1]))
if exc_info:
exc_tag = stat_tag.add_element("exc_info", name=str(exc_info[1]))
@@
-88,32
+82,33
@@
class SliceManager:
# formats the traceback as a set of xml elements
tb = traceback.extract_tb(exc_info[2])
for item in tb:
# formats the traceback as a set of xml elements
tb = traceback.extract_tb(exc_info[2])
for item in tb:
- exc_frame = exc_tag.add_element("tb_frame", filename=str(item[0]), line=str(item[1]), func=str(item[2]), code=str(item[3]))
+ exc_frame = exc_tag.add_element("tb_frame", filename=str(item[0]),
+ line=str(item[1]), func=str(item[2]), code=str(item[3]))
except Exception, e:
logger.warn("add_slicemgr_stat failed on %s: %s" %(aggname, str(e)))
except Exception, e:
logger.warn("add_slicemgr_stat failed on %s: %s" %(aggname, str(e)))
- def ListResources(self, api, creds, options={}):
+ def ListResources(self, api, creds, options):
+ call_id = options.get('call_id')
+ if Callids().already_handled(call_id): return ""
+
version_manager = VersionManager()
version_manager = VersionManager()
- def _ListResources(aggregate, server, credential, opts={}):
-
- my_opts = copy(opts)
- args = [credential, my_opts]
+
+ def _ListResources(aggregate, server, credential, options):
+ forward_options = copy(options)
tStart = time.time()
try:
version = api.get_cached_server_version(server)
# force ProtoGENI aggregates to give us a v2 RSpec
if 'sfa' in version.keys():
tStart = time.time()
try:
version = api.get_cached_server_version(server)
# force ProtoGENI aggregates to give us a v2 RSpec
if 'sfa' in version.keys():
-
my_opt
s['rspec_version'] = version_manager.get_version('SFA 1').to_dict()
+
forward_option
s['rspec_version'] = version_manager.get_version('SFA 1').to_dict()
else:
else:
-
my_opt
s['rspec_version'] = version_manager.get_version('ProtoGENI 2').to_dict()
- rspec = server.ListResources(
*arg
s)
+
forward_option
s['rspec_version'] = version_manager.get_version('ProtoGENI 2').to_dict()
+ rspec = server.ListResources(
credential, forward_option
s)
return {"aggregate": aggregate, "rspec": rspec, "elapsed": time.time()-tStart, "status": "success"}
except Exception, e:
api.logger.log_exc("ListResources failed at %s" %(server.url))
return {"aggregate": aggregate, "elapsed": time.time()-tStart, "status": "exception", "exc_info": sys.exc_info()}
return {"aggregate": aggregate, "rspec": rspec, "elapsed": time.time()-tStart, "status": "success"}
except Exception, e:
api.logger.log_exc("ListResources failed at %s" %(server.url))
return {"aggregate": aggregate, "elapsed": time.time()-tStart, "status": "exception", "exc_info": sys.exc_info()}
- call_id = options.get('call_id')
- if Callids().already_handled(call_id): return ""
# get slice's hrn from options
xrn = options.get('geni_slice_urn', '')
# get slice's hrn from options
xrn = options.get('geni_slice_urn', '')
@@
-160,7
+155,8
@@
class SliceManager:
result_version = version_manager._get_version(rspec_version.type, rspec_version.version, 'ad')
rspec = RSpec(version=result_version)
for result in results:
result_version = version_manager._get_version(rspec_version.type, rspec_version.version, 'ad')
rspec = RSpec(version=result_version)
for result in results:
- self.add_slicemgr_stat(rspec, "ListResources", result["aggregate"], result["elapsed"], result["status"], result.get("exc_info",None))
+ self.add_slicemgr_stat(rspec, "ListResources", result["aggregate"], result["elapsed"],
+ result["status"], result.get("exc_info",None))
if result["status"]=="success":
try:
rspec.version.merge(ReturnValue.get_value(result["rspec"]))
if result["status"]=="success":
try:
rspec.version.merge(ReturnValue.get_value(result["rspec"]))
@@
-172,12
+168,14
@@
class SliceManager:
api.cache.add(version_string, rspec.toxml())
return rspec.toxml()
api.cache.add(version_string, rspec.toxml())
return rspec.toxml()
-
-
- def CreateSliver(self, api, xrn, creds, rspec_str, users, options={}):
+
+
+ def CreateSliver(self, api, xrn, creds, rspec_str, users, options):
+ call_id = options.get('call_id')
+ if Callids().already_handled(call_id): return ""
version_manager = VersionManager()
version_manager = VersionManager()
- def _CreateSliver(aggregate, server, xrn, credential, rspec, users, options
={}
):
+ def _CreateSliver(aggregate, server, xrn, credential, rspec, users, options):
tStart = time.time()
try:
# Need to call GetVersion at an aggregate to determine the supported
tStart = time.time()
try:
# Need to call GetVersion at an aggregate to determine the supported
@@
-192,17
+190,12
@@
class SliceManager:
rspec.filter(filter)
rspec = rspec.toxml()
requested_users = sfa_to_pg_users_arg(users)
rspec.filter(filter)
rspec = rspec.toxml()
requested_users = sfa_to_pg_users_arg(users)
- args = [xrn, credential, rspec, requested_users]
- if self._options_supported(api, server):
- args.append(options)
- rspec = server.CreateSliver(*args)
+ rspec = server.CreateSliver(xrn, credential, rspec, requested_users, options)
return {"aggregate": aggregate, "rspec": rspec, "elapsed": time.time()-tStart, "status": "success"}
except:
logger.log_exc('Something wrong in _CreateSliver with URL %s'%server.url)
return {"aggregate": aggregate, "elapsed": time.time()-tStart, "status": "exception", "exc_info": sys.exc_info()}
return {"aggregate": aggregate, "rspec": rspec, "elapsed": time.time()-tStart, "status": "success"}
except:
logger.log_exc('Something wrong in _CreateSliver with URL %s'%server.url)
return {"aggregate": aggregate, "elapsed": time.time()-tStart, "status": "exception", "exc_info": sys.exc_info()}
- call_id = options.get('call_id')
- if Callids().already_handled(call_id): return ""
# Validate the RSpec against PlanetLab's schema --disabled for now
# The schema used here needs to aggregate the PL and VINI schemas
# schema = "/var/www/html/schemas/pl.rng"
# Validate the RSpec against PlanetLab's schema --disabled for now
# The schema used here needs to aggregate the PL and VINI schemas
# schema = "/var/www/html/schemas/pl.rng"
@@
-239,7
+232,8
@@
class SliceManager:
manifest_version = version_manager._get_version(rspec.version.type, rspec.version.version, 'manifest')
result_rspec = RSpec(version=manifest_version)
for result in results:
manifest_version = version_manager._get_version(rspec.version.type, rspec.version.version, 'manifest')
result_rspec = RSpec(version=manifest_version)
for result in results:
- self.add_slicemgr_stat(result_rspec, "CreateSliver", result["aggregate"], result["elapsed"], result["status"], result.get("exc_info",None))
+ self.add_slicemgr_stat(result_rspec, "CreateSliver", result["aggregate"], result["elapsed"],
+ result["status"], result.get("exc_info",None))
if result["status"]=="success":
try:
result_rspec.version.merge(ReturnValue.get_value(result["rspec"]))
if result["status"]=="success":
try:
result_rspec.version.merge(ReturnValue.get_value(result["rspec"]))
@@
-247,16
+241,12
@@
class SliceManager:
api.logger.log_exc("SM.CreateSliver: Failed to merge aggregate rspec")
return result_rspec.toxml()
api.logger.log_exc("SM.CreateSliver: Failed to merge aggregate rspec")
return result_rspec.toxml()
- def RenewSliver(self, api, xrn, creds, expiration_time, options={}):
- def _RenewSliver(server, xrn, creds, expiration_time, options={}):
- server_version = api.get_cached_server_version(server)
- args = [xrn, creds, expiration_time]
- if self._options_supported(api, server):
- args.append(options)
- return server.RenewSliver(*args)
-
+ def RenewSliver(self, api, xrn, creds, expiration_time, options):
call_id = options.get('call_id')
if Callids().already_handled(call_id): return True
call_id = options.get('call_id')
if Callids().already_handled(call_id): return True
+
+ def _RenewSliver(server, xrn, creds, expiration_time, options):
+ return server.RenewSliver(xrn, creds, expiration_time, options)
(hrn, type) = urn_to_hrn(xrn)
# get the callers hrn
(hrn, type) = urn_to_hrn(xrn)
# get the callers hrn
@@
-280,16
+270,13
@@
class SliceManager:
results = [ReturnValue.get_value(result) for result in threads.get_results()]
return reduce (lambda x,y: x and y, results , True)
results = [ReturnValue.get_value(result) for result in threads.get_results()]
return reduce (lambda x,y: x and y, results , True)
- def DeleteSliver(self, api, xrn, creds, options={}):
- def _DeleteSliver(server, xrn, creds, options={}):
- server_version = api.get_cached_server_version(server)
- args = [xrn, creds]
- if self._options_supported(api, server):
- args.append(options)
- return server.DeleteSliver(*args)
-
+ def DeleteSliver(self, api, xrn, creds, options):
call_id = options.get('call_id')
if Callids().already_handled(call_id): return ""
call_id = options.get('call_id')
if Callids().already_handled(call_id): return ""
+
+ def _DeleteSliver(server, xrn, creds, options):
+ return server.DeleteSliver(xrn, creds, options)
+
(hrn, type) = urn_to_hrn(xrn)
# get the callers hrn
valid_cred = api.auth.checkCredentials(creds, 'deletesliver', hrn)[0]
(hrn, type) = urn_to_hrn(xrn)
# get the callers hrn
valid_cred = api.auth.checkCredentials(creds, 'deletesliver', hrn)[0]
@@
-313,13
+300,9
@@
class SliceManager:
# first draft at a merging SliverStatus
# first draft at a merging SliverStatus
- def SliverStatus(self, api, slice_xrn, creds, options={}):
- def _SliverStatus(server, xrn, creds, options={}):
- server_version = api.get_cached_server_version(server)
- args = [xrn, creds]
- if self._options_supported(api, server):
- args.append(options)
- return server.SliverStatus(*args)
+ def SliverStatus(self, api, slice_xrn, creds, options):
+ def _SliverStatus(server, xrn, creds, options):
+ return server.SliverStatus(xrn, creds, options)
call_id = options.get('call_id')
if Callids().already_handled(call_id): return {}
call_id = options.get('call_id')
if Callids().already_handled(call_id): return {}
@@
-334,7
+317,7
@@
class SliceManager:
threads.run (_SliverStatus, server, slice_xrn, [cred], options)
results = [ReturnValue.get_value(result) for result in threads.get_results()]
threads.run (_SliverStatus, server, slice_xrn, [cred], options)
results = [ReturnValue.get_value(result) for result in threads.get_results()]
- # get rid of any void result - e.g. when call_id was hit where by convention we return {}
+ # get rid of any void result - e.g. when call_id was hit
,
where by convention we return {}
results = [ result for result in results if result and result['geni_resources']]
# do not try to combine if there's no result
results = [ result for result in results if result and result['geni_resources']]
# do not try to combine if there's no result
@@
-355,17
+338,13
@@
class SliceManager:
return overall
return overall
- def ListSlices(self, api, creds, options={}):
- def _ListSlices(server, creds, options={}):
- server_version = api.get_cached_server_version(server)
- args = [creds]
- if self._options_supported(api, server):
- args.append(options)
- return server.ListSlices(*args)
-
+ def ListSlices(self, api, creds, options):
call_id = options.get('call_id')
if Callids().already_handled(call_id): return []
call_id = options.get('call_id')
if Callids().already_handled(call_id): return []
+ def _ListSlices(server, creds, options):
+ return server.ListSlices(creds, options)
+
# look in cache first
if self.caching and api.cache:
slices = api.cache.get('slices')
# look in cache first
if self.caching and api.cache:
slices = api.cache.get('slices')
@@
-404,7
+383,7
@@
class SliceManager:
return slices
return slices
- def GetTicket(self, api, xrn, creds, rspec, users, options
={}
):
+ def GetTicket(self, api, xrn, creds, rspec, users, options):
slice_hrn, type = urn_to_hrn(xrn)
# get the netspecs contained within the clients rspec
aggregate_rspecs = {}
slice_hrn, type = urn_to_hrn(xrn)
# get the netspecs contained within the clients rspec
aggregate_rspecs = {}
@@
-424,6
+403,7
@@
class SliceManager:
cred = api.getCredential()
threads = ThreadManager()
for (aggregate, aggregate_rspec) in aggregate_rspecs.iteritems():
cred = api.getCredential()
threads = ThreadManager()
for (aggregate, aggregate_rspec) in aggregate_rspecs.iteritems():
+ # xxx sounds like using call_id here would be safer
# prevent infinite loop. Dont send request back to caller
# unless the caller is the aggregate's SM
if caller_hrn == aggregate and aggregate != api.hrn:
# prevent infinite loop. Dont send request back to caller
# unless the caller is the aggregate's SM
if caller_hrn == aggregate and aggregate != api.hrn:
diff --git
a/sfa/methods/CreateSliver.py
b/sfa/methods/CreateSliver.py
index
75463d7
..
0e944ac
100644
(file)
--- a/
sfa/methods/CreateSliver.py
+++ b/
sfa/methods/CreateSliver.py
@@
-29,7
+29,7
@@
class CreateSliver(Method):
]
returns = Parameter(str, "Allocated RSpec")
]
returns = Parameter(str, "Allocated RSpec")
- def call(self, slice_xrn, creds, rspec, users, options
={}
):
+ def call(self, slice_xrn, creds, rspec, users, options):
hrn, type = urn_to_hrn(slice_xrn)
self.api.logger.info("interface: %s\ttarget-hrn: %s\tmethod-name: %s"%(self.api.interface, hrn, self.name))
hrn, type = urn_to_hrn(slice_xrn)
self.api.logger.info("interface: %s\ttarget-hrn: %s\tmethod-name: %s"%(self.api.interface, hrn, self.name))
diff --git
a/sfa/methods/DeleteSliver.py
b/sfa/methods/DeleteSliver.py
index
6be2bc4
..
697b6d3
100644
(file)
--- a/
sfa/methods/DeleteSliver.py
+++ b/
sfa/methods/DeleteSliver.py
@@
-24,7
+24,7
@@
class DeleteSliver(Method):
returns = Parameter(int, "1 if successful")
returns = Parameter(int, "1 if successful")
- def call(self, xrn, creds, options
={}
):
+ def call(self, xrn, creds, options):
(hrn, type) = urn_to_hrn(xrn)
valid_creds = self.api.auth.checkCredentials(creds, 'deletesliver', hrn)
(hrn, type) = urn_to_hrn(xrn)
valid_creds = self.api.auth.checkCredentials(creds, 'deletesliver', hrn)
diff --git
a/sfa/methods/GetTicket.py
b/sfa/methods/GetTicket.py
index
2223e37
..
54978e7
100644
(file)
--- a/
sfa/methods/GetTicket.py
+++ b/
sfa/methods/GetTicket.py
@@
-36,7
+36,7
@@
class GetTicket(Method):
returns = Parameter(str, "String representation of a ticket object")
returns = Parameter(str, "String representation of a ticket object")
- def call(self, xrn, creds, rspec, users, options
={}
):
+ def call(self, xrn, creds, rspec, users, options):
hrn, type = urn_to_hrn(xrn)
# Find the valid credentials
valid_creds = self.api.auth.checkCredentials(creds, 'getticket', hrn)
hrn, type = urn_to_hrn(xrn)
# Find the valid credentials
valid_creds = self.api.auth.checkCredentials(creds, 'getticket', hrn)
diff --git
a/sfa/methods/GetVersion.py
b/sfa/methods/GetVersion.py
index
9dc586f
..
e8e4eea
100644
(file)
--- a/
sfa/methods/GetVersion.py
+++ b/
sfa/methods/GetVersion.py
@@
-9,9
+9,9
@@
class GetVersion(Method):
@return version
"""
interfaces = ['registry','aggregate', 'slicemgr', 'component']
@return version
"""
interfaces = ['registry','aggregate', 'slicemgr', 'component']
- accepts = [
Parameter(dict, "Options")
]
+ accepts = []
returns = Parameter(dict, "Version information")
returns = Parameter(dict, "Version information")
- def call(self
, options={}
):
+ def call(self):
self.api.logger.info("interface: %s\tmethod-name: %s" % (self.api.interface, self.name))
self.api.logger.info("interface: %s\tmethod-name: %s" % (self.api.interface, self.name))
- return self.api.manager.GetVersion(self.api
, options
)
+ return self.api.manager.GetVersion(self.api)
diff --git
a/sfa/methods/ListSlices.py
b/sfa/methods/ListSlices.py
index
e14c9b6
..
b196777
100644
(file)
--- a/
sfa/methods/ListSlices.py
+++ b/
sfa/methods/ListSlices.py
@@
-22,7
+22,7
@@
class ListSlices(Method):
returns = Parameter(list, "List of slice names")
returns = Parameter(list, "List of slice names")
- def call(self, creds, options
={}
):
+ def call(self, creds, options):
valid_creds = self.api.auth.checkCredentials(creds, 'listslices')
#log the call
valid_creds = self.api.auth.checkCredentials(creds, 'listslices')
#log the call
diff --git
a/sfa/methods/RenewSliver.py
b/sfa/methods/RenewSliver.py
index
a380d99
..
c503b55
100644
(file)
--- a/
sfa/methods/RenewSliver.py
+++ b/
sfa/methods/RenewSliver.py
@@
-26,7
+26,7
@@
class RenewSliver(Method):
]
returns = Parameter(bool, "Success or Failure")
]
returns = Parameter(bool, "Success or Failure")
- def call(self, slice_xrn, creds, expiration_time, options
={}
):
+ def call(self, slice_xrn, creds, expiration_time, options):
(hrn, type) = urn_to_hrn(slice_xrn)
(hrn, type) = urn_to_hrn(slice_xrn)
diff --git
a/sfa/methods/SliverStatus.py
b/sfa/methods/SliverStatus.py
index
f722c7c
..
deb7998
100644
(file)
--- a/
sfa/methods/SliverStatus.py
+++ b/
sfa/methods/SliverStatus.py
@@
-19,7
+19,7
@@
class SliverStatus(Method):
]
returns = Parameter(dict, "Status details")
]
returns = Parameter(dict, "Status details")
- def call(self, slice_xrn, creds, options
={}
):
+ def call(self, slice_xrn, creds, options):
hrn, type = urn_to_hrn(slice_xrn)
valid_creds = self.api.auth.checkCredentials(creds, 'sliverstatus', hrn)
hrn, type = urn_to_hrn(slice_xrn)
valid_creds = self.api.auth.checkCredentials(creds, 'sliverstatus', hrn)
diff --git
a/sfa/methods/UpdateSliver.py
b/sfa/methods/UpdateSliver.py
index
3302b56
..
72910d7
100644
(file)
--- a/
sfa/methods/UpdateSliver.py
+++ b/
sfa/methods/UpdateSliver.py
@@
-27,7
+27,7
@@
class UpdateSliver(CreateSliver):
- def call(self, slice_xrn, creds, rspec, users, options
={}
):
+ def call(self, slice_xrn, creds, rspec, users, options):
return CreateSliver.call(self, slice_xrn, creds, rspec, users, options)
return CreateSliver.call(self, slice_xrn, creds, rspec, users, options)
diff --git
a/sfa/plc/plshell.py
b/sfa/plc/plshell.py
index
93ee728
..
eea33c0
100644
(file)
--- a/
sfa/plc/plshell.py
+++ b/
sfa/plc/plshell.py
@@
-40,6
+40,8
@@
class PlShell:
# otherwise compare IP addresses;
# this might fail for any number of reasons, so let's harden that
try:
# otherwise compare IP addresses;
# this might fail for any number of reasons, so let's harden that
try:
+ # xxx todo this seems to result in a DNS request for each incoming request to the AM
+ # should be cached or improved
url_ip=socket.gethostbyname(hostname)
local_ip=socket.gethostbyname(socket.gethostname())
if url_ip==local_ip: is_local=True
url_ip=socket.gethostbyname(hostname)
local_ip=socket.gethostbyname(socket.gethostname())
if url_ip==local_ip: is_local=True
diff --git
a/sfa/util/version.py.in
b/sfa/util/version.py.in
index
c1df450
..
46b31d3
100644
(file)
--- a/
sfa/util/version.py.in
+++ b/
sfa/util/version.py.in
@@
-7,7
+7,6
@@
def version_core (more={}):
core = { 'code_tag' : version_tag,
'code_url' : scm_url,
'hostname' : socket.gethostname(),
core = { 'code_tag' : version_tag,
'code_url' : scm_url,
'hostname' : socket.gethostname(),
- 'options_support' : True,
}
core.update(more)
return core
}
core.update(more)
return core