X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=sfa%2Fopenstack%2Fnova_driver.py;h=9c60bd5608b440253abd384d01acc07e24ce6973;hb=b8bbafc52d7735d4cae7e2042139ef2dd61b70c1;hp=2c49bc06b5c99c7153e75379da61243b6337cd22;hpb=764312c063176dda6905b526d19c8db28f0eb913;p=sfa.git diff --git a/sfa/openstack/nova_driver.py b/sfa/openstack/nova_driver.py index 2c49bc06..9c60bd56 100644 --- a/sfa/openstack/nova_driver.py +++ b/sfa/openstack/nova_driver.py @@ -8,8 +8,7 @@ from sfa.util.faults import MissingSfaInfo, UnknownSfaType, \ from sfa.util.sfalogging import logger from sfa.util.defaultdict import defaultdict from sfa.util.sfatime import utcparse, datetime_to_string, datetime_to_epoch -from sfa.util.xrn import Xrn, hrn_to_urn, get_leaf, urn_to_sliver_id -from sfa.planetlab.plxrn import PlXrn +from sfa.util.xrn import Xrn, hrn_to_urn, get_leaf from sfa.openstack.osxrn import OSXrn, hrn_to_os_slicename, hrn_to_os_tenant_name from sfa.util.cache import Cache from sfa.trust.credential import Credential @@ -24,8 +23,6 @@ from sfa.managers.driver import Driver from sfa.openstack.shell import Shell from sfa.openstack.osaggregate import OSAggregate from sfa.planetlab.plslices import PlSlices -from sfa.util.osxrn import OSXrn - def list_to_dict(recs, key): """ @@ -46,7 +43,7 @@ class NovaDriver(Driver): def __init__ (self, config): Driver.__init__(self, config) - self.shell = Shell(config) + self.shell = Shell(config=config) self.cache=None if config.SFA_AGGREGATE_CACHING: if NovaDriver.cache is None: @@ -67,49 +64,72 @@ class NovaDriver(Driver): ########## def register (self, sfa_record, hrn, pub_key): - type = sfa_record['type'] - #pl_record = self.sfa_fields_to_pl_fields(type dd , hrn, sfa_record) - - if type == 'slice': - # add slice description, name, researchers, PI - name = hrn_to_os_slicename(hrn) - researchers = sfa_record.get('researchers', []) - pis = sfa_record.get('pis', []) - project_manager = None - description = sfa_record.get('description', None) - if pis: - project_manager = Xrn(pis[0], 'user').get_leaf() - elif researchers: - project_manager = Xrn(researchers[0], 'user').get_leaf() - if not project_manager: - err_string = "Cannot create a project without a project manager. " + \ - "Please specify at least one PI or researcher for project: " + \ - name - raise SfaInvalidArgument(err_string) - - users = [Xrn(user, 'user').get_leaf() for user in \ - pis + researchers] - self.shell.auth_manager.create_project(name, project_manager, description, users) - - elif type == 'user': - # add person roles, projects and keys - name = Xrn(hrn).get_leaf() - self.shell.auth_manager.create_user(name) - projects = sfa_records.get('slices', []) - for project in projects: - project_name = Xrn(project).get_leaf() - self.shell.auth_manager.add_to_project(name, project_name) - keys = sfa_records.get('keys', []) - for key in keys: - key_dict = { - 'user_id': name, - 'name': name, - 'public': key, - } - self.shell.db.key_pair_create(key_dict) - - return name + if sfa_record['type'] == 'slice': + record = self.register_slice(sfa_record, hrn) + elif sfa_record['type'] == 'user': + record = self.register_user(sfa_record, hrn, pub_key) + elif sfa_record['type'].startswith('authority'): + record = self.register_authority(sfa_record, hrn) + # We should be returning the records id as a pointer but + # this is a string and the records table expects this to be an + # int. + #return record.id + return -1 + + def register_slice(self, sfa_record, hrn): + # add slice description, name, researchers, PI + name = hrn_to_os_tenant_name(hrn) + description = sfa_record.get('description', None) + self.shell.auth_manager.tenants.create(name, description) + tenant = self.shell.auth_manager.tenants.find(name=name) + auth_hrn = OSXrn(xrn=hrn, type='slice').get_authority_hrn() + parent_tenant_name = OSXrn(xrn=auth_hrn, type='slice').get_tenant_name() + parent_tenant = self.shell.auth_manager.tenants.find(name=parent_tenant_name) + researchers = sfa_record.get('researchers', []) + for researcher in researchers: + name = Xrn(researcher).get_leaf() + user = self.shell.auth_manager.users.find(name=name) + self.shell.auth_manager.roles.add_user_role(user, 'Member', tenant) + self.shell.auth_manager.roles.add_user_role(user, 'user', tenant) + + + pis = sfa_record.get('pis', []) + for pi in pis: + name = Xrn(pi).get_leaf() + user = self.shell.auth_manager.users.find(name=name) + self.shell.auth_manager.roles.add_user_role(user, 'pi', tenant) + self.shell.auth_manager.roles.add_user_role(user, 'pi', parent_tenant) + + return tenant + + def register_user(self, sfa_record, hrn, pub_key): + # add person roles, projects and keys + email = sfa_record.get('email', None) + xrn = Xrn(hrn) + name = xrn.get_leaf() + auth_hrn = xrn.get_authority_hrn() + tenant_name = OSXrn(xrn=auth_hrn, type='authority').get_tenant_name() + tenant = self.shell.auth_manager.tenants.find(name=tenant_name) + self.shell.auth_manager.users.create(name, email=email, tenant_id=tenant.id) + user = self.shell.auth_manager.users.find(name=name) + slices = sfa_records.get('slices', []) + for slice in projects: + slice_tenant_name = OSXrn(xrn=slice, type='slice').get_tenant_name() + slice_tenant = self.shell.auth_manager.tenants.find(name=slice_tenant_name) + self.shell.auth_manager.roles.add_user_role(user, slice_tenant, 'user') + keys = sfa_records.get('keys', []) + for key in keys: + keyname = OSXrn(xrn=hrn, type='user').get_slicename() + self.shell.nova_client.keypairs.create(keyname, key) + return user + + def register_authority(self, sfa_record, hrn): + name = OSXrn(xrn=hrn, type='authority').get_tenant_name() + self.shell.auth_manager.tenants.create(name, sfa_record.get('description', '')) + tenant = self.shell.auth_manager.tenants.find(name=name) + return tenant + ########## # xxx actually old_sfa_record comes filled with plc stuff as well in the original code @@ -194,7 +214,7 @@ class NovaDriver(Driver): if tmp_tenant.name.startswith(tenant.name +"."): for tmp_user in tmp_tenant.list_users(): if tmp_user.name == user.name: - slice_hrn = ".",join([self.hrn, tmp_tenant.name]) + slice_hrn = ".".join([self.hrn, tmp_tenant.name]) slices.append(slice_hrn) record['slices'] = slices roles = self.shell.auth_manager.roles.roles_for_user(user, tenant) @@ -214,17 +234,21 @@ class NovaDriver(Driver): # look for users and pis in slice tenant for user in tenant.list_users(): for role in self.shell.auth_manager.roles.roles_for_user(user, tenant): - hrn = ".".join([self.hrn, tenant.name, user.name]) if role.name.lower() == 'pi': + user_tenant = self.shell.auth_manager.tenants.find(id=user.tenantId) + hrn = ".".join([self.hrn, user_tenant.name, user.name]) pis.append(hrn) elif role.name.lower() in ['user', 'member']: + user_tenant = self.shell.auth_manager.tenants.find(id=user.tenantId) + hrn = ".".join([self.hrn, user_tenant.name, user.name]) researchers.append(hrn) # look for pis in the slice's parent (site/organization) tenant for user in parent_tenant.list_users(): for role in self.shell.auth_manager.roles.roles_for_user(user, parent_tenant): if role.name.lower() == 'pi': - hrn = ".".join([self.hrn, tenant.name, user.name]) + user_tenant = self.shell.auth_manager.tenants.find(id=user.tenantId) + hrn = ".".join([self.hrn, user_tenant.name, user.name]) pis.append(hrn) record['name'] = tenant_name record['description'] = tenant.description @@ -317,15 +341,18 @@ class NovaDriver(Driver): return slices # get data from db - projs = self.shell.auth_manager.get_projects() - slice_urns = [OSXrn(proj.name, 'slice').urn for proj in projs] - + 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) + # cache the result if self.cache: logger.debug ("OpenStackDriver.list_slices stores value in cache") - self.cache.add('slices', slice_urns) + self.cache.add('slices', instance_urns) - return slice_urns + return instance_urns # first 2 args are None in case of resource discovery def list_resources (self, slice_urn, slice_hrn, creds, options): @@ -361,10 +388,13 @@ class NovaDriver(Driver): return rspec def sliver_status (self, slice_urn, slice_hrn): + # update nova connection + tenant_name = OSXrn(xrn=slice_hrn, type='slice').get_tenant_name() + self.shell.nova_manager.connect(tenant=tenant_name) + # find out where this slice is currently running project_name = hrn_to_os_slicename(slice_hrn) - project = self.shell.auth_manager.get_project(project_name) - instances = self.shell.db.instance_get_all_by_project(project_name) + instances = self.shell.nova_manager.servers.findall(name=project_name) if len(instances) == 0: raise SliverDoesNotExist("You have not allocated any slivers here") @@ -373,26 +403,30 @@ class NovaDriver(Driver): if instances: top_level_status = 'ready' result['geni_urn'] = slice_urn - result['plos_login'] = 'root' + result['plos_login'] = 'root' + # do we need real dates here? result['plos_expires'] = None + result['geni_expires'] = None resources = [] for instance in instances: res = {} # 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_expires'] = None + #res['plos_hostname'] = instance.hostname + res['plos_created_at'] = datetime_to_string(utcparse(instance.created)) + res['plos_boot_state'] = instance.status + res['plos_sliver_type'] = self.shell.nova_manager.flavors.find(id=instance.flavor['id']).name + sliver_id = Xrn(slice_urn).get_sliver_id(instance.id) res['geni_urn'] = sliver_id - if instance.vm_state == 'running': - res['boot_state'] = 'ready'; + if instance.status.lower() == 'active': + res['boot_state'] = 'ready' + res['geni_status'] = 'ready' else: res['boot_state'] = 'unknown' + res['geni_status'] = 'unknown' resources.append(res) result['geni_status'] = top_level_status @@ -402,9 +436,7 @@ class NovaDriver(Driver): def create_sliver (self, slice_urn, slice_hrn, creds, rspec_string, users, options): aggregate = OSAggregate(self) - rspec = RSpec(rspec_string) - instance_name = hrn_to_os_slicename(slice_hrn) - + # assume first user is the caller and use their context # for the ec2/euca api connection. Also, use the first users # key as the project key. @@ -417,17 +449,22 @@ class NovaDriver(Driver): for user in users: pubkeys.extend(user['keys']) - aggregate.run_instances(instance_name, rspec_string, key_name, pubkeys) + 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) return aggregate.get_rspec(slice_xrn=slice_urn, version=rspec.version) def delete_sliver (self, slice_urn, slice_hrn, creds, options): 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) + return aggregate.delete_instances(project_name, tenant_name) 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() aggregate = OSAggregate(self) return aggregate.update_instances(name) @@ -438,9 +475,10 @@ class NovaDriver(Driver): return 1 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 aggregate = OSAggregate(self) - return aggregate.stop_instances(name) + 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")