git://git.onelab.eu / sfa.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 80165b5)
replace Xrn.get_sliver_id()
authorTony Mack <tmack@paris.CS.Princeton.EDU>
Thu, 30 Aug 2012 16:51:41 +0000 (12:51 -0400)
committerTony Mack <tmack@paris.CS.Princeton.EDU>
Thu, 30 Aug 2012 16:56:33 +0000 (12:56 -0400)
sfa/openstack/nova_driver.py patch | blob | history
sfa/openstack/osaggregate.py patch | blob | history

diff --git a/sfa/openstack/nova_driver.py b/sfa/openstack/nova_driver.py
index 9c60bd5..fe405b3 100644 (file)
--- 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 
             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'
 
             if instance.status.lower() == 'active':
                 res['boot_state'] = 'ready'
diff --git a/sfa/openstack/osaggregate.py b/sfa/openstack/osaggregate.py
index c35a7f5..35dcf50 100644 (file)
--- 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
 
 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),
                      'type': instance.name,
                      'cpus': str(instance.vcpus),
                      'memory': str(instance.ram),
sfa