git://git.onelab.eu
/
plcapi.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
merge changes from HEAD
[plcapi.git]
/
PLC
/
Methods
/
AddSliceToNodes.py
diff --git
a/PLC/Methods/AddSliceToNodes.py
b/PLC/Methods/AddSliceToNodes.py
index
e5a60f9
..
3cfd327
100644
(file)
--- a/
PLC/Methods/AddSliceToNodes.py
+++ b/
PLC/Methods/AddSliceToNodes.py
@@
-49,6
+49,11
@@
class AddSliceToNodes(Method):
# Get specified nodes, add them to the slice
nodes = Nodes(self.api, node_id_or_hostname_list)
for node in nodes:
# Get specified nodes, add them to the slice
nodes = Nodes(self.api, node_id_or_hostname_list)
for node in nodes:
+ # check the slice whitelist on each node first
+ if node['slice_ids_whitelist'] and \
+ slice['slice_id'] not in node['slice_ids_whitelist']:
+ raise PLCInvalidArgument, "%s is not on %s's whitelist" % \
+ (slice['name'], node['hostname'])
if slice['slice_id'] not in node['slice_ids']:
slice.add_node(node, commit = False)
if slice['slice_id'] not in node['slice_ids']:
slice.add_node(node, commit = False)