cluster-commits November 2012

cluster-commits@lists.fedorahosted.org

7 participants
62 discussions

fence-agents: master - fence_ilo_mp: Remove dependant device options like in rest of fence agents
by Marek Grác 24 Nov '12

24 Nov '12

Gitweb: http://git.fedorahosted.org/git/?p=fence-agents.git;a=commitdiff;h=0299c52f… Commit: 0299c52ffbacfe0b916ff326484da677eb5d5b30 Parent: 402d7eed3e7b9648ee8cc38e420e481800b03309 Author: Marek 'marx' Grac <mgrac(a)redhat.com> AuthorDate: Sun Nov 18 12:21:50 2012 +0100 Committer: Marek 'marx' Grac <mgrac(a)redhat.com> CommitterDate: Sat Nov 24 11:37:05 2012 +0100 fence_ilo_mp: Remove dependant device options like in rest of fence agents --- fence/agents/ilo_mp/fence_ilo_mp.py | 4 +--- 1 files changed, 1 insertions(+), 3 deletions(-) diff --git a/fence/agents/ilo_mp/fence_ilo_mp.py b/fence/agents/ilo_mp/fence_ilo_mp.py index 1e14935..b1202bb 100644 --- a/fence/agents/ilo_mp/fence_ilo_mp.py +++ b/fence/agents/ilo_mp/fence_ilo_mp.py @@ -34,9 +34,7 @@ def set_power_status(conn, options): return def main(): - device_opt = [ "ipaddr", "login", "passwd", "passwd_script", - "secure", "identity_file", "cmd_prompt", "ipport", - "separator", "inet4_only", "inet6_only" ] + device_opt = [ "ipaddr", "login", "passwd", "secure", "cmd_prompt" ] atexit.register(atexit_handler)

1 0

fence-agents: master - fencing: Improve XML metadata output
by Marek Grác 24 Nov '12

24 Nov '12

Gitweb: http://git.fedorahosted.org/git/?p=fence-agents.git;a=commitdiff;h=402d7eed… Commit: 402d7eed3e7b9648ee8cc38e420e481800b03309 Parent: 7d024a67652b3f92ebdfd37da17c5d82a16097e3 Author: Marek 'marx' Grac <mgrac(a)redhat.com> AuthorDate: Fri Nov 23 16:03:24 2012 +0100 Committer: Marek 'marx' Grac <mgrac(a)redhat.com> CommitterDate: Sat Nov 24 11:36:58 2012 +0100 fencing: Improve XML metadata output Problem occurs when special characters are part of default values. --- fence/agents/lib/fencing.py.py | 16 ++++++++++++---- 1 files changed, 12 insertions(+), 4 deletions(-) diff --git a/fence/agents/lib/fencing.py.py b/fence/agents/lib/fencing.py.py index d48e3b7..3f994b9 100644 --- a/fence/agents/lib/fencing.py.py +++ b/fence/agents/lib/fencing.py.py @@ -503,17 +503,25 @@ def metadata(avail_opt, options, docs): default = "" if all_opt[option].has_key("default"): - default = "default=\""+str(all_opt[option]["default"])+"\"" + default = str(all_opt[option]["default"]) elif options.has_key("--" + all_opt[option]["longopt"]) and all_opt[option]["getopt"].endswith(":"): if options["--" + all_opt[option]["longopt"]]: try: - default = "default=\"" + options["--" + all_opt[option]["longopt"]] + "\"" + default = options["--" + all_opt[option]["longopt"]] except TypeError: ## @todo/@note: Currently there is no clean way how to handle lists ## we can create a string from it but we can't set it on command line - default = "default=\"" + str(options["--" + all_opt[option]["longopt"]]) +"\"" + default = str(options["--" + all_opt[option]["longopt"]]) elif options.has_key("--" + all_opt[option]["longopt"]): - default = "default=\"true\" " + default = "true" + + if default: + default = default.replace("&", "&" ) + default = default.replace('"', """ ) + default = default.replace('<', "<" ) + default = default.replace('>', ">" ) + default = default.replace("'", "'" ) + default = "default=\"" + default + "\" " mixed = all_opt[option]["help"] ## split it between option and help text

1 0

fence-agents: master - fence_cisco_ucs: Simplify code by using rstrip()
by Marek Grác 24 Nov '12

24 Nov '12

Gitweb: http://git.fedorahosted.org/git/?p=fence-agents.git;a=commitdiff;h=7d024a67… Commit: 7d024a67652b3f92ebdfd37da17c5d82a16097e3 Parent: a58d415bcabdc21dad6ba16ce91b8f9ce3ac1fb3 Author: Marek 'marx' Grac <mgrac(a)redhat.com> AuthorDate: Sun Nov 18 01:35:40 2012 +0100 Committer: Marek 'marx' Grac <mgrac(a)redhat.com> CommitterDate: Sat Nov 24 11:36:51 2012 +0100 fence_cisco_ucs: Simplify code by using rstrip() --- fence/agents/cisco_ucs/fence_cisco_ucs.py | 5 +---- 1 files changed, 1 insertions(+), 4 deletions(-) diff --git a/fence/agents/cisco_ucs/fence_cisco_ucs.py b/fence/agents/cisco_ucs/fence_cisco_ucs.py index 12fcd87..0260bf0 100644 --- a/fence/agents/cisco_ucs/fence_cisco_ucs.py +++ b/fence/agents/cisco_ucs/fence_cisco_ucs.py @@ -123,10 +123,7 @@ used with Cisco UCS to fence machines." ## ## Modify suborg to format /suborg if options["--suborg"] != "": - if options["--suborg"].startswith("/") == False: - options["--suborg"] = "/" + options["--suborg"] - if options["--suborg"].endswith("/") == True: - options["--suborg"] = options["--suborg"][0:-1] + options["--suborg"] = "/" + options["--suborg"].lstrip("/").rstrip("/") ## ## Fence operations

1 0

fence-agents: master - fence_lpar: Typo in definition of 'managed' option
by Marek Grác 24 Nov '12

24 Nov '12

Gitweb: http://git.fedorahosted.org/git/?p=fence-agents.git;a=commitdiff;h=a58d415b… Commit: a58d415bcabdc21dad6ba16ce91b8f9ce3ac1fb3 Parent: a014f7e7a3ccd1ef8e40ec6da42ddd8051438cb6 Author: Marek 'marx' Grac <mgrac(a)redhat.com> AuthorDate: Sat Nov 17 17:51:46 2012 +0100 Committer: Marek 'marx' Grac <mgrac(a)redhat.com> CommitterDate: Sat Nov 24 11:36:44 2012 +0100 fence_lpar: Typo in definition of 'managed' option --- fence/agents/lib/fencing.py.py | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/fence/agents/lib/fencing.py.py b/fence/agents/lib/fencing.py.py index 381a3da..d48e3b7 100644 --- a/fence/agents/lib/fencing.py.py +++ b/fence/agents/lib/fencing.py.py @@ -222,7 +222,7 @@ all_opt = { "order" : 1 }, "managed" : { "getopt" : "s:", - "longopt" : "managed" + "longopt" : "managed", "help" : "-s, --managed=<id> Name of the managed system", "required" : "0", "shortdesc" : "Managed system name",

1 0

fence-agents: master - fencing: Operation 'reboot' is not working because fence_fabric was wrongly used
by Marek Grác 24 Nov '12

24 Nov '12

Gitweb: http://git.fedorahosted.org/git/?p=fence-agents.git;a=commitdiff;h=a014f7e7… Commit: a014f7e7a3ccd1ef8e40ec6da42ddd8051438cb6 Parent: f89876f8e4e5add91ba0472ef3b0c3aa8ff4d51f Author: Marek 'marx' Grac <mgrac(a)redhat.com> AuthorDate: Sat Nov 17 16:38:59 2012 +0100 Committer: Marek 'marx' Grac <mgrac(a)redhat.com> CommitterDate: Sat Nov 24 11:36:37 2012 +0100 fencing: Operation 'reboot' is not working because fence_fabric was wrongly used Bug was introduced when doing change to fabric_fencing and list of available actions. --- fence/agents/lib/fencing.py.py | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/fence/agents/lib/fencing.py.py b/fence/agents/lib/fencing.py.py index 6f911b2..381a3da 100644 --- a/fence/agents/lib/fencing.py.py +++ b/fence/agents/lib/fencing.py.py @@ -690,7 +690,7 @@ def check_input(device_opt, opt): options["log"] = LOG_MODE_QUIET acceptable_actions = [ "on", "off", "status", "list", "monitor" ] - if 0 == device_opt.count("fabric_fencing"): + if 1 == device_opt.count("fabric_fencing"): ## Compatibility layer ##### acceptable_actions.extend(["enable", "disable"])

