From a45adfb005362ebfe0231eb599d1cc95b088c9a2 Mon Sep 17 00:00:00 2001 From: Tony Mack Date: Thu, 30 Aug 2012 12:51:41 -0400 Subject: [PATCH] replace Xrn.get_sliver_id() --- sfa/openstack/nova_driver.py | 3 +-- sfa/openstack/osaggregate.py | 7 +------ 2 files changed, 2 insertions(+), 8 deletions(-) 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 19bd2b5b..a0b294f8 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), -- 2.47.0