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

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