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
PerformOperationalAction can only be called on fully allocated slivers
[sfa.git]
/
sfa
/
openstack
/
osaggregate.py
diff --git
a/sfa/openstack/osaggregate.py
b/sfa/openstack/osaggregate.py
index
4506fe9
..
8a48fe2
100644
(file)
--- a/
sfa/openstack/osaggregate.py
+++ b/
sfa/openstack/osaggregate.py
@@
-201,9
+201,10
@@
class OSAggregate:
def instance_to_sliver(self, instance, xrn=None):
if xrn:
def instance_to_sliver(self, instance, xrn=None):
if xrn:
- xrn = Xrn(xrn=slice_xrn, type='slice', id=instance.id).get_urn()
+ sliver_hrn = '%s.%s' % (self.driver.hrn, instance.id)
+ sliver_id = Xrn(sliver_hrn, type='sliver').urn
- sliver = Sliver({'sliver_id':
xrn.get_urn()
,
+ sliver = Sliver({'sliver_id':
sliver_id
,
'name': instance.name,
'type': instance.name,
'cpus': str(instance.vcpus),
'name': instance.name,
'type': instance.name,
'cpus': str(instance.vcpus),
@@
-212,7
+213,7
@@
class OSAggregate:
return sliver
def instance_to_geni_sliver(self, instance, sliver_allocations = {}):
return sliver
def instance_to_geni_sliver(self, instance, sliver_allocations = {}):
- sliver_hrn = '%s.%s' % (
root_
hrn, instance.id)
+ sliver_hrn = '%s.%s' % (
self.driver.
hrn, instance.id)
sliver_id = Xrn(sliver_hrn, type='sliver').urn
# set sliver allocation and operational status
sliver_id = Xrn(sliver_hrn, type='sliver').urn
# set sliver allocation and operational status