git://git.onelab.eu
/
sfa.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
35edc4e
)
fix import. fix typo
author
Tony Mack
<tmack@paris.CS.Princeton.EDU>
Sat, 4 Feb 2012 02:25:18 +0000
(21:25 -0500)
committer
Tony Mack
<tmack@paris.CS.Princeton.EDU>
Sat, 4 Feb 2012 02:25:18 +0000
(21:25 -0500)
sfa/openstack/osaggregate.py
patch
|
blob
|
history
diff --git
a/sfa/openstack/osaggregate.py
b/sfa/openstack/osaggregate.py
index
d251349
..
7e6a53d
100644
(file)
--- a/
sfa/openstack/osaggregate.py
+++ b/
sfa/openstack/osaggregate.py
@@
-20,7
+20,7
@@
class OSAggregate:
# * instance.image_ref
# * instance.kernel_id
# * instance.ramdisk_id
# * instance.image_ref
# * instance.kernel_id
# * instance.ramdisk_id
- import nova.db.sqlalchemy.models
.Instance
+ import nova.db.sqlalchemy.models
name=None
type=None
sliver_id = None
name=None
type=None
sliver_id = None
@@
-45,7
+45,7
@@
class OSAggregate:
'tags': []})
return sliver
'tags': []})
return sliver
- def get_rspec(self, slice_xrn=None, v
s
ersion=None, options={}):
+ def get_rspec(self, slice_xrn=None, version=None, options={}):
version_manager = VersionManager()
version = version_manager.get_version(version)
if not slice_xrn:
version_manager = VersionManager()
version = version_manager.get_version(version)
if not slice_xrn:
@@
-54,7
+54,7
@@
class OSAggregate:
else:
rspec_version = version_manager._get_version(version.type, version.version, 'manifest')
nodes = self.get_slice_nodes(slice_xrn)
else:
rspec_version = version_manager._get_version(version.type, version.version, 'manifest')
nodes = self.get_slice_nodes(slice_xrn)
-
+ rspec = RSpec(version=rspec_version, user_options=options)
rspec.version.add_nodes(nodes)
return rspec.toxml()
rspec.version.add_nodes(nodes)
return rspec.toxml()
@@
-91,12
+91,12
@@
class OSAggregate:
rspec_node['exclusive'] = 'false'
rspec_node['hardware_types'] = [HardwareType({'name': 'plos-pc'}),
HardwareType({'name': 'pc'})]
rspec_node['exclusive'] = 'false'
rspec_node['hardware_types'] = [HardwareType({'name': 'plos-pc'}),
HardwareType({'name': 'pc'})]
- instances = self.driver.shell.instance_type_get_all().values()
+ instances = self.driver.shell.
db.
instance_type_get_all().values()
slivers = [self.instance_to_sliver(inst) for inst in instances]
rspec_node['slivers'] = slivers
rspec_nodes.append(rspec_node)
slivers = [self.instance_to_sliver(inst) for inst in instances]
rspec_node['slivers'] = slivers
rspec_nodes.append(rspec_node)
- return rspec_node
+ return rspec_node
s
def verify_slice(self, slicename, users, options={}):
def verify_slice(self, slicename, users, options={}):