blind 2to3

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

diff --git a/PLC/Methods/RebootNodeWithPCU.py b/PLC/Methods/RebootNodeWithPCU.py
index 46c8c84..ba9f308 100644 (file)
--- a/PLC/Methods/RebootNodeWithPCU.py
+++ b/PLC/Methods/RebootNodeWithPCU.py
@@ -3,28 +3,28 @@ import socket
 from PLC.Faults import *
 from PLC.Method import Method
 from PLC.Parameter import Parameter, Mixed
-from PLC.Nodes import Node, Nodes
-from PLC.NodeNetworks import NodeNetwork, NodeNetworks
 from PLC.Auth import Auth
-from PLC.POD import udp_pod
+
+from PLC.Nodes import Node, Nodes
+from PLC.PCUs import PCU, PCUs
 
 try:
-       from pcucontrol import reboot
-       external_dependency = True
+    from pcucontrol import reboot
+    external_dependency = True
 except:
-       external_dependency = False
+    external_dependency = False
 
 class RebootNodeWithPCU(Method):
     """
-       Uses the associated PCU to attempt to reboot the given Node.
+        Uses the associated PCU to attempt to reboot the given Node.
 
     Admins can reboot any node. Techs and PIs can only reboot nodes at
     their site.
 
     Returns 1 if the reboot proceeded without error (Note: this does not guarantee
-       that the reboot is successful).
-       Returns -1 if external dependencies for this call are not available.
-       Returns "error string" if the reboot failed with a specific message.
+        that the reboot is successful).
+        Returns -1 if external dependencies for this call are not available.
+        Returns "error string" if the reboot failed with a specific message.
     """
 
     roles = ['admin', 'pi', 'tech']
@@ -32,16 +32,20 @@ class RebootNodeWithPCU(Method):
     accepts = [
         Auth(),
         Mixed(Node.fields['node_id'],
-              Node.fields['hostname'])
+              Node.fields['hostname']),
+        Parameter(bool, "Run as a test, or as a real reboot", nullok = True)
         ]
 
     returns = Parameter(int, '1 if successful')
 
-    def call(self, auth, node_id_or_hostname):
-        # Get account information
+    def call(self, auth, node_id_or_hostname, testrun=None):
+    # Get account information
         nodes = Nodes(self.api, [node_id_or_hostname])
         if not nodes:
-            raise PLCInvalidArgument, "No such node"
+            raise PLCInvalidArgument("No such node")
+
+        if testrun is None:
+            testrun = False
 
         node = nodes[0]
 
@@ -52,24 +56,26 @@ class RebootNodeWithPCU(Method):
         # member of the site at which the node is located.
         if 'admin' not in self.caller['roles']:
             if node['site_id'] not in self.caller['site_ids']:
-                raise PLCPermissionDenied, "Not allowed to reboot nodes from specified site"
+                raise PLCPermissionDenied("Not allowed to reboot nodes from specified site")
 
-               # Verify that the node has pcus associated with it.
-               pcus = PCUs(self.api, {'pcu_id' : node['pcu_ids']} )
+        # Verify that the node has pcus associated with it.
+        pcus = PCUs(self.api, {'pcu_id' : node['pcu_ids']} )
         if not pcus:
-            raise PLCInvalidArgument, "No PCUs associated with Node"
+            raise PLCInvalidArgument("No PCUs associated with Node")
+
+        pcu = pcus[0]
 
-               pcu = pcus[0]
+        if not external_dependency:
+            raise PLCNotImplemented("Could not load external module to attempt reboot")
 
-               if not external_dependency:
-            raise PLCNotImplemented, "Could not load external module to attempt reboot"
+        # model, hostname, port,
+        # i = pcu['node_ids'].index(node['node_id'])
+        # p = pcu['ports'][i]
+        ret = reboot.reboot_api(node, pcu, testrun)
 
-               # model, hostname, port, 
-               # i = pcu['node_ids'].index(node['node_id'])
-               # p = pcu['ports'][i]
-               ret = reboot.reboot_api(node, pcu)
+        node.update_last_pcu_reboot(commit=True) # commits new timestamp to node 
 
         self.event_objects = {'Node': [node['node_id']]}
-        self.message = "RebootNodeWithPCU called"
-               
+        self.message = "RebootNodeWithPCU %s with %s returned %s" % (node['node_id'], pcu['pcu_id'], ret)
+
         return ret