X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=sfa%2Fmanagers%2Faggregate_manager_max.py;fp=sfa%2Fmanagers%2Faggregate_manager_max.py;h=91130bc4a88ebb880fe650dd4d8300f8b1dce28e;hb=6cb4717ad2a1ff4a08d73c7cc0dea759f12ab6d5;hp=09e56b773457c76b0270697beef8721ad590459b;hpb=85608e852e60051a428ab09979fb16dfca8ce65d;p=sfa.git diff --git a/sfa/managers/aggregate_manager_max.py b/sfa/managers/aggregate_manager_max.py index 09e56b77..91130bc4 100644 --- a/sfa/managers/aggregate_manager_max.py +++ b/sfa/managers/aggregate_manager_max.py @@ -214,11 +214,13 @@ class AggregateManagerMax (AggregateManager): ### GENI AM API Methods - def SliverStatus(self, api, slice_xrn, creds, call_id): + 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) - def CreateSliver(self, api, slice_xrn, creds, rspec_string, users, call_id): + 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 ret = self.create_slice(api, slice_xrn, creds, rspec_string, users) @@ -227,12 +229,14 @@ class AggregateManagerMax (AggregateManager): else: return " Error! " - def DeleteSliver(self, api, xrn, creds, call_id): + 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 - def ListResources(self, api, creds, options,call_id): + 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()) slice_urn = options.get('geni_slice_urn')