X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=sfa%2Fopenstack%2Fnova_driver.py;h=39ea2f91cdabec196ad90afe63b83725c962214b;hb=4a2337e7f70cef81a8de37829aa63fc941c4b96e;hp=ec4b1f957dee092d979615099b4513f06ddd6ef0;hpb=a902bbbbc55175e14894371722fdbcb72e1983fc;p=sfa.git diff --git a/sfa/openstack/nova_driver.py b/sfa/openstack/nova_driver.py index ec4b1f95..39ea2f91 100644 --- a/sfa/openstack/nova_driver.py +++ b/sfa/openstack/nova_driver.py @@ -15,7 +15,6 @@ from sfa.trust.credential import Credential #from sfa.trust.sfaticket import SfaTicket from sfa.rspecs.version_manager import VersionManager from sfa.rspecs.rspec import RSpec -from sfa.storage.alchemy import dbsession from sfa.storage.model import RegRecord, SliverAllocation # the driver interface, mostly provides default behaviours @@ -41,14 +40,50 @@ class NovaDriver(Driver): # the cache instance is a class member so it survives across incoming requests cache = None - def __init__ (self, config): - Driver.__init__(self, config) + def __init__ (self, api): + Driver.__init__(self, api) + config = api.config self.shell = Shell(config=config) self.cache=None if config.SFA_AGGREGATE_CACHING: if NovaDriver.cache is None: NovaDriver.cache = Cache() self.cache = NovaDriver.cache + + def sliver_to_slice_xrn(self, xrn): + sliver_id_parts = Xrn(xrn).get_sliver_id_parts() + slice = self.shell.auth_manager.tenants.find(id=sliver_id_parts[0]) + if not slice: + raise Forbidden("Unable to locate slice record for sliver: %s" % xrn) + slice_xrn = OSXrn(name=slice.name, type='slice') + return slice_xrn + + def check_sliver_credentials(self, creds, urns): + # build list of cred object hrns + slice_cred_names = [] + for cred in creds: + slice_cred_hrn = Credential(cred=cred).get_gid_object().get_hrn() + slice_cred_names.append(OSXrn(xrn=slice_cred_hrn).get_slicename()) + + # look up slice name of slivers listed in urns arg + slice_ids = [] + for urn in urns: + sliver_id_parts = Xrn(xrn=urn).get_sliver_id_parts() + slice_ids.append(sliver_id_parts[0]) + + if not slice_ids: + raise Forbidden("sliver urn not provided") + + sliver_names = [] + for slice_id in slice_ids: + slice = self.shell.auth_manager.tenants.find(slice_id) + sliver_names.append(slice['name']) + + # make sure we have a credential for every specified sliver ierd + for sliver_name in sliver_names: + if sliver_name not in slice_cred_names: + msg = "Valid credential not found for target: %s" % sliver_name + raise Forbidden(msg) ######################################## ########## registry oriented @@ -320,21 +355,27 @@ class NovaDriver(Driver): return {} # first 2 args are None in case of resource discovery - def list_resources (self, version=None, options={}): + def list_resources (self, version=None, options=None): + if options is None: options={} aggregate = OSAggregate(self) rspec = aggregate.list_resources(version=version, options=options) return rspec - def describe(self, urns, version=None, options={}): + def describe(self, urns, version=None, options=None): + if options is None: options={} aggregate = OSAggregate(self) return aggregate.describe(urns, version=version, options=options) - def status (self, urns, options={}): + def status (self, urns, options=None): + if options is None: options={} aggregate = OSAggregate(self) desc = aggregate.describe(urns) - return desc['geni_slivers'] + status = {'geni_urn': desc['geni_urn'], + 'geni_slivers': desc['geni_slivers']} + return status - def allocate (self, urn, rspec_string, options={}): + def allocate (self, urn, rspec_string, expiration, options=None): + if options is None: options={} xrn = Xrn(urn) aggregate = OSAggregate(self) @@ -359,11 +400,13 @@ class NovaDriver(Driver): # update all sliver allocation states setting then to geni_allocated sliver_ids = [sliver.id for sliver in slivers] - SliverAllocation.set_allocations(sliver_ids, 'geni_allocated') + dbsession=self.api.dbsession() + SliverAllocation.set_allocations(sliver_ids, 'geni_provisioned',dbsession) return aggregate.describe(urns=[urn], version=rspec.version) - def provision(self, urns, options={}): + def provision(self, urns, options=None): + if options is None: options={} # update sliver allocation states and set them to geni_provisioned aggregate = OSAggregate(self) instances = aggregate.get_instances(urns) @@ -371,11 +414,14 @@ class NovaDriver(Driver): for instance in instances: sliver_hrn = "%s.%s" % (self.driver.hrn, instance.id) sliver_ids.append(Xrn(sliver_hrn, type='sliver').urn) - SliverAllocation.set_allocations(sliver_ids, 'geni_provisioned') - - return self.describe(urns, options=options) - - def delete (self, urns, options={}): + dbsession=self.api.dbsession() + SliverAllocation.set_allocations(sliver_ids, 'geni_provisioned',dbsession) + version_manager = VersionManager() + rspec_version = version_manager.get_version(options['geni_rspec_version']) + return self.describe(urns, rspec_version, options=options) + + def delete (self, urns, options=None): + if options is None: options={} # collect sliver ids so we can update sliver allocation states after # we remove the slivers. aggregate = OSAggregate(self) @@ -389,13 +435,25 @@ class NovaDriver(Driver): aggregate.delete_instance(instance) # delete sliver allocation states - SliverAllocation.delete_allocations(sliver_ids) - return True - - def renew (self, urns, expiration_time, options={}): - return True - - def perform_operational_action (self, urns, action, options={}): + dbsession=self.api.dbsession() + SliverAllocation.delete_allocations(sliver_ids, dbsession) + + # return geni_slivers + geni_slivers = [] + for sliver_id in sliver_ids: + geni_slivers.append( + {'geni_sliver_urn': sliver['sliver_id'], + 'geni_allocation_status': 'geni_unallocated', + 'geni_expires': None}) + return geni_slivers + + def renew (self, urns, expiration_time, options=None): + if options is None: options={} + description = self.describe(urns, None, options) + return description['geni_slivers'] + + def perform_operational_action (self, urns, action, options=None): + if options is None: options={} aggregate = OSAggregate(self) action = action.lower() if action == 'geni_start': @@ -406,16 +464,26 @@ class NovaDriver(Driver): action_method = aggreate.restart_instances else: raise UnsupportedOperation(action) - for urn in urns: - xrn = OSXrn(urn=urn) - tenant_name = xrn.get_tenant_name() - project_name = xrn.get_slicename() - id = xrn.id - aggreate.action_method(tenant_name, project_name, id) + + # fault if sliver is not full allocated (operational status is geni_pending_allocation) + description = self.describe(urns, None, options) + for sliver in description['geni_slivers']: + if sliver['geni_operational_status'] == 'geni_pending_allocation': + raise UnsupportedOperation(action, "Sliver must be fully allocated (operational status is not geni_pending_allocation)") + # + # Perform Operational Action Here + # + + instances = aggregate.get_instances(urns) + for instance in instances: + tenant_name = self.driver.shell.auth_manager.client.tenant_name + action_method(tenant_name, instance.name, instance.id) description = self.describe(urns) - return description['geni_slivers'] + geni_slivers = self.describe(urns, None, options)['geni_slivers'] + return geni_slivers - def shutdown(self, xrn, options={}): + def shutdown(self, xrn, options=None): + if options is None: options={} xrn = OSXrn(xrn=xrn, type='slice') tenant_name = xrn.get_tenant_name() name = xrn.get_slicename()