public inbox for cluster-cvs@sourceware.org
help / color / mirror / Atom feed
* cluster: RHEL4 - fence_apc: #491643 - APC Fence Agent does not work with non-admin account
@ 2009-03-23 13:53 Marek Grác
0 siblings, 0 replies; only message in thread
From: Marek Grác @ 2009-03-23 13:53 UTC (permalink / raw)
To: cluster-cvs-relay
Gitweb: http://git.fedorahosted.org/git/cluster.git?p=cluster.git;a=commitdiff;h=a29c355fd013ed1cd34e668e8a12a60ae4f89cfd
Commit: a29c355fd013ed1cd34e668e8a12a60ae4f89cfd
Parent: 25a2cca1019ace495d8c0abb76ca0738e1b7097a
Author: Marek 'marx' Grac <mgrac@redhat.com>
AuthorDate: Mon Mar 23 14:51:05 2009 +0100
Committer: Marek 'marx' Grac <mgrac@redhat.com>
CommitterDate: Mon Mar 23 14:52:25 2009 +0100
fence_apc: #491643 - APC Fence Agent does not work with non-admin account
APC Fence agent does not work with non-admin account with firmware v3.5.x
---
fence/agents/apc/fence_apc.py | 17 +++++++++++------
1 files changed, 11 insertions(+), 6 deletions(-)
diff --git a/fence/agents/apc/fence_apc.py b/fence/agents/apc/fence_apc.py
index e069a97..6d91996 100755
--- a/fence/agents/apc/fence_apc.py
+++ b/fence/agents/apc/fence_apc.py
@@ -97,7 +97,8 @@ def set_power_status(conn, options):
conn.log_expect(options, options["-c"], SHELL_TIMEOUT)
version = 0
- admin = 0
+ admin2 = 0
+ admin3 = 0
switch = 0
if (None != re.compile('.* MasterSwitch plus.*', re.IGNORECASE | re.S).match(conn.before)):
@@ -120,19 +121,23 @@ def set_power_status(conn, options):
version = 3
if (None == re.compile('.*Outlet Control/Configuration.*', re.IGNORECASE | re.S).match(conn.before)):
- admin = 0
+ admin2 = 0
else:
- admin = 1
+ admin2 = 1
if switch == 0:
if version == 2:
- if admin == 0:
+ if admin2 == 0:
conn.send("2\r\n")
else:
conn.send("3\r\n")
else:
conn.send("2\r\n")
conn.log_expect(options, options["-c"], SHELL_TIMEOUT)
+ if (None == re.compile('.*2- Outlet Restriction.*', re.IGNORECASE | re.S).match(conn.before)):
+ admin3 = 0
+ else:
+ admin3 = 1
conn.send("1\r\n")
else:
conn.send(options["-s"] + "\r\n")
@@ -143,10 +148,10 @@ def set_power_status(conn, options):
conn.log_expect(options, options["-c"], SHELL_TIMEOUT)
if switch == 0:
- if admin == 1:
+ if admin2 == 1:
conn.send("1\r\n")
conn.log_expect(options, options["-c"], SHELL_TIMEOUT)
- if version == 3:
+ if admin3 == 1:
conn.send("1\r\n")
conn.log_expect(options, options["-c"], SHELL_TIMEOUT)
else:
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2009-03-23 13:53 UTC | newest]
Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2009-03-23 13:53 cluster: RHEL4 - fence_apc: #491643 - APC Fence Agent does not work with non-admin account Marek Grác
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).