X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=sfa%2Fmanagers%2Faggregate_manager.py;h=3651b159de02614c21f49ff7fe4cdeda47b8478c;hb=1db1a879ffde8991aa95dd80142d555551655e88;hp=fab2af88700b955abcaf6c66516b6ffe27756aef;hpb=013d9db0fd63345c1d24b2b15b59d3dc5036bc18;p=sfa.git diff --git a/sfa/managers/aggregate_manager.py b/sfa/managers/aggregate_manager.py index fab2af88..3651b159 100644 --- a/sfa/managers/aggregate_manager.py +++ b/sfa/managers/aggregate_manager.py @@ -9,7 +9,6 @@ class AggregateManager: # essentially a union of the core version, the generic version (this code) and # whatever the driver needs to expose def GetVersion(self, api, options): - xrn=Xrn(api.hrn) version = version_core() version_generic = { @@ -43,14 +42,13 @@ class AggregateManager: xrn = Xrn(slice_xrn) slice_urn=xrn.get_urn() slice_hrn=xrn.get_hrn() - return self.driver.list_resources (slice_urn, slice_hrn, creds, options) def SliverStatus (self, api, xrn, creds, options): call_id = options.get('call_id') if Callids().already_handled(call_id): return {} - xrn = Xrn(xrn) + xrn = Xrn(xrn,'slice') slice_urn=xrn.get_urn() slice_hrn=xrn.get_hrn() return self.driver.sliver_status (slice_urn, slice_hrn) @@ -63,7 +61,7 @@ class AggregateManager: call_id = options.get('call_id') if Callids().already_handled(call_id): return "" - xrn = Xrn(xrn) + xrn = Xrn(xrn, 'slice') slice_urn=xrn.get_urn() slice_hrn=xrn.get_hrn() @@ -73,7 +71,7 @@ class AggregateManager: call_id = options.get('call_id') if Callids().already_handled(call_id): return True - xrn = Xrn(xrn) + xrn = Xrn(xrn, 'slice') slice_urn=xrn.get_urn() slice_hrn=xrn.get_hrn() return self.driver.delete_sliver (slice_urn, slice_hrn, creds, options) @@ -82,7 +80,7 @@ class AggregateManager: call_id = options.get('call_id') if Callids().already_handled(call_id): return True - xrn = Xrn(xrn) + xrn = Xrn(xrn, 'slice') slice_urn=xrn.get_urn() slice_hrn=xrn.get_hrn() return self.driver.renew_sliver (slice_urn, slice_hrn, creds, expiration_time, options)