1 0

fence-agents: master - fencing: Replace all short (getopt) options in code by their long variants
by Marek Grác 24 Nov '12

24 Nov '12

Gitweb: http://git.fedorahosted.org/git/?p=fence-agents.git;a=commitdiff;h=f89876f8… Commit: f89876f8e4e5add91ba0472ef3b0c3aa8ff4d51f Parent: d1eb3d350ba6a5e494a8ef9cf610a5359691cc1f Author: Marek 'marx' Grac <mgrac(a)redhat.com> AuthorDate: Fri Nov 23 15:54:34 2012 +0100 Committer: Marek 'marx' Grac <mgrac(a)redhat.com> CommitterDate: Sat Nov 24 11:36:29 2012 +0100 fencing: Replace all short (getopt) options in code by their long variants Short (getopt) arguments are supported as before but all internal structures now should use their long variants. This makes code more readable and we should more easilly avoid problems when overloading short getopt on command line (e.g. -d). --- fence/agents/cisco_ucs/fence_cisco_ucs.py | 18 +++++++------- fence/agents/eaton_snmp/fence_eaton_snmp.py | 20 ++++++++-------- fence/agents/eps/fence_eps.py | 20 ++++++++-------- fence/agents/ipdu/fence_ipdu.py | 4 +- fence/agents/lib/fencing.py.py | 30 ++++++++++-------------- fence/agents/rhevm/fence_rhevm.py | 8 +++--- fence/agents/rsb/fence_rsb.py | 6 ++-- fence/agents/virsh/fence_virsh.py | 4 +- fence/agents/vmware_soap/fence_vmware_soap.py | 2 +- fence/agents/wti/fence_wti.py | 2 +- fence/agents/xenapi/fence_xenapi.py | 22 +++++++++--------- 11 files changed, 66 insertions(+), 70 deletions(-) diff --git a/fence/agents/cisco_ucs/fence_cisco_ucs.py b/fence/agents/cisco_ucs/fence_cisco_ucs.py index 335c5e7..12fcd87 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): res = send_command(options, \ - "<configResolveDn cookie=\"" + options["cookie"] + "\" inHierarchical=\"false\" dn=\"org-root" + options["-s"] + \ + "<configResolveDn cookie=\"" + options["cookie"] + "\" inHierarchical=\"false\" dn=\"org-root" + options["--suborg"] + \ "/ls-" + options["--plug"] + "/power\"/>", \ int(options["--shell-timeout"])) @@ -41,7 +41,7 @@ def set_power_status(conn, options): res = send_command(options, \ "<configConfMos cookie=\"" + options["cookie"] + "\" inHierarchical=\"no\">" + \ - "<inConfigs><pair key=\"org-root" + options["-s"] + "/ls-" + options["--plug"] + "/power\">" + \ + "<inConfigs><pair key=\"org-root" + options["--suborg"] + "/ls-" + options["--plug"] + "/power\">" + \ "<lsPower dn=\"org-root/ls-" + options["--plug"] + "/power\" state=\"" + action + "\" status=\"modified\" />" + \ "</pair></inConfigs></configConfMos>", \ int(options["--shell-timeout"])) @@ -70,12 +70,12 @@ def get_list(conn, options): def send_command(opt, command, timeout): ## setup correct URL - if opt.has_key("-z"): + if opt.has_key("--ssl"): url = "https:" else: url = "http:" - url += "//" + opt["-a"] + ":" + str(opt["-u"]) + "/nuova" + url += "//" + opt["--ip"] + ":" + str(opt["--ipport"]) + "/nuova" ## send command through pycurl c = pycurl.Curl() @@ -122,11 +122,11 @@ used with Cisco UCS to fence machines." ## ## Modify suborg to format /suborg - if options["-s"] != "": - if options["-s"].startswith("/") == False: - options["-s"] = "/" + options["-s"] - if options["-s"].endswith("/") == True: - options["-s"] = options["-s"][0:-1] + if options["--suborg"] != "": + if options["--suborg"].startswith("/") == False: + options["--suborg"] = "/" + options["--suborg"] + if options["--suborg"].endswith("/") == True: + options["--suborg"] = options["--suborg"][0:-1] ## ## Fence operations diff --git a/fence/agents/eaton_snmp/fence_eaton_snmp.py b/fence/agents/eaton_snmp/fence_eaton_snmp.py index e8bdad9..bf6aa9e 100644 --- a/fence/agents/eaton_snmp/fence_eaton_snmp.py +++ b/fence/agents/eaton_snmp/fence_eaton_snmp.py @@ -89,19 +89,19 @@ def eaton_resolv_port_id(conn, options): # Restore the increment, that was removed in main for ePDU Managed if (device.ident_str == "Eaton Switched ePDU"): - options["-n"] = str(int(options["-n"]) + 1) + options["--plug"] = str(int(options["--plug"]) + 1) # Now we resolv port_id/switch_id - if ((options["-n"].isdigit()) and ((not device.has_switches) or (options["-s"].isdigit()))): - port_id = int(options["-n"]) + if ((options["--plug"].isdigit()) and ((not device.has_switches) or (options["--switch"].isdigit()))): + port_id = int(options["--plug"]) if (device.has_switches): - switch_id = int(options["-s"]) + switch_id = int(options["--switch"]) else: table = conn.walk(device.outlet_table_oid, 30) for x in table: - if (x[1].strip('"')==options["-n"]): + if (x[1].strip('"')==options["--plug"]): t = x[0].split('.') if (device.has_switches): port_id = int(t[len(t)-1]) @@ -115,8 +115,8 @@ def eaton_resolv_port_id(conn, options): if (port_id==None): # Restore index offset, to provide a valid error output on Managed ePDU if (device.ident_str != "Eaton Switched ePDU"): - options["-n"] = str(int(options["-n"]) + 1) - fail_usage("Can't find port with name %s!"%(options["-n"])) + options["--plug"] = str(int(options["--plug"]) + 1) + fail_usage("Can't find port with name %s!"%(options["--plug"])) def get_power_status(conn, options): global port_id, after_set @@ -156,7 +156,7 @@ def set_power_status(conn, options): oid = ((device.has_switches) and device.control_oid%(switch_id, port_id) or device.control_oid%(port_id)) - conn.set(oid,(options["-o"]=="on" and device.turn_on or device.turn_off)) + conn.set(oid,(options["--action"]=="on" and device.turn_on or device.turn_off)) def get_outlets_status(conn, options): @@ -213,8 +213,8 @@ def main(): # Plug indexing start from zero on ePDU Managed, so we substract '1' from # the user's given plug number. # For Switched ePDU, we will add this back again later. - if ((options.has_key("-n")) and (options["-n"].isdigit())): - options["-n"] = str(int(options["-n"]) - 1) + if ((options.has_key("--plug")) and (options["--plug"].isdigit())): + options["--plug"] = str(int(options["--plug"]) - 1) docs = { } docs["shortdesc"] = "Fence agent for Eaton over SNMP" diff --git a/fence/agents/eps/fence_eps.py b/fence/agents/eps/fence_eps.py index 59fb36b..94f862a 100644 --- a/fence/agents/eps/fence_eps.py +++ b/fence/agents/eps/fence_eps.py @@ -25,9 +25,9 @@ def eps_log(options, str): def eps_run_command(options, params): try: # New http connection - conn = httplib.HTTPConnection(options["-a"]) + conn = httplib.HTTPConnection(options["--ip"]) - request_str = "/"+options["-c"] + request_str = "/"+options["--page"] if (params!=""): request_str += "?"+params @@ -35,12 +35,12 @@ def eps_run_command(options, params): eps_log(options, "GET "+request_str+"\n") conn.putrequest('GET', request_str) - if (options.has_key("-l")): - if (not options.has_key("-p")): - options["-p"] = "" # Default is empty password + if (options.has_key("--login")): + if (not options.has_key("--password")): + options["--password"] = "" # Default is empty password # String for Authorization header - auth_str = 'Basic ' + string.strip(base64.encodestring(options["-l"]+':'+options["-p"])) + auth_str = 'Basic ' + string.strip(base64.encodestring(options["--login"]+':'+options["--password"])) eps_log(options, "Authorization:"+auth_str+"\n") conn.putheader('Authorization', auth_str) @@ -73,16 +73,16 @@ def get_power_status(conn, options): for out_num, out_stat in status: result[out_num] = ("",(out_stat=="1" and "on" or "off")) - if (not (options["-o"] in ['monitor','list'])): - if (not (options["-n"] in result)): + if (not (options["--action"] in ['monitor','list'])): + if (not (options["--plug"] in result)): fail_usage("Failed: You have to enter existing physical plug!") else: - return result[options["-n"]][1] + return result[options["--plug"]][1] else: return result def set_power_status(conn, options): - ret_val = eps_run_command(options, "P%s=%s"%(options["-n"], (options["-o"]=="on" and "1" or "0"))) + ret_val = eps_run_command(options, "P%s=%s"%(options["--plug"], (options["--action"]=="on" and "1" or "0"))) # Define new option def eps_define_new_opts(): diff --git a/fence/agents/ipdu/fence_ipdu.py b/fence/agents/ipdu/fence_ipdu.py index d133832..8b722e9 100644 --- a/fence/agents/ipdu/fence_ipdu.py +++ b/fence/agents/ipdu/fence_ipdu.py @@ -66,11 +66,11 @@ def ipdu_resolv_port_id(conn, options): ipdu_set_device(conn, options) # Now we resolv port_id/switch_id - if ((options["--plug"].isdigit()) and ((not device.has_switches) or (options["-s"].isdigit()))): + if ((options["--plug"].isdigit()) and ((not device.has_switches) or (options["--switch"].isdigit()))): port_id = int(options["--plug"]) if (device.has_switches): - switch_id = int(options["-s"]) + switch_id = int(options["--switch"]) else: table = conn.walk(device.outlet_table_oid, 30) diff --git a/fence/agents/lib/fencing.py.py b/fence/agents/lib/fencing.py.py index 9affaa8..6f911b2 100644 --- a/fence/agents/lib/fencing.py.py +++ b/fence/agents/lib/fencing.py.py @@ -222,7 +222,8 @@ all_opt = { "order" : 1 }, "managed" : { "getopt" : "s:", - "help" : "-s <id> Name of the managed system", + "longopt" : "managed" + "help" : "-s, --managed=<id> Name of the managed system", "required" : "0", "shortdesc" : "Managed system name", "order" : 1 }, @@ -503,15 +504,15 @@ def metadata(avail_opt, options, docs): default = "" if all_opt[option].has_key("default"): default = "default=\""+str(all_opt[option]["default"])+"\"" - elif options.has_key("-" + all_opt[option]["getopt"][:-1]): - if options["-" + all_opt[option]["getopt"][:-1]]: + elif options.has_key("--" + all_opt[option]["longopt"]) and all_opt[option]["getopt"].endswith(":"): + if options["--" + all_opt[option]["longopt"]]: try: - default = "default=\"" + options["-" + all_opt[option]["getopt"][:-1]] + "\"" + default = "default=\"" + options["--" + all_opt[option]["longopt"]] + "\"" except TypeError: ## @todo/@note: Currently there is no clean way how to handle lists ## we can create a string from it but we can't set it on command line - default = "default=\"" + str(options["-" + all_opt[option]["getopt"][:-1]]) +"\"" - elif options.has_key("-" + all_opt[option]["getopt"]): + default = "default=\"" + str(options["--" + all_opt[option]["longopt"]]) +"\"" + elif options.has_key("--" + all_opt[option]["longopt"]): default = "default=\"true\" " mixed = all_opt[option]["help"] @@ -584,7 +585,7 @@ def process_input(avail_opt): except getopt.GetoptError, error: fail_usage("Parse error: " + error.msg) - ## Transform longopt to short one which are used in fencing agents + ## Transform short getopt to long one which are used in fencing agents ##### old_opt = opt opt = { } @@ -592,7 +593,6 @@ def process_input(avail_opt): if o.startswith("--"): for x in all_opt.keys(): if all_opt[x].has_key("longopt") and "--" + all_opt[x]["longopt"] == o: - opt["-" + all_opt[x]["getopt"].rstrip(":")] = dict(old_opt)[o] opt["--" + all_opt[x]["longopt"]] = dict(old_opt)[o] else: for x in all_opt.keys(): @@ -645,9 +645,9 @@ def process_input(avail_opt): continue if all_opt[name]["getopt"].endswith(":"): - opt["-"+all_opt[name]["getopt"].rstrip(":")] = value - elif ((value == "1") or (value.lower() == "yes") or (value.lower() == "on") or (value.lower() == "true")): - opt["-"+all_opt[name]["getopt"]] = "1" + opt["--"+all_opt[name]["longopt"].rstrip(":")] = value + elif value.lower() in [ "1", "yes", "on", "true" ]: + opt["--"+all_opt[name]["longopt"]] = "1" return opt ## @@ -671,22 +671,18 @@ def check_input(device_opt, opt): ## In special cases (show help, metadata or version) we don't need to check anything ##### - if options.has_key("-h") or options.has_key("-V") or (options.has_key("--action") and options["--action"].lower() == "metadata"): + if options.has_key("--help") or options.has_key("--version") or (options.has_key("--action") and options["--action"].lower() == "metadata"): return options ## Set default values ##### for opt in device_opt: if all_opt[opt].has_key("default"): - getopt_short = "-" + all_opt[opt]["getopt"].rstrip(":") getopt_long = "--" + all_opt[opt]["longopt"] - if 0 == options.has_key(getopt_short): - options[getopt_short] = all_opt[opt]["default"] if 0 == options.has_key(getopt_long): options[getopt_long] = all_opt[opt]["default"] options["--action"] = options["--action"].lower() - options["-o"] = options["-o"].lower() if options.has_key("--verbose"): options["log"] = LOG_MODE_VERBOSE @@ -725,7 +721,7 @@ def check_input(device_opt, opt): if (0 == options.has_key("--username")) and device_opt.count("login") and (device_opt.count("no_login") == 0): fail_usage("Failed: You have to set login name") - if 0 == options.has_key("--ip") and 0 == options.has_key("-s"): + if 0 == options.has_key("--ip") and 0 == options.has_key("--managed"): fail_usage("Failed: You have to enter fence address") if (device_opt.count("no_password") == 0): diff --git a/fence/agents/rhevm/fence_rhevm.py b/fence/agents/rhevm/fence_rhevm.py index 0d4de57..cb61df5 100644 --- a/fence/agents/rhevm/fence_rhevm.py +++ b/fence/agents/rhevm/fence_rhevm.py @@ -69,12 +69,12 @@ def get_list(conn, options): def send_command(opt, command, method = "GET"): ## setup correct URL - if opt.has_key("-z"): + if opt.has_key("--ssl"): url = "https:" else: url = "http:" - url += "//" + opt["-a"] + ":" + str(opt["-u"]) + "/api/" + command + url += "//" + opt["--ip"] + ":" + str(opt["--ipport"]) + "/api/" + command ## send command through pycurl c = pycurl.Curl() @@ -82,8 +82,8 @@ def send_command(opt, command, method = "GET"): c.setopt(pycurl.URL, url) c.setopt(pycurl.HTTPHEADER, [ "Content-type: application/xml", "Accept: application/xml" ]) c.setopt(pycurl.HTTPAUTH, pycurl.HTTPAUTH_BASIC) - c.setopt(pycurl.USERPWD, opt["-l"] + ":" + opt["-p"]) - c.setopt(pycurl.TIMEOUT, int(opt["-Y"])) + c.setopt(pycurl.USERPWD, opt["--login"] + ":" + opt["--password"]) + c.setopt(pycurl.TIMEOUT, int(opt["--shell-timeout"])) c.setopt(pycurl.SSL_VERIFYPEER, 0) c.setopt(pycurl.SSL_VERIFYHOST, 0) diff --git a/fence/agents/rsb/fence_rsb.py b/fence/agents/rsb/fence_rsb.py index 45a0c06..100836c 100755 --- a/fence/agents/rsb/fence_rsb.py +++ b/fence/agents/rsb/fence_rsb.py @@ -52,11 +52,11 @@ def main(): opt = process_input(device_opt) # option -n for backward compatibility (-n is normally port no) - if 1 == opt.has_key("-n"): - opt["-u"] = opt["-n"] + if 1 == opt.has_key("--telnet_port"): + opt["--port"] = opt["--telnet_port"] # set default port for telnet only - if 0 == opt.has_key("-x") and 0 == opt.has_key("-u"): + if 0 == opt.has_key("--ssh") and 0 == opt.has_key("--ipport"): opt["--ipport"] = 3172 options = check_input(device_opt, opt) diff --git a/fence/agents/virsh/fence_virsh.py b/fence/agents/virsh/fence_virsh.py index 2e1474a..81edf6a 100644 --- a/fence/agents/virsh/fence_virsh.py +++ b/fence/agents/virsh/fence_virsh.py @@ -16,7 +16,7 @@ BUILD_DATE="" #END_VERSION_GENERATION def get_outlets_status(conn, options): - if options.has_key("-d"): + if options.has_key("--use-sudo"): prefix = SUDO_PATH + " " else: prefix = "" @@ -48,7 +48,7 @@ def get_power_status(conn, options): return outlets[options["--plug"]][1] def set_power_status(conn, options): - if options.has_key("-d"): + if options.has_key("--use-sudo"): prefix = SUDO_PATH + " " else: prefix = "" diff --git a/fence/agents/vmware_soap/fence_vmware_soap.py b/fence/agents/vmware_soap/fence_vmware_soap.py index 9eef969..2572464 100644 --- a/fence/agents/vmware_soap/fence_vmware_soap.py +++ b/fence/agents/vmware_soap/fence_vmware_soap.py @@ -19,7 +19,7 @@ def soap_login(options): else: url = "http://" - url += options["--ip"] + ":" + str(options["-u"]) + "/sdk" + url += options["--ip"] + ":" + str(options["--ipport"]) + "/sdk" conn = Client(url + "/vimService.wsdl") conn.set_options(location = url) diff --git a/fence/agents/wti/fence_wti.py b/fence/agents/wti/fence_wti.py index 76c0f26..b12648d 100644 --- a/fence/agents/wti/fence_wti.py +++ b/fence/agents/wti/fence_wti.py @@ -111,7 +111,7 @@ is running because the connection will block any necessary fencing actions." try: conn = fspawn(options, TELNET_PATH) conn.send("set binary\n") - conn.send("open %s -%s\n"%(options["--ip"], options["-u"])) + conn.send("open %s -%s\n"%(options["--ip"], options["--ipport"])) except pexpect.ExceptionPexpect, ex: sys.stderr.write(str(ex) + "\n") sys.stderr.write("Due to limitations, binary dependencies on fence agents " diff --git a/fence/agents/xenapi/fence_xenapi.py b/fence/agents/xenapi/fence_xenapi.py index 51ebf52..adec13e 100644 --- a/fence/agents/xenapi/fence_xenapi.py +++ b/fence/agents/xenapi/fence_xenapi.py @@ -45,7 +45,7 @@ BUILD_DATE="" EC_BAD_SESSION = 1 # Find the status of the port given in the -U flag of options. def get_power_fn(session, options): - if options.has_key("-v"): + if options.has_key("--verbose"): verbose = True else: verbose = False @@ -77,7 +77,7 @@ def get_power_fn(session, options): # Set the state of the port given in the -U flag of options. def set_power_fn(session, options): - action = options["-o"].lower() + action = options["--action"].lower() try: # Get a reference to the vm specified in the UUID or vm_name/port parameter @@ -102,7 +102,7 @@ def set_power_fn(session, options): # Function to populate an array of virtual machines and their status def get_outlet_list(session, options): result = {} - if options.has_key("-v"): + if options.has_key("--verbose"): verbose = True else: verbose = False @@ -129,9 +129,9 @@ def get_outlet_list(session, options): # Function to initiate the XenServer session via the XenAPI library. def connect_and_login(options): - url = options["-s"] - username = options["-l"] - password = options["-p"] + url = options["--session-url"] + username = options["--login"] + password = options["--passwd"] try: # Create the XML RPC session to the specified URL. @@ -152,14 +152,14 @@ def connect_and_login(options): # this is tried first as this is the only properly unique identifier. # Exceptions are not handled in this function, code that calls this must be ready to handle them. def return_vm_reference(session, options): - if options.has_key("-v"): + if options.has_key("--verbose"): verbose = True else: verbose = False # Case where the UUID has been specified - if options.has_key("-U"): - uuid = options["-U"].lower() + if options.has_key("--uid"): + uuid = options["--uid"].lower() # When using the -n parameter for name, we get an error message (in verbose # mode) that tells us that we didn't find a VM. To immitate that here we # need to catch and re-raise the exception produced by get_by_uuid. @@ -172,8 +172,8 @@ def return_vm_reference(session, options): # Case where the vm_name/port has been specified - if options.has_key("-n"): - vm_name = options["-n"] + if options.has_key("--plug"): + vm_name = options["--plug"] vm_arr = session.xenapi.VM.get_by_name_label(vm_name) # Need to make sure that we only have one result as the vm_name may # not be unique. Average case, so do it first.

