X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=sfa%2Fopenstack%2Fnova_driver.py;h=50112cd9222c0e3ee72ecb389312f93fcfae91f5;hb=13bf2db422ca6dc5a7051a7d724c04d68394882d;hp=98a672398be47955c2fe24ff69a3d3c5c92c46de;hpb=7641bb651b49848ffa067ad70ac8a0cb252678db;p=sfa.git diff --git a/sfa/openstack/nova_driver.py b/sfa/openstack/nova_driver.py index 98a67239..50112cd9 100644 --- a/sfa/openstack/nova_driver.py +++ b/sfa/openstack/nova_driver.py @@ -8,7 +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.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 @@ -43,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: @@ -90,7 +90,9 @@ class NovaDriver(Driver): 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: @@ -118,7 +120,8 @@ class NovaDriver(Driver): self.shell.auth_manager.roles.add_user_role(user, slice_tenant, 'user') keys = sfa_records.get('keys', []) for key in keys: - self.shell.nova_client.keypairs.create(name, key) + 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): @@ -338,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): @@ -382,38 +388,47 @@ 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") result = {} - top_level_status = 'unknown' - if instances: - top_level_status = 'ready' + 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_urn'] = sliver_id - - if instance.vm_state == 'running': - res['boot_state'] = 'ready'; + 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 + res['geni_urn'] = Xrn(slice_urn, type='slice', id=instance.id).get_urn() + + if instance.status.lower() == 'active': + res['boot_state'] = 'ready' + res['geni_status'] = 'ready' + elif instance.status.lower() == 'error': + res['boot_state'] = 'failed' + res['geni_status'] = 'failed' + top_level_status = 'failed' else: - res['boot_state'] = 'unknown' + res['boot_state'] = 'notready' + res['geni_status'] = 'notready' + top_level_status = 'notready' resources.append(res) result['geni_status'] = top_level_status @@ -423,9 +438,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. @@ -438,17 +451,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) @@ -459,9 +477,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")