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
Add two new fields to Nodes & DB to track last run-time and last down-time
[plcapi.git]
/
PLC
/
Methods
/
DeleteSliceFromNodesWhitelist.py
diff --git
a/PLC/Methods/DeleteSliceFromNodesWhitelist.py
b/PLC/Methods/DeleteSliceFromNodesWhitelist.py
index
2d95851
..
ca6ccd8
100644
(file)
--- a/
PLC/Methods/DeleteSliceFromNodesWhitelist.py
+++ b/
PLC/Methods/DeleteSliceFromNodesWhitelist.py
@@
-24,7
+24,7
@@
class DeleteSliceFromNodesWhitelist(Method):
Auth(),
Mixed(Slice.fields['slice_id'],
Slice.fields['name']),
Auth(),
Mixed(Slice.fields['slice_id'],
Slice.fields['name']),
- [Mixed(Node.fields['node_id'],
+
[Mixed(Node.fields['node_id'],
Node.fields['hostname'])]
]
Node.fields['hostname'])]
]
@@
-40,17
+40,17
@@
class DeleteSliceFromNodesWhitelist(Method):
if slice['peer_id'] is not None:
raise PLCInvalidArgument, "Not a local slice"
if slice['peer_id'] is not None:
raise PLCInvalidArgument, "Not a local slice"
- # Get specified nodes, add them to the slice
+ # Get specified nodes, add them to the slice
nodes = Nodes(self.api, node_id_or_hostname_list)
nodes = Nodes(self.api, node_id_or_hostname_list)
- for node in nodes:
+
for node in nodes:
if node['peer_id'] is not None:
raise PLCInvalidArgument, "%s not a local node" % node['hostname']
if node['peer_id'] is not None:
raise PLCInvalidArgument, "%s not a local node" % node['hostname']
- if slice['slice_id'] in node['slice_ids_whitelist']:
+
if slice['slice_id'] in node['slice_ids_whitelist']:
slice.delete_from_node_whitelist(node, commit = False)
slice.sync()
slice.delete_from_node_whitelist(node, commit = False)
slice.sync()
- self.event_objects = {'Node': [node['node_id'] for node in nodes],
- 'Slice': [slice['slice_id']]}
+
self.event_objects = {'Node': [node['node_id'] for node in nodes],
+
'Slice': [slice['slice_id']]}
return 1
return 1