1 0

cluster: STABLE32 - cman init: fix error when /sys/kernel/config is still in use
by Fabio M. Di Nitto 21 Nov '12

21 Nov '12

Gitweb: http://git.fedorahosted.org/git/?p=cluster.git;a=commitdiff;h=406611d78778e… Commit: 406611d78778efca6aae5743ba9c7c4391a1b18f Parent: 016ee0de51798782fc4036836ad740e0c42e586e Author: Fabio M. Di Nitto <fdinitto(a)redhat.com> AuthorDate: Wed Nov 21 09:38:01 2012 +0100 Committer: Fabio M. Di Nitto <fdinitto(a)redhat.com> CommitterDate: Wed Nov 21 09:38:01 2012 +0100 cman init: fix error when /sys/kernel/config is still in use Signed-off-by: Fabio M. Di Nitto <fdinitto(a)redhat.com> --- cman/init.d/cman.in | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/cman/init.d/cman.in b/cman/init.d/cman.in index 849739b..604660d 100644 --- a/cman/init.d/cman.in +++ b/cman/init.d/cman.in @@ -557,7 +557,9 @@ start_configfs() stop_configfs() { - if mtab_configfs && [ -z "$(ls -1 /sys/kernel/config)" ]; then + if mtab_configfs && \ + [ -z "$(ls -1 /sys/kernel/config)" ] && \ + [ -z "$(lsof -l +D /sys/kernel/config 2>/dev/null)" ]; then errmsg=$( umount /sys/kernel/config 2>&1 ) || return 1 modprobe -r configfs > /dev/null 2>&1 || true fi

