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
refactored
[sfa.git]
/
sfa
/
openstack
/
nova_driver.py
diff --git
a/sfa/openstack/nova_driver.py
b/sfa/openstack/nova_driver.py
index
5b6779e
..
d110194
100644
(file)
--- a/
sfa/openstack/nova_driver.py
+++ b/
sfa/openstack/nova_driver.py
@@
-329,13
+329,14
@@
class NovaDriver(Driver):
return instance_urns
# first 2 args are None in case of resource discovery
return instance_urns
# first 2 args are None in case of resource discovery
- def list_resources (self, creds, options):
+ def list_resources (self, creds,
version,
options):
aggregate = OSAggregate(self)
aggregate = OSAggregate(self)
- rspec = aggregate.get_rspec(version=
rspec_
version, options=options)
+ rspec = aggregate.get_rspec(version=version, options=options)
return rspec
return rspec
- def describe(self, creds, urns, options):
- return {}
+ def describe(self, creds, urns, version, options):
+ aggregate = OSAggregate(self)
+ return aggregate.describe(urns, version=version, options=options)
def sliver_status (self, slice_urn, slice_hrn):
# update nova connection
def sliver_status (self, slice_urn, slice_hrn):
# update nova connection