X-Git-Url: http://git.onelab.eu/?p=pcucontrol.git;a=blobdiff_plain;f=pcucontrol%2Fmodels%2FDRAC.py;h=672d92fcf4d7ffa238b5a21f64627023d7f05e8e;hp=11d23f6e746d7bca70f70c01f4361fcc042f59f3;hb=4c1af5526615cf1958b801176c802283d7d4d308;hpb=f6416e374b2387aaa6a0966059aa7ec283bf1f28

diff --git a/pcucontrol/models/DRAC.py b/pcucontrol/models/DRAC.py
index 11d23f6..672d92f 100644
--- a/pcucontrol/models/DRAC.py
+++ b/pcucontrol/models/DRAC.py
@@ -1,161 +1,28 @@
 from pcucontrol.reboot import *
 import time
 
-class DRAC(PCUControl):
-	supported_ports = [22,443,5869]
-	def run_drac(self, node_port, dryrun):
-		print "trying racadm_reboot..."
-		return racadm_reboot(self.host, self.username, self.password, node_port, dryrun)
-
-	def run_ssh(self, node_port, dryrun):
-		ssh_options="-o StrictHostKeyChecking=no "+\
-		            "-o PasswordAuthentication=yes "+\
-					"-o PubkeyAuthentication=no"
-		s = pxssh.pxssh()
-		try:
-			if not s.login(self.host, self.username, self.password, ssh_options,
-						original_prompts="Dell", login_timeout=Transport.TELNET_TIMEOUT):
-				raise ExceptionPassword("Invalid Password")
-		except pexpect.EOF:
-			raise ExceptionPrompt("Disconnect before login prompt")
-			
-		print "logging in... %s" % self.host
-		s.send("\r\n\r\n")
-		try:
-			# Testing Reboot ?
-			#index = s.expect(["DRAC 5", "[%s]#" % self.username ])
-			# NOTE: be careful to escape any characters used by 're.compile'
-			index = s.expect(["\$", "\[%s\]#" % self.username, "/.*>" ])
-			print "INDEX:", index
-			print s
-			if dryrun:
-				if index == 0:
-					s.sendline("racadm getsysinfo")
-				elif index == 1:
-					s.sendline("getsysinfo")
-				elif index == 2:
-					s.sendline("racadm getsysinfo")
-			else:
-				print "serveraction powercycle"
-				if index == 0:
-					s.sendline("racadm serveraction powercycle")
-				elif index == 1:
-					s.sendline("serveraction powercycle")
-				elif index == 2:
-					s.sendline("racadm serveraction powercycle")
-				
-			# TODO:  this is really lousy.  Without the sleep, the sendlines
-			# don't completely get through.  Even the added, expect line
-			# returns right away without waiting for the commands above to
-			# complete...  Therefore, this delay is guaranteed to fail in some
-			# other context...
-			s.send("\r\n\r\n")
-			time.sleep(20)
-			index = s.expect(["\$", "\[%s\]#" % self.username, "/.*>" ])
-			print s
-			print "INDEX 2:", index
-			s.sendline("exit")
-
-		except pexpect.EOF:
-			raise ExceptionPrompt("EOF before expected Prompt")
-		except pexpect.TIMEOUT:
-			print s
-			raise ExceptionPrompt("Timeout before expected Prompt")
-
-		s.close()
-
-		return 0
-
-### rebooting Dell systems via RAC card
-# Marc E. Fiuczynski - June 01 2005
-# tested with David Lowenthal's itchy/scratchy nodes at UGA
-#
-def runcmd(command, args, username, password, timeout = None):
-
-	result = [None]
-	result_ready = threading.Condition()
-
-	def set_result(x):
-
-		result_ready.acquire()
-		try:
-			result[0] = x
-		finally:
-			result_ready.notify()
-			result_ready.release()
-
-	def do_command(command, username, password):
-
-		try:
-			# Popen4 is a popen-type class that combines stdout and stderr
-			p = popen2.Popen4(command)
-
-			# read all output data
-			data = p.fromchild.read()
-
-			while True:
-				# might get interrupted by a signal in poll() or waitpid()
-				try:
-					retval = p.wait()
-					set_result((retval, data))
-					break
-				except OSError, ex:
-					if ex.errno == errno.EINTR:
-						continue
-					raise ex
-		except Exception, ex:
-			set_result(ex)
-
-	if args:
-		command = " ".join([command] + args)
-
-	worker = threading.Thread(target = do_command, args = (command, username, password, ))
-	worker.setDaemon(True)
-	result_ready.acquire()
-	worker.start()
-	result_ready.wait(timeout)
-	try:
-		if result == [None]:
-			raise Exception, "command timed-out: '%s'" % command
-	finally:
-		result_ready.release()
-	result = result[0]
-
-	if isinstance(result, Exception):
-		raise result
-	else:
-		(retval, data) = result
-		if os.WIFEXITED(retval) and os.WEXITSTATUS(retval) == 0:
-			return data
-		else:
-			out = "system command ('%s') " % command
-			if os.WIFEXITED(retval):
-				out += "failed, rc = %d" % os.WEXITSTATUS(retval)
-			else:
-				out += "killed by signal %d" % os.WTERMSIG(retval)
-			if data:
-				out += "; output follows:\n" + data
-			raise Exception, out
-
-def racadm_reboot(host, username, password, port, dryrun):
-	global verbose
-
-	ip = socket.gethostbyname(host)
-	try:
-		cmd = "/usr/sbin/racadm"
-		os.stat(cmd)
-		if not dryrun:
-			output = runcmd(cmd, ["-r %s -u %s -p '%s' serveraction powercycle" % (ip, username, password)],
-				username, password)
-		else:
-			output = runcmd(cmd, ["-r %s -u %s -p '%s' getsysinfo" % (ip, username, password)],
-				username, password)
-
-		print "RUNCMD: %s" % output
-		if verbose:
-			print output
-		return 0
-
-	except Exception, err:
-		print "runcmd raised exception %s" % err
-		return str(err)
+class DRAC(BasicPCUControl):
+    supported_ports = [22,443,5869]
+    def run_drac(self, node_port, dryrun):
+        return self.run_expect_script("DRAC.exp racadm5", dryrun=dryrun, model="None")
+
+    def run_ssh(self, node_port, dryrun):
+        return self.run_expect_script("DRAC.exp ssh", dryrun=dryrun, model="None")
+
+    def pcu_run(self, node_port):
+        r = self.run_ssh(node_port, dryrun=False)
+        if "No error" in r:
+            return r
+        r2 = self.run_drac(node_port, dryrun=False)
+        if "No error" in r2:
+            return r2
+        return r + " :: " +r2
+
+    def pcu_test(self, node_port):
+        r = self.run_ssh(node_port, dryrun=True)
+        if "No error" in r:
+            return r
+        r2 = self.run_drac(node_port, dryrun=True)
+        if "No error" in r2:
+            return r2
+        return r + " :: " +r2