1 0

cluster: RHEL63 - fenced: fix log file mode
by Fabio M. Di Nitto 20 Nov '12

20 Nov '12

Gitweb: http://git.fedorahosted.org/git/?p=cluster.git;a=commitdiff;h=47fe69d5c3048… Commit: 47fe69d5c3048b132dd61ba1637ea7cbdd8cf903 Parent: 1e10d53231e4383fac90fc71584170797cbad9e8 Author: David Teigland <teigland(a)redhat.com> AuthorDate: Fri Aug 3 10:12:15 2012 -0500 Committer: Fabio M. Di Nitto <fdinitto(a)redhat.com> CommitterDate: Tue Nov 20 11:17:26 2012 +0100 fenced: fix log file mode Remove umask(0) which caused liblogthread's fopen to create fenced.log with mode 666. Check if existing fenced.log has mode 666 and if so, chmod to 644. bz 878373 Signed-off-by: David Teigland <teigland(a)redhat.com> --- fence/fenced/logging.c | 31 +++++++++++++++++++++++++++++++ fence/fenced/main.c | 1 - 2 files changed, 31 insertions(+), 1 deletions(-) diff --git a/fence/fenced/logging.c b/fence/fenced/logging.c index a6a1a66..56a7e08 100644 --- a/fence/fenced/logging.c +++ b/fence/fenced/logging.c @@ -39,8 +39,13 @@ void init_logging(void) logfile_priority, logfile); } +#define DEFAULT_LOGFILE_MODE (S_IRUSR|S_IWUSR|S_IRGRP|S_IROTH) + void setup_logging(void) { + struct stat buf; + int rv; + ccs_read_logging(ccs_handle, DAEMON_NAME, &cfgd_debug_logfile, &log_mode, &syslog_facility, &syslog_priority, @@ -52,6 +57,32 @@ void setup_logging(void) logt_conf(DAEMON_NAME, log_mode, syslog_facility, syslog_priority, logfile_priority, logfile); + + /* + * Previously fenced.log was created with mode 666, + * so fix it to be 644. + */ + + rv = stat(logfile, &buf); + if (rv) + return; + + log_debug("logfile cur mode %lo", (unsigned long)buf.st_mode); + + if ((buf.st_mode & (S_IRWXU|S_IRWXG|S_IRWXO)) == DEFAULT_LOGFILE_MODE) + return; + + rv = chmod(logfile, DEFAULT_LOGFILE_MODE); + if (rv) { + log_error("chmod error %d", errno); + return; + } + + rv = stat(logfile, &buf); + if (rv) + return; + + log_debug("logfile new mode %lo", (unsigned long)buf.st_mode); } void close_logging(void) diff --git a/fence/fenced/main.c b/fence/fenced/main.c index 835dc76..cc11382 100644 --- a/fence/fenced/main.c +++ b/fence/fenced/main.c @@ -1039,7 +1039,6 @@ int main(int argc, char **argv) perror("main: cannot fork"); exit(EXIT_FAILURE); } - umask(0); } lockfile(); init_logging();

