-import soctet
+import socket
from sfa.rspecs.version_manager import VersionManager
from sfa.util.version import version_core
from sfa.util.xrn import Xrn
# essentially a union of the core version, the generic version (this code) and
# whatever the driver needs to expose
- def _rspec_versions(self):
+ def rspec_versions(self):
version_manager = VersionManager()
ad_rspec_versions = []
request_rspec_versions = []
if rspec_version.content_type in ['*', 'request']:
request_rspec_versions.append(rspec_version.to_dict())
return {
- 'testbed':self.testbed_name(),
'geni_request_rspec_versions': request_rspec_versions,
'geni_ad_rspec_versions': ad_rspec_versions,
}
return version_string
def GetVersion(self, api, options):
- xrn=Xrn(api.hrn)
+ xrn=Xrn(api.hrn, type='authority')
version = version_core()
+ cred_types = [{'geni_type': 'geni_sfa', 'geni_version': str(i)} for i in range(4)[-2:]]
version_generic = {
'testbed': self.driver.testbed_name(),
'interface':'aggregate',
'geni_single_allocation': 0, # Accept operations that act on as subset of slivers in a given state.
'geni_allocate': 'geni_many',# Multiple slivers can exist and be incrementally added, including those which connect or overlap in some way.
'geni_best_effort': 'true',
- 'geni_credential_types': [{
- 'geni_type': 'geni_sfa',
- 'geni_version': 3,
- }],
+ 'geni_credential_types': cred_types,
}
version.update(version_generic)
+ version.update(self.rspec_versions())
testbed_version = self.driver.aggregate_version()
version.update(testbed_version)
return version
# look in cache first
cached_requested = options.get('cached', True)
- if cached_requested and self.driver.cache and not slice_hrn:
+ if cached_requested and self.driver.cache:
rspec = self.driver.cache.get(version_string)
if rspec:
logger.debug("%s.ListResources returning cached advertisement" % (self.driver.__module__))
return rspec
- rspec = self.driver.list_resources (version, options)
+ rspec = self.driver.list_resources (rspec_version, options)
if self.driver.cache:
logger.debug("%s.ListResources stores advertisement in cache" % (self.driver.__module__))
self.driver.cache.add(version_string, rspec)