# 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 = {'interface':'aggregate',
- 'sfa': 2,
- 'geni_api': 2,
- 'hrn':xrn.get_hrn(),
- 'urn':xrn.get_urn(),
- }
+ version_generic = {
+ 'interface':'aggregate',
+ 'sfa': 2,
+ 'geni_api': 2,
+ 'geni_api_versions': {'2': 'http://%s:%s' % (api.config.SFA_AGGREGATE_HOST, api.config.SFA_AGGREGATE_PORT)},
+ 'hrn':xrn.get_hrn(),
+ 'urn':xrn.get_urn(),
+ }
version.update(version_generic)
testbed_version = self.driver.aggregate_version()
version.update(testbed_version)
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)
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()
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)
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)