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
- fix add_object() usage
[plcapi.git]
/
PLC
/
Methods
/
AddNodeToPCU.py
diff --git
a/PLC/Methods/AddNodeToPCU.py
b/PLC/Methods/AddNodeToPCU.py
index
4314a67
..
ff40541
100644
(file)
--- a/
PLC/Methods/AddNodeToPCU.py
+++ b/
PLC/Methods/AddNodeToPCU.py
@@
-32,14
+32,15
@@
class AddNodeToPCU(Method):
nodes = Nodes(self.api, [node_id_or_hostname])
if not nodes:
raise PLCInvalidArgument, "No such node"
nodes = Nodes(self.api, [node_id_or_hostname])
if not nodes:
raise PLCInvalidArgument, "No such node"
-
node = nodes[0]
node = nodes[0]
+ if node['peer_id'] is not None:
+ raise PLCInvalidArgument, "Not a local node"
+
# Get PCU
pcus = PCUs(self.api, [pcu_id])
if not pcus:
raise PLCInvalidArgument, "No such PCU"
# Get PCU
pcus = PCUs(self.api, [pcu_id])
if not pcus:
raise PLCInvalidArgument, "No such PCU"
-
pcu = pcus[0]
if 'admin' not in self.caller['roles']:
pcu = pcus[0]
if 'admin' not in self.caller['roles']:
@@
-64,6
+65,8
@@
class AddNodeToPCU(Method):
pcu.add_node(node, port)
pcu.add_node(node, port)
+ # Logging variables
self.object_ids = [node['node_id'], pcu['pcu_id']]
self.object_ids = [node['node_id'], pcu['pcu_id']]
-
+ self.message = 'Node %d added to pcu %d on port %d' % \
+ (node['node_id'], pcu['pcu_id'], port)
return 1
return 1