get rid of svn keywords once and for good

[plcapi.git] / PLC / Methods / AddNodeToPCU.py

diff --git a/PLC/Methods/AddNodeToPCU.py b/PLC/Methods/AddNodeToPCU.py
index 4314a67..72ed8a5 100644 (file)
--- a/PLC/Methods/AddNodeToPCU.py
+++ b/PLC/Methods/AddNodeToPCU.py
@@ -3,6 +3,7 @@ from PLC.Method import Method
 from PLC.Parameter import Parameter, Mixed
 from PLC.Nodes import Node, Nodes
 from PLC.PCUs import PCU, PCUs
 from PLC.Parameter import Parameter, Mixed
 from PLC.Nodes import Node, Nodes
 from PLC.PCUs import PCU, PCUs

+from PLC.Sites import Site, Sites

 from PLC.Auth import Auth
 
 class AddNodeToPCU(Method):
 from PLC.Auth import Auth
 
 class AddNodeToPCU(Method):


@@ -19,7 +20,7 @@ class AddNodeToPCU(Method):
 
     accepts = [
         Auth(),
 
     accepts = [
         Auth(),

-       Mixed(Node.fields['node_id'],
+        Mixed(Node.fields['node_id'],

               Node.fields['hostname']),
         PCU.fields['pcu_id'],
         Parameter(int, 'PCU port number')
               Node.fields['hostname']),
         PCU.fields['pcu_id'],
         Parameter(int, 'PCU port number')


@@ -28,18 +29,19 @@ class AddNodeToPCU(Method):
     returns = Parameter(int, '1 if successful')
 
     def call(self, auth, node_id_or_hostname, pcu_id, port):
     returns = Parameter(int, '1 if successful')
 
     def call(self, auth, node_id_or_hostname, pcu_id, port):

-        # Get node
+         # Get node

         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']:


@@ -51,8 +53,8 @@ class AddNodeToPCU(Method):
                     break
             if not ok:
                 raise PLCPermissionDenied, "Not allowed to update that PCU"
                     break
             if not ok:
                 raise PLCPermissionDenied, "Not allowed to update that PCU"

-       
-       # Add node to PCU
+
+        # Add node to PCU

         if node['node_id'] in pcu['node_ids']:
             raise PLCInvalidArgument, "Node already controlled by PCU"
 
         if node['node_id'] in pcu['node_ids']:
             raise PLCInvalidArgument, "Node already controlled by PCU"
 


@@ -64,6 +66,9 @@ class AddNodeToPCU(Method):
 
         pcu.add_node(node, port)
 
 
         pcu.add_node(node, port)
 

-       self.object_ids = [node['node_id'], pcu['pcu_id']]
-
+        # Logging variables
+        self.event_objects = {'Node': [node['node_id']],
+                              'PCU': [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