X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=sfa%2Fopenstack%2Fnova_driver.py;h=d42c7143873dd768470f986aeb9e1ba9fa98dd17;hb=1db1a879ffde8991aa95dd80142d555551655e88;hp=3512d8a05d05929cf44c4b795e5f16c33b4ad8a2;hpb=3b8983f4cfece9b68e4127ca68da288a8c009886;p=sfa.git diff --git a/sfa/openstack/nova_driver.py b/sfa/openstack/nova_driver.py index 3512d8a0..d42c7143 100644 --- a/sfa/openstack/nova_driver.py +++ b/sfa/openstack/nova_driver.py @@ -1,14 +1,17 @@ import time import datetime -# + from sfa.util.faults import MissingSfaInfo, UnknownSfaType, \ - RecordNotFound, SfaNotImplemented, SliverDoesNotExist + RecordNotFound, SfaNotImplemented, SliverDoesNotExist, \ + SfaInvalidArgument 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.util.plxrn import PlXrn, hrn_to_pl_slicename 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 @@ -20,7 +23,7 @@ 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.planetlab.plslices import PlSlices from sfa.util.osxrn import OSXrn @@ -66,33 +69,74 @@ class NovaDriver (Driver): ########## def register (self, sfa_record, hrn, pub_key): type = sfa_record['type'] - pl_record = self.sfa_fields_to_pl_fields(type, hrn, sfa_record) - + + #pl_record = self.sfa_fields_to_pl_fields(type dd , hrn, sfa_record) + if type == 'slice': - acceptable_fields=['url', 'instantiation', 'name', 'description'] # add slice description, name, researchers, PI - pass + name = hrn_to_pl_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 - pass - return pointer + 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 ########## # xxx actually old_sfa_record comes filled with plc stuff as well in the original code def update (self, old_sfa_record, new_sfa_record, hrn, new_key): - pointer = old_sfa_record['pointer'] - type = old_sfa_record['type'] - + type = new_sfa_record['type'] + # new_key implemented for users only if new_key and type not in [ 'user' ]: raise UnknownSfaType(type) elif type == "slice": - # can update description, researchers and PI - pass + # can update project manager and description + name = hrn_to_pl_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() + self.shell.auth_manager.modify_project(name, project_manager, description) + elif type == "user": - # can update slices, keys and roles + # can techinally update access_key and secret_key, + # but that is not in our scope, so we do nothing. pass return True @@ -100,11 +144,12 @@ class NovaDriver (Driver): ########## def remove (self, sfa_record): type=sfa_record['type'] - name = Xrn(sfa_record['hrn']).get_leaf() if type == 'user': + name = Xrn(sfa_record['hrn']).get_leaf() if self.shell.auth_manager.get_user(name): self.shell.auth_manager.delete_user(name) elif type == 'slice': + name = hrn_to_pl_slicename(sfa_record['hrn']) if self.shell.auth_manager.get_project(name): self.shell.auth_manager.delete_project(name) return True @@ -120,9 +165,9 @@ class NovaDriver (Driver): records = [records] for record in records: - name = Xrn(record['hrn']).get_leaf() os_record = None if record['type'] == 'user': + name = Xrn(record['hrn']).get_leaf() 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 \ @@ -130,7 +175,8 @@ class NovaDriver (Driver): 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': + elif record['type'] == 'slice': + name = hrn_to_pl_slicename(record['hrn']) os_record = self.shell.auth_manager.get_project(name) record['description'] = os_record.description record['PI'] = [self.hrn + "." + os_record.project_manager.name] @@ -246,7 +292,7 @@ class NovaDriver (Driver): def sliver_status (self, slice_urn, slice_hrn): # find out where this slice is currently running - project_name = Xrn(slice_urn).get_leaf() + project_name = hrn_to_pl_slicename(slice_hrn) project = self.shell.auth_manager.get_project(project_name) instances = self.shell.db.instance_get_all_by_project(project_name) if len(instances) == 0: @@ -285,32 +331,43 @@ class NovaDriver (Driver): def create_sliver (self, slice_urn, slice_hrn, creds, rspec_string, users, options): + project_name = hrn_to_pl_slicename(slice_hrn) aggregate = OSAggregate(self) - slicename = get_leaf(slice_hrn) - # parse rspec rspec = RSpec(rspec_string) - requested_attributes = rspec.version.get_slice_attributes() + + # ensure project and users exist in local db + aggregate.create_project(project_name, users, options=options) + + # collect publick keys pubkeys = [] + project_key = None 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 - aggregate.create_project(slicename, users, options=options) + pubkeys.extend(user['keys']) + # 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. + if not project_key: + username = Xrn(user['urn']).get_leaf() + user_keys = self.shell.db.key_pair_get_all_by_user(username) + if user_keys: + project_key = user_keys[0].name + # ensure person records exists - aggregate.run_instances(slicename, rspec, project_key, pubkeys) + self.euca_shell.init_context(project_name) + aggregate.run_instances(project_name, rspec_string, project_key, pubkeys) return aggregate.get_rspec(slice_xrn=slice_urn, version=rspec.version) def delete_sliver (self, slice_urn, slice_hrn, creds, options): - name = OSXrn(xrn=slice_urn).name + # we need to do this using the context of one of the slice users + project_name = hrn_to_pl_slicename(slice_hrn) + self.euca_shell.init_context(project_name) aggregate = OSAggregate(self) - return aggregate.delete_instances(name) + return aggregate.delete_instances(project_name) def update_sliver(self, slice_urn, slice_hrn, rspec, creds, options): - name = OSXrn(xrn=slice_urn).name + name = hrn_to_pl_slicename(slice_hrn) aggregate = OSAggregate(self) return aggregate.update_instances(name)