From: Tony Mack Date: Thu, 30 Aug 2012 16:51:41 +0000 (-0400) Subject: replace Xrn.get_sliver_id() X-Git-Tag: sfa-2.1-14~25^2~9 X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=c4ebba2362e27d686c7f6ef95372a4a433d57c6e;p=sfa.git replace Xrn.get_sliver_id() --- diff --git a/sfa/openstack/nova_driver.py b/sfa/openstack/nova_driver.py index 9c60bd56..fe405b32 100644 --- a/sfa/openstack/nova_driver.py +++ b/sfa/openstack/nova_driver.py @@ -418,8 +418,7 @@ class NovaDriver(Driver): 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 + res['geni_urn'] = Xrn(slice_urn, type='slice', id=instance.id).get_urn() if instance.status.lower() == 'active': res['boot_state'] = 'ready' diff --git a/sfa/openstack/osaggregate.py b/sfa/openstack/osaggregate.py index c35a7f59..35dcf505 100644 --- a/sfa/openstack/osaggregate.py +++ b/sfa/openstack/osaggregate.py @@ -36,12 +36,7 @@ def pubkeys_to_user_data(pubkeys): def instance_to_sliver(instance, slice_xrn=None): sliver_id = None - if slice_xrn: - xrn = Xrn(slice_xrn, 'slice') - sliver_id = xrn.get_sliver_id(instance.project_id, instance.hostname, instance.id) - - sliver = Sliver({'slice_id': sliver_id, - 'name': instance.name, + sliver = Sliver({'name': instance.name, 'type': instance.name, 'cpus': str(instance.vcpus), 'memory': str(instance.ram),