X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=sfa%2Fopenstack%2Fnova_driver.py;h=46e1e0faecdc0569a6d959bd031c6550787dcfee;hb=4ea7f6be6955285c746e451a21162f70d2cbe58b;hp=3f8b7e3c22c9adc48e61133f207b4f3cbde43f09;hpb=d5af230afa3a33d47f6e8fdd3128326c148c0e70;p=sfa.git diff --git a/sfa/openstack/nova_driver.py b/sfa/openstack/nova_driver.py index 3f8b7e3c..46e1e0fa 100644 --- a/sfa/openstack/nova_driver.py +++ b/sfa/openstack/nova_driver.py @@ -3,6 +3,7 @@ import datetime # from sfa.util.faults import MissingSfaInfo, UnknownSfaType, \ RecordNotFound, SfaNotImplemented, SliverDoesNotExist + from sfa.util.sfalogging import logger from sfa.util.defaultdict import defaultdict from sfa.util.sfatime import utcparse, datetime_to_string, datetime_to_epoch @@ -10,11 +11,14 @@ from sfa.util.xrn import Xrn, hrn_to_urn, get_leaf, urn_to_sliver_id from sfa.util.cache import Cache # 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 + # the driver interface, mostly provides default behaviours from sfa.managers.driver import Driver from sfa.openstack.nova_shell import NovaShell +from sfa.openstack.euca_shell import EucaShell from sfa.openstack.osaggregate import OSAggregate from sfa.plc.plslices import PlSlices from sfa.util.osxrn import OSXrn @@ -40,6 +44,7 @@ class NovaDriver (Driver): def __init__ (self, config): Driver.__init__ (self, config) self.shell = NovaShell (config) + self.euca_shell = EucaShell(config) self.cache=None if config.SFA_AGGREGATE_CACHING: if NovaDriver.cache is None: @@ -97,11 +102,11 @@ class NovaDriver (Driver): type=sfa_record['type'] name = Xrn(sfa_record['hrn']).get_leaf() if type == 'user': - if self.shell.user_get(name): - self.shell.user_delete(name) + if self.shell.auth_manager.get_user(name): + self.shell.auth_manager.delete_user(name) elif type == 'slice': - if self.shell.project_get(name): - self.shell.project_delete(name) + if self.shell.auth_manager.get_project(name): + self.shell.auth_manager.delete_project(name) return True @@ -118,28 +123,29 @@ class NovaDriver (Driver): name = Xrn(record['hrn']).get_leaf() os_record = None if record['type'] == 'user': - os_record = self.shell.user_get(name) + os_record = self.shell.auth_manager.get_user(name) + projects = self.shell.db.project_get_by_user(name) record['slices'] = [self.hrn + "." + proj.name for \ - proj in os_record.projects] - record['roles'] = [role for role in os_record.roles] - keys = self.shell.key_pair_get_all_by_user(name) + proj in projects] + record['roles'] = self.shell.db.user_get_roles(name) + keys = self.shell.db.key_pair_get_all_by_user(name) record['keys'] = [key.public_key for key in keys] elif record['type'] == 'slice': - os_record = self.shell.project_get(name) + os_record = self.shell.auth_manager.get_project(name) record['description'] = os_record.description - record['PI'] = self.hrn + "." + os_record.project_manager + record['PI'] = [self.hrn + "." + os_record.project_manager.name] record['geni_creator'] = record['PI'] - record['researcher'] = [self.hrn + "." + user.name for \ - user in os_record.members] + record['researcher'] = [self.hrn + "." + user for \ + user in os_record.member_ids] else: continue record['geni_urn'] = hrn_to_urn(record['hrn'], record['type']) record['geni_certificate'] = record['gid'] record['name'] = os_record.name - if os_record.created_at is not None: - record['date_created'] = datetime_to_string(utcparse(os_record.created_at)) - if os_record.updated_at is not None: - record['last_updated'] = datetime_to_string(utcparse(os_record.updated_at)) + #if os_record.created_at is not None: + # record['date_created'] = datetime_to_string(utcparse(os_record.created_at)) + #if os_record.updated_at is not None: + # record['last_updated'] = datetime_to_string(utcparse(os_record.updated_at)) return records @@ -240,49 +246,37 @@ class NovaDriver (Driver): def sliver_status (self, slice_urn, slice_hrn): # find out where this slice is currently running - slicename = hrn_to_pl_slicename(slice_hrn) - - slices = self.shell.GetSlices([slicename], ['slice_id', 'node_ids','person_ids','name','expires']) - if len(slices) == 0: - raise SliverDoesNotExist("%s (used %s as slicename internally)" % (slice_hrn, slicename)) - slice = slices[0] - - # report about the local nodes only - nodes = self.shell.GetNodes({'node_id':slice['node_ids'],'peer_id':None}, - ['node_id', 'hostname', 'site_id', 'boot_state', 'last_contact']) - - if len(nodes) == 0: + project_name = Xrn(slice_urn).get_leaf() + project = self.shell.auth_manager.get_project(project_name) + instances = self.shell.db.instance_get_all_by_project(project_name) + if len(instances) == 0: raise SliverDoesNotExist("You have not allocated any slivers here") - - site_ids = [node['site_id'] for node in nodes] - + result = {} top_level_status = 'unknown' - if nodes: + if instances: top_level_status = 'ready' result['geni_urn'] = slice_urn - result['pl_login'] = slice['name'] - result['pl_expires'] = datetime_to_string(utcparse(slice['expires'])) + result['plos_login'] = 'root' + result['plos_expires'] = None resources = [] - for node in nodes: + for instance in instances: res = {} - res['pl_hostname'] = node['hostname'] - res['pl_boot_state'] = node['boot_state'] - res['pl_last_contact'] = node['last_contact'] - if node['last_contact'] is not None: - - res['pl_last_contact'] = datetime_to_string(utcparse(node['last_contact'])) - sliver_id = urn_to_sliver_id(slice_urn, slice['slice_id'], node['node_id']) + # instances are accessed by ip, not hostname. We need to report the ip + # somewhere so users know where to ssh to. + res['plos_hostname'] = instance.hostname + res['plos_created_at'] = datetime_to_string(utcparse(instance.created_at)) + res['plos_boot_state'] = instance.vm_state + res['plos_sliver_type'] = instance.instance_type.name + sliver_id = Xrn(slice_urn).get_sliver_id(instance.project_id, \ + instance.hostname, instance.id) res['geni_urn'] = sliver_id - if node['boot_state'] == 'boot': - res['geni_status'] = 'ready' + + if instance.vm_state == 'running': + res['boot_state'] = 'ready'; else: - res['geni_status'] = 'failed' - top_level_status = 'failed' - - res['geni_error'] = '' - + res['boot_state'] = 'unknown' resources.append(res) result['geni_status'] = top_level_status @@ -297,13 +291,19 @@ class NovaDriver (Driver): # parse rspec rspec = RSpec(rspec_string) requested_attributes = rspec.version.get_slice_attributes() + pubkeys = [] + for user in users: + pubkeys.extend(user['keys']) + # assume that there is a key whos nane matches the caller's username. + project_key = Xrn(users[0]['urn']).get_leaf() + # ensure slice record exists - slice = aggregate.verify_slice(slicename, users, options=options) + aggregate.create_project(slicename, users, options=options) # ensure person records exists - persons = aggregate.verify_slice_users(slicename, users, options=options) + aggregate.create_project_users(slicename, users, options=options) # add/remove slice from nodes - slices.verify_instances(slicename, rspec) + aggregate.run_instances(slicename, rspec, project_key, pubkeys) return aggregate.get_rspec(slice_xrn=slice_urn, version=rspec.version) @@ -312,8 +312,6 @@ class NovaDriver (Driver): slice = self.shell.project_get(name) if not slice: return 1 - - self.shell.DeleteSliceFromNodes(slicename, slice['node_ids']) instances = self.shell.db.instance_get_all_by_project(name) for instance in instances: self.shell.db.instance_destroy(instance.instance_id)