1 0

fence-agents: master - fencing: Replace common options with more flexible mechanism
by Marek Grác 17 Nov '12

17 Nov '12

Gitweb: http://git.fedorahosted.org/git/?p=fence-agents.git;a=commitdiff;h=d1eb3d35… Commit: d1eb3d350ba6a5e494a8ef9cf610a5359691cc1f Parent: 0c8c31cdd25dc49d33a897bf6ad1c7d3c5f7b36a Author: Marek 'marx' Grac <mgrac(a)redhat.com> AuthorDate: Tue Nov 13 20:13:18 2012 +0100 Committer: Marek 'marx' Grac <mgrac(a)redhat.com> CommitterDate: Tue Nov 13 20:13:18 2012 +0100 fencing: Replace common options with more flexible mechanism Before this patch we had an option do add set of device options to all fence agents. e.g. device needs password, device needs ip address, ... This patch makes it more flexible as we can in addition do also options which depend on parent. e.g. if device needs password, then password script can be also used e.g. if device needs IP address, we can force it to use either IPv4 or IPv6 --- fence/agents/alom/fence_alom.py | 3 +- fence/agents/apc/fence_apc.py | 5 +-- fence/agents/apc_snmp/fence_apc_snmp.py | 7 +--- fence/agents/bladecenter/fence_bladecenter.py | 5 +-- fence/agents/cisco_mds/fence_cisco_mds.py | 7 +--- fence/agents/cisco_ucs/fence_cisco_ucs.py | 5 +-- fence/agents/drac5/fence_drac5.py | 5 +-- fence/agents/eaton_snmp/fence_eaton_snmp.py | 7 +--- fence/agents/eps/fence_eps.py | 4 +- fence/agents/hds_cb/fence_hds_cb.py | 5 +-- fence/agents/hpblade/fence_hpblade.py | 5 +-- fence/agents/ibmblade/fence_ibmblade.py | 7 +--- fence/agents/ifmib/fence_ifmib.py | 7 +--- fence/agents/ilo/fence_ilo.py | 3 +- fence/agents/intelmodular/fence_intelmodular.py | 7 +--- fence/agents/ipdu/fence_ipdu.py | 7 +--- fence/agents/ldom/fence_ldom.py | 5 +-- fence/agents/lib/fencing.py.py | 33 ++++++++++++++++------- fence/agents/lpar/fence_lpar.py | 5 +-- fence/agents/rhevm/fence_rhevm.py | 3 +- fence/agents/rsa/fence_rsa.py | 3 +- fence/agents/rsb/fence_rsb.py | 4 +-- fence/agents/sanbox2/fence_sanbox2.py | 3 +- fence/agents/virsh/fence_virsh.py | 5 +-- fence/agents/vmware/fence_vmware.py | 5 +-- fence/agents/vmware_soap/fence_vmware_soap.py | 3 +- fence/agents/wti/fence_wti.py | 5 +-- fence/agents/xenapi/fence_xenapi.py | 4 +- 28 files changed, 70 insertions(+), 97 deletions(-) diff --git a/fence/agents/alom/fence_alom.py b/fence/agents/alom/fence_alom.py index f1810d2..a256da4 100644 --- a/fence/agents/alom/fence_alom.py +++ b/fence/agents/alom/fence_alom.py @@ -31,8 +31,7 @@ def set_power_status(conn, options): time.sleep(int(options["--power-timeout"])) def main(): - device_opt = [ "ipaddr", "login", "passwd", "passwd_script", "cmd_prompt", "secure", - "identity_file", "test", "inet4_only", "inet6_only", "ipport" ] + device_opt = [ "ipaddr", "ipport", "login", "passwd", "cmd_prompt", "secure", "test" ] atexit.register(atexit_handler) diff --git a/fence/agents/apc/fence_apc.py b/fence/agents/apc/fence_apc.py index e98d9ce..314c0aa 100644 --- a/fence/agents/apc/fence_apc.py +++ b/fence/agents/apc/fence_apc.py @@ -174,9 +174,8 @@ def set_power_status(conn, options): conn.log_expect(options, options["--command-prompt"], int(options["--shell-timeout"])) def main(): - device_opt = [ "ipaddr", "login", "passwd", "passwd_script", "cmd_prompt", - "secure", "port", "identity_file", "switch", "test", "separator", - "inet4_only", "inet6_only", "ipport" ] + device_opt = [ "ipaddr", "ipport", "login", "passwd", "cmd_prompt", "secure", \ + "port", "switch", "test" ] atexit.register(atexit_handler) diff --git a/fence/agents/apc_snmp/fence_apc_snmp.py b/fence/agents/apc_snmp/fence_apc_snmp.py index 8a97ae4..2ca7c1c 100644 --- a/fence/agents/apc_snmp/fence_apc_snmp.py +++ b/fence/agents/apc_snmp/fence_apc_snmp.py @@ -158,11 +158,8 @@ def apc_snmp_define_defaults(): # Main agent method def main(): - device_opt = [ "ipaddr", "login", "passwd", "passwd_script", - "test", "port", "separator", "no_login", "no_password", - "snmp_version", "community", "snmp_auth_prot", "snmp_sec_level", - "snmp_priv_prot", "snmp_priv_passwd", "snmp_priv_passwd_script", - "udpport", "inet4_only", "inet6_only" ] + device_opt = [ "ipaddr", "udpport", "login", "passwd", "no_login", "no_password", \ + "test", "port", "snmp_version", "community" ] atexit.register(atexit_handler) diff --git a/fence/agents/bladecenter/fence_bladecenter.py b/fence/agents/bladecenter/fence_bladecenter.py index 2a0caf9..49d7395 100644 --- a/fence/agents/bladecenter/fence_bladecenter.py +++ b/fence/agents/bladecenter/fence_bladecenter.py @@ -78,9 +78,8 @@ def get_blades_list(conn, options): return outlets def main(): - device_opt = [ "ipaddr", "login", "passwd", "passwd_script", - "cmd_prompt", "secure", "port", "identity_file", "separator", - "inet4_only", "inet6_only", "ipport", "missing_as_off" ] + device_opt = [ "ipaddr", "ipport", "login", "passwd", "cmd_prompt", "secure", \ + "port", "missing_as_off" ] atexit.register(atexit_handler) diff --git a/fence/agents/cisco_mds/fence_cisco_mds.py b/fence/agents/cisco_mds/fence_cisco_mds.py index cb45d73..650f450 100644 --- a/fence/agents/cisco_mds/fence_cisco_mds.py +++ b/fence/agents/cisco_mds/fence_cisco_mds.py @@ -77,11 +77,8 @@ def get_outlets_status(conn, options): def main(): global PORT_OID - device_opt = [ "fabric_fencing", "ipaddr", "login", "passwd", "passwd_script", - "test", "port", "separator", "no_login", "no_password", - "snmp_version", "community", "snmp_auth_prot", "snmp_sec_level", - "snmp_priv_prot", "snmp_priv_passwd", "snmp_priv_passwd_script", - "udpport", "inet4_only", "inet6_only" ] + device_opt = [ "fabric_fencing", "ipaddr", "udpport", "login", "passwd", "no_login", "no_password", \ + "test", "port", "snmp_version", "community" ] atexit.register(atexit_handler) diff --git a/fence/agents/cisco_ucs/fence_cisco_ucs.py b/fence/agents/cisco_ucs/fence_cisco_ucs.py index 2a81c68..335c5e7 100644 --- a/fence/agents/cisco_ucs/fence_cisco_ucs.py +++ b/fence/agents/cisco_ucs/fence_cisco_ucs.py @@ -97,9 +97,8 @@ def send_command(opt, command, timeout): return result def main(): - device_opt = [ "ipaddr", "login", "passwd", "passwd_script", - "ssl", "inet4_only", "inet6_only", "ipport", "port", - "web", "separator", "suborg" ] + device_opt = [ "ipaddr", "ipport", "login", "passwd", "ssl", \ + "port", "web", "suborg" ] atexit.register(atexit_handler) diff --git a/fence/agents/drac5/fence_drac5.py b/fence/agents/drac5/fence_drac5.py index 47d8db7..cb67179 100644 --- a/fence/agents/drac5/fence_drac5.py +++ b/fence/agents/drac5/fence_drac5.py @@ -69,9 +69,8 @@ def get_list_devices(conn, options): return outlets def main(): - device_opt = [ "ipaddr", "login", "passwd", "passwd_script", - "cmd_prompt", "secure", "identity_file", "drac_version", "module_name", - "separator", "inet4_only", "inet6_only", "ipport" ] + device_opt = [ "ipaddr", "ipport", "login", "passwd", "cmd_prompt", "secure", \ + "drac_version", "module_name" ] atexit.register(atexit_handler) diff --git a/fence/agents/eaton_snmp/fence_eaton_snmp.py b/fence/agents/eaton_snmp/fence_eaton_snmp.py index 2c5017b..e8bdad9 100644 --- a/fence/agents/eaton_snmp/fence_eaton_snmp.py +++ b/fence/agents/eaton_snmp/fence_eaton_snmp.py @@ -197,11 +197,8 @@ def get_outlets_status(conn, options): # Main agent method def main(): - device_opt = [ "ipaddr", "login", "passwd", "passwd_script", - "test", "port", "separator", "no_login", "no_password", - "snmp_version", "community", "snmp_auth_prot", "snmp_sec_level", - "snmp_priv_prot", "snmp_priv_passwd", "snmp_priv_passwd_script", - "udpport", "inet4_only", "inet6_only" ] + device_opt = [ "ipaddr", "udpport", "login", "passwd", "no_login", "no_password", \ + "test", "port", "snmp_version", "community" ] atexit.register(atexit_handler) diff --git a/fence/agents/eps/fence_eps.py b/fence/agents/eps/fence_eps.py index e1b8696..59fb36b 100644 --- a/fence/agents/eps/fence_eps.py +++ b/fence/agents/eps/fence_eps.py @@ -98,8 +98,8 @@ def eps_define_new_opts(): # Starting point of fence agent def main(): - device_opt = [ "ipaddr", "login", "passwd", "passwd_script", "test", - "port", "hidden_page", "no_login", "no_password", "separator" ] + device_opt = [ "ipaddr", "login", "passwd", "no_login", "no_password", \ + "port", "hidden_page", "test" ] atexit.register(atexit_handler) diff --git a/fence/agents/hds_cb/fence_hds_cb.py b/fence/agents/hds_cb/fence_hds_cb.py index ab44e2f..c0dd70c 100755 --- a/fence/agents/hds_cb/fence_hds_cb.py +++ b/fence/agents/hds_cb/fence_hds_cb.py @@ -107,9 +107,8 @@ def get_blades_list(conn, options): return outlets def main(): - device_opt = [ "ipaddr", "login", "passwd", "passwd_script", "cmd_prompt", - "secure", "port", "identity_file", "separator", "inet4_only", - "inet6_only", "ipport", "missing_as_off" ] + device_opt = [ "ipaddr", "ipport", "login", "passwd", "cmd_prompt", "secure", \ + "port", "missing_as_off" ] atexit.register(atexit_handler) diff --git a/fence/agents/hpblade/fence_hpblade.py b/fence/agents/hpblade/fence_hpblade.py index 6cea46a..a029d05 100644 --- a/fence/agents/hpblade/fence_hpblade.py +++ b/fence/agents/hpblade/fence_hpblade.py @@ -57,9 +57,8 @@ def get_blades_list(conn, options): return outlets def main(): - device_opt = [ "ipaddr", "login", "passwd", "passwd_script", - "cmd_prompt", "secure", "port", "identity_file", "separator", - "inet4_only", "inet6_only", "ipport", "missing_as_off" ] + device_opt = [ "ipaddr", "ipport", "login", "passwd", "cmd_prompt", "secure", \ + "port", "missing_as_off" ] atexit.register(atexit_handler) diff --git a/fence/agents/ibmblade/fence_ibmblade.py b/fence/agents/ibmblade/fence_ibmblade.py index 759bfc4..720c691 100644 --- a/fence/agents/ibmblade/fence_ibmblade.py +++ b/fence/agents/ibmblade/fence_ibmblade.py @@ -50,11 +50,8 @@ def get_outlets_status(conn, _): # Main agent method def main(): - device_opt = [ "ipaddr", "login", "passwd", "passwd_script", - "test", "port", "separator", "no_login", "no_password", - "snmp_version", "community", "snmp_auth_prot", "snmp_sec_level", - "snmp_priv_prot", "snmp_priv_passwd", "snmp_priv_passwd_script", - "udpport", "inet4_only", "inet6_only" ] + device_opt = [ "ipaddr", "udpport", "login", "passwd", "no_login", "no_password", \ + "test", "port", "snmp_version", "community" ] atexit.register(atexit_handler) diff --git a/fence/agents/ifmib/fence_ifmib.py b/fence/agents/ifmib/fence_ifmib.py index 9a17257..ac3ccd3 100644 --- a/fence/agents/ifmib/fence_ifmib.py +++ b/fence/agents/ifmib/fence_ifmib.py @@ -95,11 +95,8 @@ def get_outlets_status(conn, options): # Main agent method def main(): - device_opt = [ "fabric_fencing", "ipaddr", "login", "passwd", "passwd_script", - "test", "port", "separator", "no_login", "no_password", - "snmp_version", "community", "snmp_auth_prot", "snmp_sec_level", - "snmp_priv_prot", "snmp_priv_passwd", "snmp_priv_passwd_script", - "udpport", "inet4_only", "inet6_only" ] + device_opt = [ "fabric_fencing", "ipaddr", "udpport", "login", "passwd", "no_login", "no_password", \ + "test", "port", "snmp_version", "community" ] atexit.register(atexit_handler) diff --git a/fence/agents/ilo/fence_ilo.py b/fence/agents/ilo/fence_ilo.py index c85a063..3fdf3c7 100644 --- a/fence/agents/ilo/fence_ilo.py +++ b/fence/agents/ilo/fence_ilo.py @@ -53,8 +53,7 @@ def set_power_status(conn, options): return def main(): - device_opt = [ "ipaddr", "login", "passwd", "passwd_script", - "ssl", "ribcl", "inet4_only", "inet6_only", "ipport" ] + device_opt = [ "ipaddr", "ipport", "login", "passwd", "ssl", "ribcl" ] atexit.register(atexit_handler) diff --git a/fence/agents/intelmodular/fence_intelmodular.py b/fence/agents/intelmodular/fence_intelmodular.py index a590ced..99bf6c2 100644 --- a/fence/agents/intelmodular/fence_intelmodular.py +++ b/fence/agents/intelmodular/fence_intelmodular.py @@ -61,11 +61,8 @@ def get_outlets_status(conn, options): # Main agent method def main(): - device_opt = [ "ipaddr", "login", "passwd", "passwd_script", - "test", "port", "separator", "no_login", "no_password", - "snmp_version", "community", "snmp_auth_prot", "snmp_sec_level", - "snmp_priv_prot", "snmp_priv_passwd", "snmp_priv_passwd_script", - "udpport", "inet4_only", "inet6_only" ] + device_opt = [ "ipaddr", "udpport", "login", "passwd", "no_login", "no_password", + "test", "port", "snmp_version", "community" ] atexit.register(atexit_handler) diff --git a/fence/agents/ipdu/fence_ipdu.py b/fence/agents/ipdu/fence_ipdu.py index 6c93b53..d133832 100644 --- a/fence/agents/ipdu/fence_ipdu.py +++ b/fence/agents/ipdu/fence_ipdu.py @@ -125,11 +125,8 @@ def get_outlets_status(conn, options): # Main agent method def main(): - device_opt = [ "ipaddr", "login", "passwd", "passwd_script", - "test", "port", "separator", "no_login", "no_password", - "snmp_version", "community", "snmp_auth_prot", "snmp_sec_level", - "snmp_priv_prot", "snmp_priv_passwd", "snmp_priv_passwd_script", - "udpport", "inet4_only", "inet6_only" ] + device_opt = [ "ipaddr", "udpport", "login", "passwd", "no_login", "no_password", \ + "test", "port", "snmp_version", "community" ] atexit.register(atexit_handler) diff --git a/fence/agents/ldom/fence_ldom.py b/fence/agents/ldom/fence_ldom.py index 0f41d75..eabdaf4 100644 --- a/fence/agents/ldom/fence_ldom.py +++ b/fence/agents/ldom/fence_ldom.py @@ -69,9 +69,8 @@ def set_power_status(conn, options): conn.log_expect(options, COMMAND_PROMPT_REG, int(options["--power-timeout"])) def main(): - device_opt = [ "ipaddr", "login", "passwd", "passwd_script", - "secure", "identity_file", "test" , "port", "cmd_prompt", - "separator", "inet4_only", "inet6_only", "ipport" ] + device_opt = [ "ipaddr", "ipport", "login", "passwd", "cmd_prompt", "secure", \ + "port", "test" ] atexit.register(atexit_handler) diff --git a/fence/agents/lib/fencing.py.py b/fence/agents/lib/fencing.py.py index 775bb4f..9affaa8 100644 --- a/fence/agents/lib/fencing.py.py +++ b/fence/agents/lib/fencing.py.py @@ -401,8 +401,17 @@ all_opt = { "order" : 205} } -COMMON_OPT = [ "help", "debug", "verbose", "quiet", "version", "action", "agent", - "power_timeout", "shell_timeout", "login_timeout", "power_wait", "retry_on", "delay" ] +# options which are added automatically if 'key' is encountered ("default" is always added) +DEPENDENCY_OPT = { + "default" : [ "help", "debug", "verbose", "quiet", "version", "action", "agent", \ + "power_timeout", "shell_timeout", "login_timeout", "power_wait", "retry_on", "delay" ], + "passwd" : [ "passwd_script" ], + "secure" : [ "identity_file" ], + "ipaddr" : [ "inet4_only", "inet6_only" ], + "port" : [ "separator" ], + "community" : [ "snmp_auth_prot", "snmp_sec_level", "snmp_priv_prot", \ + "snmp_priv_passwd", "snmp_priv_passwd_script" ] + } class fspawn(pexpect.spawn): def __init__(self, options, command): @@ -427,6 +436,15 @@ def atexit_handler(): sys.stderr.write("%s failed to close standard output\n"%(sys.argv[0])) sys.exit(EC_GENERIC_ERROR) +def add_dependency_options(options): + ## Add options which are available for every fence agent + added_opt = [] + for x in options + ["default"]: + if DEPENDENCY_OPT.has_key(x): + added_opt.extend([y for y in DEPENDENCY_OPT[x] if options.count(y) == 0]) + return added_opt + + def version(command, release, build_date, copyright_notice): print command, " ", release, " ", build_date if len(copyright_notice) > 0: @@ -527,10 +545,7 @@ def metadata(avail_opt, options, docs): print "</resource-agent>" def process_input(avail_opt): - ## - ## Add options which are available for every fence agent - ##### - avail_opt.extend(COMMON_OPT) + avail_opt.extend(add_dependency_options(avail_opt)) ## ## Set standard environment @@ -641,10 +656,8 @@ def process_input(avail_opt): ## password script to set a correct password ###### def check_input(device_opt, opt): - ## - ## Add options which are available for every fence agent - ##### - device_opt.extend([x for x in COMMON_OPT if device_opt.count(x) == 0]) + + device_opt.extend(add_dependency_options(device_opt)) options = dict(opt) options["device_opt"] = device_opt diff --git a/fence/agents/lpar/fence_lpar.py b/fence/agents/lpar/fence_lpar.py index 252a659..5cedc24 100644 --- a/fence/agents/lpar/fence_lpar.py +++ b/fence/agents/lpar/fence_lpar.py @@ -100,9 +100,8 @@ def get_lpar_list(conn, options): return outlets def main(): - device_opt = [ "ipaddr", "login", "passwd", "passwd_script", "secure", - "identity_file", "partition", "managed", "hmc_version", "cmd_prompt", - "separator", "inet4_only", "inet6_only", "ipport" ] + device_opt = [ "ipaddr", "ipport", "login", "passwd", "secure", "cmd_prompt", \ + "partition", "managed", "hmc_version" ] atexit.register(atexit_handler) diff --git a/fence/agents/rhevm/fence_rhevm.py b/fence/agents/rhevm/fence_rhevm.py index fb97d51..0d4de57 100644 --- a/fence/agents/rhevm/fence_rhevm.py +++ b/fence/agents/rhevm/fence_rhevm.py @@ -101,8 +101,7 @@ def send_command(opt, command, method = "GET"): return result def main(): - device_opt = [ "ipaddr", "login", "passwd", "passwd_script", "ssl", - "inet4_only", "inet6_only", "ipport", "port", "web", "separator" ] + device_opt = [ "ipaddr", "ipport", "login", "passwd", "ssl", "web", "port" ] atexit.register(atexit_handler) diff --git a/fence/agents/rsa/fence_rsa.py b/fence/agents/rsa/fence_rsa.py index 578e34d..14ec88f 100644 --- a/fence/agents/rsa/fence_rsa.py +++ b/fence/agents/rsa/fence_rsa.py @@ -34,8 +34,7 @@ def set_power_status(conn, options): conn.log_expect(options, options["--command-prompt"], int(options["--power-timeout"])) def main(): - device_opt = [ "ipaddr", "login", "passwd", "passwd_script", - "cmd_prompt", "secure", "identity_file", "ipport" ] + device_opt = [ "ipaddr", "ipport", "login", "passwd", "cmd_prompt", "secure" ] atexit.register(atexit_handler) diff --git a/fence/agents/rsb/fence_rsb.py b/fence/agents/rsb/fence_rsb.py index 87ed53a..45a0c06 100755 --- a/fence/agents/rsb/fence_rsb.py +++ b/fence/agents/rsb/fence_rsb.py @@ -37,9 +37,7 @@ def set_power_status(conn, options): conn.log_expect(options, options["--command-prompt"], int(options["--shell-timeout"])) def main(): - device_opt = [ "ipaddr", "login", "passwd", "passwd_script", - "secure", "identity_file", "separator", "cmd_prompt", - "inet4_only", "inet6_only", "ipport", "telnet_port" ] + device_opt = [ "ipaddr", "ipport", "telnet_port", "login", "passwd", "secure", "cmd_prompt" ] atexit.register(atexit_handler) all_opt["telnet_port"] = { diff --git a/fence/agents/sanbox2/fence_sanbox2.py b/fence/agents/sanbox2/fence_sanbox2.py index ccbfd8e..94353fe 100644 --- a/fence/agents/sanbox2/fence_sanbox2.py +++ b/fence/agents/sanbox2/fence_sanbox2.py @@ -100,8 +100,7 @@ def get_list_devices(conn, options): return outlets def main(): - device_opt = [ "fabric_fencing", "ipaddr", "login", "passwd", "passwd_script", - "cmd_prompt", "port", "ipport", "separator" ] + device_opt = [ "fabric_fencing", "ipaddr", "ipport", "login", "passwd", "cmd_prompt", "port" ] atexit.register(atexit_handler) diff --git a/fence/agents/virsh/fence_virsh.py b/fence/agents/virsh/fence_virsh.py index 113de8f..2e1474a 100644 --- a/fence/agents/virsh/fence_virsh.py +++ b/fence/agents/virsh/fence_virsh.py @@ -59,9 +59,8 @@ def set_power_status(conn, options): time.sleep(1) def main(): - device_opt = [ "ipaddr", "login", "passwd", "passwd_script", "cmd_prompt", - "secure", "identity_file", "test", "port", "separator", - "inet4_only", "inet6_only", "ipport", "sudo" ] + device_opt = [ "ipaddr", "ipport", "login", "passwd", "cmd_prompt", "secure", \ + "test", "port", "sudo" ] atexit.register(atexit_handler) diff --git a/fence/agents/vmware/fence_vmware.py b/fence/agents/vmware/fence_vmware.py index 8524480..b92b409 100644 --- a/fence/agents/vmware/fence_vmware.py +++ b/fence/agents/vmware/fence_vmware.py @@ -280,9 +280,8 @@ def vmware_check_vmware_type(options): # Main agent method def main(): - device_opt = [ "ipaddr", "login", "passwd", "passwd_script", - "test", "port", "separator", "exec", "vmware_type", - "vmware_datacenter", "secure", "identity_file" ] + device_opt = [ "ipaddr", "login", "passwd", "secure", + "test", "exec", "vmware_type", "vmware_datacenter"] atexit.register(atexit_handler) diff --git a/fence/agents/vmware_soap/fence_vmware_soap.py b/fence/agents/vmware_soap/fence_vmware_soap.py index 4ef03f0..9eef969 100644 --- a/fence/agents/vmware_soap/fence_vmware_soap.py +++ b/fence/agents/vmware_soap/fence_vmware_soap.py @@ -156,8 +156,7 @@ def set_power_status(conn, options): conn.service.PowerOffVM_Task(mo_machine) def main(): - device_opt = [ "ipaddr", "login", "passwd", "passwd_script", - "ssl", "port", "uuid", "separator", "ipport" ] + device_opt = [ "ipaddr", "ipport", "login", "passwd", "ssl", "port", "uuid" ] atexit.register(atexit_handler) diff --git a/fence/agents/wti/fence_wti.py b/fence/agents/wti/fence_wti.py index 063352e..76c0f26 100644 --- a/fence/agents/wti/fence_wti.py +++ b/fence/agents/wti/fence_wti.py @@ -82,9 +82,8 @@ def set_power_status(conn, options): conn.log_expect(options, options["--command-prompt"], int(options["--power-timeout"])) def main(): - device_opt = [ "ipaddr", "login", "passwd", "passwd_script", - "cmd_prompt", "secure", "identity_file", "port", "no_login", "no_password", - "test", "separator", "inet4_only", "inet6_only", "ipport" ] + device_opt = [ "ipaddr", "ipport", "login", "passwd", "no_login", "no_password", \ + "cmd_prompt", "secure", "port", "test" ] atexit.register(atexit_handler) diff --git a/fence/agents/xenapi/fence_xenapi.py b/fence/agents/xenapi/fence_xenapi.py index 599f7a5..51ebf52 100644 --- a/fence/agents/xenapi/fence_xenapi.py +++ b/fence/agents/xenapi/fence_xenapi.py @@ -200,8 +200,8 @@ def return_vm_reference(session, options): def main(): - device_opt = [ "login", "passwd", "passwd_script", "port", "test", "separator", - "no_login", "no_password", "session_url", "uuid" ] + device_opt = [ "login", "passwd", "port", "no_login", "no_password", "session_url", + "test", "uuid" ] atexit.register(atexit_handler)

