X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=sfa%2Fopenstack%2Fosaggregate.py;h=6296d2956cddc56a090b5ef8319d902fead52cec;hb=5bb447272ba0be172a4614a0756ae1cd5a0b35de;hp=9ec1d23dc6d32ed274d3f11dd8b348a6329b41e6;hpb=39b367aca5fd04f095e4b98fa70971767de6a78c;p=sfa.git 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):