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:
3a6e8d0
)
fix bug in create_slice_aggregate(), compare list of nodes in rspec against list...
author
Tony Mack
<tmack@cs.princeton.edu>
Wed, 17 Jun 2009 17:40:23 +0000
(17:40 +0000)
committer
Tony Mack
<tmack@cs.princeton.edu>
Wed, 17 Jun 2009 17:40:23 +0000
(17:40 +0000)
geni/util/slices.py
patch
|
blob
|
history
diff --git
a/geni/util/slices.py
b/geni/util/slices.py
index
595bc28
..
55bac54
100644
(file)
--- a/
geni/util/slices.py
+++ b/
geni/util/slices.py
@@
-162,7
+162,10
@@
class Slices(SimpleStorage):
if key in slice and slice[key]:
slice_fields[key] = slice[key]
self.api.plshell.AddSlice(self.api.plauth, slice_fields)
if key in slice and slice[key]:
slice_fields[key] = slice[key]
self.api.plshell.AddSlice(self.api.plauth, slice_fields)
-
+ slice = slice_fields
+ slice['node_ids'] = 0
+ else:
+ slice = slices[0]
# get the list of valid slice users from the registry and make
# they are added to the slice
researchers = slice.get('researcher', [])
# get the list of valid slice users from the registry and make
# they are added to the slice
researchers = slice.get('researcher', [])
@@
-200,6
+203,8
@@
class Slices(SimpleStorage):
nodelist = self.api.plshell.GetNodes(self.api.plauth, slice['node_ids'], ['hostname'])
hostnames = [node['hostname'] for node in nodelist]
nodelist = self.api.plshell.GetNodes(self.api.plauth, slice['node_ids'], ['hostname'])
hostnames = [node['hostname'] for node in nodelist]
+ print "XX node_ids", slice['node_ids']
+ print "XX hostnames", hostnames
# get netspec details
nodespecs = spec.getDictsByTagName('NodeSpec')
nodes = []
# get netspec details
nodespecs = spec.getDictsByTagName('NodeSpec')
nodes = []