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