From: Tony Mack <tmack@paris.CS.Princeton.EDU>
Date: Wed, 1 Feb 2012 02:56:31 +0000 (-0500)
Subject: fix bugs
X-Git-Tag: merged-in-sfa-2.1-2~46
X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=5bb447272ba0be172a4614a0756ae1cd5a0b35de;p=sfa.git

fix bugs
---

diff --git a/sfa/openstack/osaggregate.py b/sfa/openstack/osaggregate.py
index 9ec1d23d..6296d295 100644
--- a/sfa/openstack/osaggregate.py
+++ b/sfa/openstack/osaggregate.py
@@ -15,8 +15,9 @@ class OSAggregate:
 
     def instance_to_sliver(self, instance, slice_xrn=None):
         sliver_id = None
+        name = None
         if slice_xrn:
-            xrn = OSXrn(slice_xrn, 'slice')
+            name = OSXrn(slice_xrn, 'slice').name
             sliver_id = xrn.sliver_id(instance.instance_id, "")
 
         # should include: 
@@ -29,8 +30,8 @@ class OSAggregate:
         elif hasattr(instance, 'display_name'):
             name = instance.display_name 
         sliver = Sliver({'slice_id': sliver_id,
-                         'name': xrn.name,
-                         'type': 'plos-' + instance.name,
+                         'name': name,
+                         'type': 'plos-' + instance['name'],
                          'tags': []})
         return sliver
 
@@ -60,7 +61,7 @@ class OSAggregate:
             sliver = self.instance_to_sliver(instance) 
             rspec_node['slivers'] = [sliver]
             rspec_nodes.append(rspec_node)
-        return slivers
+        return rspec_nodes
 
     def get_aggregate_nodes(self):