X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=sfa%2Fopenstack%2Fnova_driver.py;h=7666093ba112b05f7561fa7fa7d36af8ce4cc28c;hb=a13a3830bf1822329452f102ebbff7d2bcd94401;hp=275e4bb8ae73a520a0810aef0cfcce8f95fa8311;hpb=40c926f42511f68119ca769888d581fc13d8b181;p=sfa.git diff --git a/sfa/openstack/nova_driver.py b/sfa/openstack/nova_driver.py index 275e4bb8..7666093b 100644 --- a/sfa/openstack/nova_driver.py +++ b/sfa/openstack/nova_driver.py @@ -2,7 +2,7 @@ import time import datetime from sfa.util.faults import MissingSfaInfo, UnknownSfaType, \ - RecordNotFound, SfaNotImplemented, SfaInvalidArgument + RecordNotFound, SfaNotImplemented, SfaInvalidArgument, UnsupportedOperation from sfa.util.sfalogging import logger from sfa.util.defaultdict import defaultdict @@ -13,9 +13,10 @@ from sfa.util.cache import Cache from sfa.trust.credential import Credential # used to be used in get_ticket #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 from sfa.managers.driver import Driver @@ -318,32 +319,25 @@ class NovaDriver(Driver): def aggregate_version (self): return {} - def list_slices (self, creds, options): - # get data from db - instance_urns = [] - instances = self.shell.nova_manager.servers.findall() - for instance in instances: - if instance.name not in instance_urns: - instance_urns.append(OSXrn(instance.name, type='slice').urn) - return instance_urns - # first 2 args are None in case of resource discovery - def list_resources (self, creds, version, options): + def list_resources (self, version=None, options={}): aggregate = OSAggregate(self) rspec = aggregate.list_resources(version=version, options=options) return rspec - def describe(self, creds, urns, version, options): + def describe(self, urns, version=None, options={}): aggregate = OSAggregate(self) return aggregate.describe(urns, version=version, options=options) - def status (self, urns): + def status (self, urns, options={}): aggregate = OSAggregate(self) - desc = aggregate.describe(urns, version=version, options=options) - return desc['geni_slivers'] - - def create_sliver (self, slice_urn, slice_hrn, creds, rspec_string, users, options): + desc = aggregate.describe(urns) + status = {'geni_urn': desc['geni_urn'], + 'geni_slivers': desc['geni_slivers']} + return status + def allocate (self, urn, rspec_string, options={}): + xrn = Xrn(urn) aggregate = OSAggregate(self) # assume first user is the caller and use their context @@ -351,9 +345,10 @@ class NovaDriver(Driver): # key as the project key. key_name = None if len(users) > 1: - key_name = aggregate.create_instance_key(slice_hrn, users[0]) + key_name = aggregate.create_instance_key(xrn.get_hrn(), users[0]) # collect public keys + users = options.get('geni_users', []) pubkeys = [] for user in users: pubkeys.extend(user['keys']) @@ -361,103 +356,73 @@ class NovaDriver(Driver): rspec = RSpec(rspec_string) instance_name = hrn_to_os_slicename(slice_hrn) tenant_name = OSXrn(xrn=slice_hrn, type='slice').get_tenant_name() - aggregate.run_instances(instance_name, tenant_name, rspec_string, key_name, pubkeys) + slivers = aggregate.run_instances(instance_name, tenant_name, \ + rspec_string, key_name, pubkeys) + + # 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') - return aggregate.describe(slice_xrn=slice_urn, version=rspec.version) + return aggregate.describe(urns=[urn], version=rspec.version) - def delete_sliver (self, slice_urn, slice_hrn, creds, options): + def provision(self, urns, options={}): + # update sliver allocation states and set them to geni_provisioned aggregate = OSAggregate(self) - tenant_name = OSXrn(xrn=slice_hrn, type='slice').get_tenant_name() - project_name = hrn_to_os_slicename(slice_hrn) - return aggregate.delete_instances(project_name, tenant_name) + instances = aggregate.get_instances(urns) + sliver_ids = [] + 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 update_sliver(self, slice_urn, slice_hrn, rspec, creds, options): - name = hrn_to_os_slicename(slice_hrn) - tenant_name = OSXrn(xrn=slice_hrn, type='slice').get_tenant_name() + def delete (self, urns, options={}): + # collect sliver ids so we can update sliver allocation states after + # we remove the slivers. aggregate = OSAggregate(self) - return aggregate.update_instances(name) - - def renew_sliver (self, slice_urn, slice_hrn, creds, expiration_time, options): + instances = aggregate.get_instances(urns) + sliver_ids = [] + for instance in instances: + sliver_hrn = "%s.%s" % (self.driver.hrn, instance.id) + sliver_ids.append(Xrn(sliver_hrn, type='sliver').urn) + + # delete the instance + aggregate.delete_instance(instance) + + # delete sliver allocation states + SliverAllocation.delete_allocations(sliver_ids) return True - def start_slice (self, slice_urn, slice_hrn, creds): - return 1 + def renew (self, urns, expiration_time, options={}): + return True - def stop_slice (self, slice_urn, slice_hrn, creds): - tenant_name = OSXrn(xrn=slice_hrn, type='slice').get_tenant_name() - name = OSXrn(xrn=slice_urn).name + def perform_operational_action (self, urns, action, options={}): aggregate = OSAggregate(self) - return aggregate.stop_instances(name, tenant_name) - - def reset_slice (self, slice_urn, slice_hrn, creds): - raise SfaNotImplemented ("reset_slice not available at this interface") - - # xxx this code is quite old and has not run for ages - # it is obviously totally broken and needs a rewrite - def get_ticket (self, slice_urn, slice_hrn, creds, rspec_string, options): - raise SfaNotImplemented,"OpenStackDriver.get_ticket needs a rewrite" -# please keep this code for future reference -# slices = PlSlices(self) -# peer = slices.get_peer(slice_hrn) -# sfa_peer = slices.get_sfa_peer(slice_hrn) -# -# # get the slice record -# credential = api.getCredential() -# interface = api.registries[api.hrn] -# registry = api.server_proxy(interface, credential) -# records = registry.Resolve(xrn, credential) -# -# # make sure we get a local slice record -# record = None -# for tmp_record in records: -# if tmp_record['type'] == 'slice' and \ -# not tmp_record['peer_authority']: -# #Error (E0602, GetTicket): Undefined variable 'SliceRecord' -# slice_record = SliceRecord(dict=tmp_record) -# if not record: -# raise RecordNotFound(slice_hrn) -# -# # similar to CreateSliver, we must verify that the required records exist -# # at this aggregate before we can issue a ticket -# # parse rspec -# rspec = RSpec(rspec_string) -# requested_attributes = rspec.version.get_slice_attributes() -# -# # ensure site record exists -# site = slices.verify_site(slice_hrn, slice_record, peer, sfa_peer) -# # ensure slice record exists -# slice = slices.verify_slice(slice_hrn, slice_record, peer, sfa_peer) -# # ensure person records exists -# # xxx users is undefined in this context -# persons = slices.verify_persons(slice_hrn, slice, users, peer, sfa_peer) -# # ensure slice attributes exists -# slices.verify_slice_attributes(slice, requested_attributes) -# -# # get sliver info -# slivers = slices.get_slivers(slice_hrn) -# -# if not slivers: -# raise SliverDoesNotExist(slice_hrn) -# -# # get initscripts -# initscripts = [] -# data = { -# 'timestamp': int(time.time()), -# 'initscripts': initscripts, -# 'slivers': slivers -# } -# -# # create the ticket -# object_gid = record.get_gid_object() -# new_ticket = SfaTicket(subject = object_gid.get_subject()) -# new_ticket.set_gid_caller(api.auth.client_gid) -# new_ticket.set_gid_object(object_gid) -# new_ticket.set_issuer(key=api.key, subject=self.hrn) -# new_ticket.set_pubkey(object_gid.get_pubkey()) -# new_ticket.set_attributes(data) -# new_ticket.set_rspec(rspec) -# #new_ticket.set_parent(api.auth.hierarchy.get_auth_ticket(auth_hrn)) -# new_ticket.encode() -# new_ticket.sign() -# -# return new_ticket.save_to_string(save_parents=True) + action = action.lower() + if action == 'geni_start': + action_method = aggregate.start_instances + elif action == 'geni_stop': + action_method = aggregate.stop_instances + elif action == 'geni_restart': + 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) + description = self.describe(urns) + return description['geni_slivers'] + + def shutdown(self, xrn, options={}): + xrn = OSXrn(xrn=xrn, type='slice') + tenant_name = xrn.get_tenant_name() + name = xrn.get_slicename() + self.driver.shell.nova_manager.connect(tenant=tenant_name) + instances = self.driver.shell.nova_manager.servers.findall(name=name) + for instance in instances: + self.driver.shell.nova_manager.servers.shutdown(instance) + return True