git://git.onelab.eu
/
sfa.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fix bugs
[sfa.git]
/
sfa
/
openstack
/
osaggregate.py
diff --git
a/sfa/openstack/osaggregate.py
b/sfa/openstack/osaggregate.py
index
9ec1d23
..
6296d29
100644
(file)
--- 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
def instance_to_sliver(self, instance, slice_xrn=None):
sliver_id = None
+ name = None
if slice_xrn:
if slice_xrn:
- xrn = OSXrn(slice_xrn, 'slice')
+ name = OSXrn(slice_xrn, 'slice').name
sliver_id = xrn.sliver_id(instance.instance_id, "")
# should include:
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,
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
'tags': []})
return sliver
@@
-60,7
+61,7
@@
class OSAggregate:
sliver = self.instance_to_sliver(instance)
rspec_node['slivers'] = [sliver]
rspec_nodes.append(rspec_node)
sliver = self.instance_to_sliver(instance)
rspec_node['slivers'] = [sliver]
rspec_nodes.append(rspec_node)
- return
sliver
s
+ return
rspec_node
s
def get_aggregate_nodes(self):
def get_aggregate_nodes(self):