1 0

fence-agents: master - fencing: UUID can be entered also as port number (-n / --plug / port)
by Marek Grác 17 Nov '12

17 Nov '12

Gitweb: http://git.fedorahosted.org/git/?p=fence-agents.git;a=commitdiff;h=0c8c31cd… Commit: 0c8c31cdd25dc49d33a897bf6ad1c7d3c5f7b36a Parent: 0cda864a22c34d87537f9bbaf1b7f51744894c05 Author: Marek 'marx' Grac <mgrac(a)redhat.com> AuthorDate: Tue Nov 13 18:58:27 2012 +0100 Committer: Marek 'marx' Grac <mgrac(a)redhat.com> CommitterDate: Tue Nov 13 18:58:27 2012 +0100 fencing: UUID can be entered also as port number (-n / --plug / port) UUID is automatically detected using uuid library and we do not need a special option/argument for it anymore. (--uuid is still supported) --- fence/agents/lib/fencing.py.py | 23 +++++++++++++++++------ 1 files changed, 17 insertions(+), 6 deletions(-) diff --git a/fence/agents/lib/fencing.py.py b/fence/agents/lib/fencing.py.py index 0041846..775bb4f 100644 --- a/fence/agents/lib/fencing.py.py +++ b/fence/agents/lib/fencing.py.py @@ -1,6 +1,6 @@ #!/usr/bin/python -import sys, getopt, time, os +import sys, getopt, time, os, uuid import pexpect, re, atexit import __main__ @@ -194,10 +194,10 @@ all_opt = { "port" : { "getopt" : "n:", "longopt" : "plug", - "help" : "-n, --plug=<id> Physical plug number on device or\n" + - " name of virtual machine", + "help" : "-n, --plug=<id> Physical plug number on device, \n" + + " name of virtual machine or UUID", "required" : "1", - "shortdesc" : "Physical plug number or name of virtual machine", + "shortdesc" : "Physical plug number, name of virtual machine or UUID", "order" : 1 }, "switch" : { "getopt" : "s:", @@ -697,6 +697,17 @@ def check_input(device_opt, opt): options["--action"] = "on" if options["--action"] == "disable": options["--action"] = "off" + + # UUID is now only alias for --plug; because we can detect it automatically + if options.has_key("--uuid"): + options["--plug"] == options["--uuid"] + del options["--uuid"] + + ## automatic detection and set of valid UUID from --plug + try: + options["--uuid"] = str(uuid.UUID(options["--plug"])) + except ValueError: + pass if (0 == options.has_key("--username")) and device_opt.count("login") and (device_opt.count("no_login") == 0): fail_usage("Failed: You have to set login name") @@ -720,7 +731,7 @@ def check_input(device_opt, opt): fail_usage("Failed: Identity file " + options["--identity-file"] + " does not exist") if (0 == ["list", "monitor"].count(options["--action"].lower())) and \ - (0 == options.has_key("--plug") and 0 == options.has_key("--uuid")) and (device_opt.count("port")): + 0 == options.has_key("--plug") and device_opt.count("port"): fail_usage("Failed: You have to enter plug number") if options.has_key("--password-script"): @@ -789,7 +800,7 @@ def fence_action(tn, options, set_power_fn, get_power_fn, get_outlet_list = None ##### if (options["--action"] == "list") and \ 0 == options["device_opt"].count("port") and 0 == options["device_opt"].count("partition") and \ - 0 == options["device_opt"].count("uuid") and 0 == options["device_opt"].count("module_name"): + 0 == options["device_opt"].count("module_name"): print "N/A" return elif (options["--action"] == "list" and get_outlet_list == None):

1 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

cluster-commits November 2012