X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;ds=sidebyside;f=monitor%2Fpcu%2Freboot.py;fp=reboot.py;h=0fb053494b55eed936fff06db759352dc7c7df53;hb=19414270cf2c8429daab02fdebbd8081d9ba0db0;hp=f3f7f32067fd0f69a257681fdcb39f19415fb7c9;hpb=e811d83a1664a222bed13266703d2aa4f1a1900d;p=monitor.git

diff --git a/reboot.py b/monitor/pcu/reboot.py
similarity index 99%
rename from reboot.py
rename to monitor/pcu/reboot.py
index f3f7f32..0fb0534 100755
--- a/reboot.py
+++ b/monitor/pcu/reboot.py
@@ -11,13 +11,13 @@ import urllib2
 import urllib
 import threading, popen2
 import array, struct
-import plc
+from monitor.wrapper import plc
 import base64
 from subprocess import PIPE, Popen
 import ssh.pxssh as pxssh
 import ssh.pexpect as pexpect
 import socket
-import moncommands 
+from monitor.util import command
 
 # Use our versions of telnetlib and pyssh
 sys.path.insert(0, os.path.dirname(sys.argv[0]))
@@ -559,7 +559,7 @@ class APC(PCUControl):
 class IntelAMT(PCUControl):
 	def run(self, node_port, dryrun):
 
-		cmd = moncommands.CMD()
+		cmd = command.CMD()
 		#[cmd_str = "IntelAMTSDK/Samples/RemoteControl/remoteControl"
 		cmd_str = "cmdamt/remoteControl"
 
@@ -624,7 +624,7 @@ class HPiLO(PCUControl):
 class HPiLOHttps(PCUControl):
 	def run(self, node_port, dryrun):
 
-		locfg = moncommands.CMD()
+		locfg = command.CMD()
 		cmd = "cmdhttps/locfg.pl -s %s -f %s -u %s -p '%s' | grep 'MESSAGE' | grep -v 'No error'" % (
 					self.host, "iloxml/Get_Network.xml", 
 					self.username, self.password)
@@ -635,7 +635,7 @@ class HPiLOHttps(PCUControl):
 			return sout.strip()
 
 		if not dryrun:
-			locfg = moncommands.CMD()
+			locfg = command.CMD()
 			cmd = "cmdhttps/locfg.pl -s %s -f %s -u %s -p '%s' | grep 'MESSAGE' | grep -v 'No error'" % (
 						self.host, "iloxml/Reset_Server.xml", 
 						self.username, self.password)