Gitweb: http://git.fedorahosted.org/git/?p=fence-agents.git;a=commitdiff;h=e6fcc75af... Commit: e6fcc75af95f56c107786d60e310ce0e0442e940 Parent: d0c2a2ec6a553d6341e199592284f180a6824593 Author: Marek 'marx' Grac mgrac@redhat.com AuthorDate: Mon Oct 22 15:51:55 2012 +0200 Committer: Marek 'marx' Grac mgrac@redhat.com CommitterDate: Fri Jun 28 10:56:44 2013 +0200
fence_cisco_ucs: Incorrect timeout was used during login
Previously, login command was bound with shell_timeout instead of login_timeout.
Resolves: rhbz#978325 --- fence/agents/cisco_ucs/fence_cisco_ucs.py | 12 ++++++------ 1 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/fence/agents/cisco_ucs/fence_cisco_ucs.py b/fence/agents/cisco_ucs/fence_cisco_ucs.py index 0be06a0..d1d8501 100644 --- a/fence/agents/cisco_ucs/fence_cisco_ucs.py +++ b/fence/agents/cisco_ucs/fence_cisco_ucs.py @@ -18,7 +18,7 @@ re_get_desc = re.compile(" descr="(.*?)"", re.IGNORECASE)
def get_power_status(conn, options): try: - res = send_command(options, "<configResolveDn cookie="" + options["cookie"] + "" inHierarchical="false" dn="org-root" + options["-s"] + "/ls-" + options["-n"] + "/power"/>") + res = send_command(options, "<configResolveDn cookie="" + options["cookie"] + "" inHierarchical="false" dn="org-root" + options["-s"] + "/ls-" + options["-n"] + "/power"/>", int(options["-Y"])) except pycurl.error, e: sys.stderr.write(e[1] + "\n") fail(EC_TIMED_OUT) @@ -41,7 +41,7 @@ def set_power_status(conn, options): }[options["-o"]] try: - res = send_command(options, "<configConfMos cookie="" + options["cookie"] + "" inHierarchical="no"><inConfigs><pair key="org-root" + options["-s"] + "/ls-" + options["-n"] + "/power"><lsPower dn="org-root/ls-" + options["-n"] + "/power" state="" + action + "" status="modified" /></pair></inConfigs></configConfMos>") + res = send_command(options, "<configConfMos cookie="" + options["cookie"] + "" inHierarchical="no"><inConfigs><pair key="org-root" + options["-s"] + "/ls-" + options["-n"] + "/power"><lsPower dn="org-root/ls-" + options["-n"] + "/power" state="" + action + "" status="modified" /></pair></inConfigs></configConfMos>", int(options["-Y"])) except pycurl.error, e: sys.stderr.write(e[1] + "\n") fail(EC_TIMED_OUT) @@ -53,7 +53,7 @@ def get_list(conn, options):
try: try: - res = send_command(options, "<configResolveClass cookie="" + options["cookie"] + "" inHierarchical="false" classId="lsServer"/>") + res = send_command(options, "<configResolveClass cookie="" + options["cookie"] + "" inHierarchical="false" classId="lsServer"/>", int(options["-Y"])) except pycurl.error, e: sys.stderr.write(e[1] + "\n") fail(EC_TIMED_OUT) @@ -70,7 +70,7 @@ def get_list(conn, options):
return outlets
-def send_command(opt, command): +def send_command(opt, command, timeout): ## setup correct URL if opt.has_key("-z"): url = "https:" @@ -86,7 +86,7 @@ def send_command(opt, command): c.setopt(pycurl.HTTPHEADER, [ "Content-type: text/xml" ]) c.setopt(pycurl.POSTFIELDS, command) c.setopt(pycurl.WRITEFUNCTION, b.write) - c.setopt(pycurl.TIMEOUT, int(opt["-Y"])) + c.setopt(pycurl.TIMEOUT, timeout) c.setopt(pycurl.SSL_VERIFYPEER, 0) c.setopt(pycurl.SSL_VERIFYHOST, 0) c.perform() @@ -146,7 +146,7 @@ used with Cisco UCS to fence machines." result = fence_action(None, options, set_power_status, get_power_status, get_list)
### Logout; we do not care about result as we will end in any case - send_command(options, "<aaaLogout inCookie="" + options["cookie"] + "" />") + send_command(options, "<aaaLogout inCookie="" + options["cookie"] + "" />", int(options["-Y"])) sys.exit(result)
cluster-commits@lists.fedorahosted.org