X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=sfa%2Fopenstack%2Fnova_driver.py;h=67103ffd0d75727778c035dbaa022576ff067f0b;hb=1b631ada8bfba79e56e0cadfc45b4cf71dce96f1;hp=c5fae3a3086be7301b1ddf89cb5fac61cebcfec1;hpb=79b5c3a27d0ae6fbd9fe6a1bafaa67c8059a43e2;p=sfa.git diff --git a/sfa/openstack/nova_driver.py b/sfa/openstack/nova_driver.py index c5fae3a3..67103ffd 100644 --- a/sfa/openstack/nova_driver.py +++ b/sfa/openstack/nova_driver.py @@ -316,24 +316,8 @@ class NovaDriver(Driver): def testbed_name (self): return "openstack" - # 'geni_request_rspec_versions' and 'geni_ad_rspec_versions' are mandatory def aggregate_version (self): - version_manager = VersionManager() - ad_rspec_versions = [] - request_rspec_versions = [] - for rspec_version in version_manager.versions: - if rspec_version.content_type in ['*', 'ad']: - ad_rspec_versions.append(rspec_version.to_dict()) - 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, - 'geni_single_allocation': False, # 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', - } + return {} def list_slices (self, creds, options): # look in cache first