Blame SOURCES/bz1654616-fence_hpblade-fix-log_expect_syntax.patch

658b6c
From 342570c5a5af4c277be283507ef7898a078e2df9 Mon Sep 17 00:00:00 2001
658b6c
From: mmartinv <32071463+mmartinv@users.noreply.github.com>
658b6c
Date: Fri, 16 Nov 2018 12:55:58 +0100
658b6c
Subject: [PATCH] Fix 'log_expect' in fence_hpblade.py
658b6c
658b6c
Update the 'log_expect' call to the new method definition.
658b6c
---
658b6c
 agents/hpblade/fence_hpblade.py | 8 ++++----
658b6c
 1 file changed, 4 insertions(+), 4 deletions(-)
658b6c
658b6c
diff --git a/agents/hpblade/fence_hpblade.py b/agents/hpblade/fence_hpblade.py
658b6c
index b2cc94a3..fbc89f61 100644
658b6c
--- a/agents/hpblade/fence_hpblade.py
658b6c
+++ b/agents/hpblade/fence_hpblade.py
658b6c
@@ -16,7 +16,7 @@
658b6c
 
658b6c
 def get_enclosure_type(conn, options):
658b6c
 	conn.send_eol("show enclosure info")
658b6c
-	conn.log_expect(options, options["--command-prompt"], int(options["--shell-timeout"]))
658b6c
+	conn.log_expect(options["--command-prompt"], int(options["--shell-timeout"]))
658b6c
 
658b6c
 	type_re=re.compile(r"^\s*Enclosure Type: (\w+)(.*?)\s*$")
658b6c
 	enclosure="unknown"
658b6c
@@ -39,7 +39,7 @@ def get_power_status(conn, options):
658b6c
 		powrestr = "^\\s*Power: (.*?)\\s*$"
658b6c
 
658b6c
 	conn.send_eol(cmd_send)
658b6c
-	conn.log_expect(options, options["--command-prompt"], int(options["--shell-timeout"]))
658b6c
+	conn.log_expect(options["--command-prompt"], int(options["--shell-timeout"]))
658b6c
 
658b6c
 	power_re = re.compile(powrestr)
658b6c
 	status = "unknown"
658b6c
@@ -72,7 +72,7 @@ def set_power_status(conn, options):
658b6c
 		conn.send_eol("poweron " + dev + options["--plug"])
658b6c
 	elif options["--action"] == "off":
658b6c
 		conn.send_eol("poweroff " + dev + options["--plug"] + " force")
658b6c
-	conn.log_expect(options, options["--command-prompt"], int(options["--shell-timeout"]))
658b6c
+	conn.log_expect(options["--command-prompt"], int(options["--shell-timeout"]))
658b6c
 
658b6c
 def get_instances_list(conn, options):
658b6c
 	outlets = {}
658b6c
@@ -84,7 +84,7 @@ def get_instances_list(conn, options):
658b6c
 		listrestr = "^\\s*(\\d+)\\s+(.*?)\\s+(.*?)\\s+OK\\s+(.*?)\\s+(.*?)\\s*$"
658b6c
 
658b6c
 	conn.send_eol(cmd_send)
658b6c
-	conn.log_expect(options, options["--command-prompt"], int(options["--shell-timeout"]))
658b6c
+	conn.log_expect(options["--command-prompt"], int(options["--shell-timeout"]))
658b6c
 
658b6c
 	list_re = re.compile(listrestr)
658b6c
 	for line in conn.before.splitlines():