fence-agents: master - [cleanup] Remove unused arguments
Marek GrĂ¡c
marx at fedoraproject.org
Wed Apr 9 14:50:06 UTC 2014
Gitweb: http://git.fedorahosted.org/git/?p=fence-agents.git;a=commitdiff;h=6eaabc97fd4265c94f22640ddad3b97b0416a632
Commit: 6eaabc97fd4265c94f22640ddad3b97b0416a632
Parent: 91dcb051959c5e70094cbb3c5b5243e4a328d8bc
Author: Marek 'marx' Grac <mgrac at redhat.com>
AuthorDate: Mon Mar 31 14:47:57 2014 +0200
Committer: Marek 'marx' Grac <mgrac at redhat.com>
CommitterDate: Wed Apr 9 16:30:12 2014 +0200
[cleanup] Remove unused arguments
Arguments 'options' which will be used instead of global variables are left untouched
so that this problem is visible.
---
fence/agents/apc_snmp/fence_apc_snmp.py | 6 +++---
fence/agents/cisco_ucs/fence_cisco_ucs.py | 5 +++++
fence/agents/dummy/fence_dummy.py | 7 +++++++
fence/agents/eaton_snmp/fence_eaton_snmp.py | 6 +++---
fence/agents/eps/fence_eps.py | 2 ++
fence/agents/rhevm/fence_rhevm.py | 4 ++++
fence/agents/vmware/fence_vmware.py | 12 ++++++++----
7 files changed, 32 insertions(+), 10 deletions(-)
diff --git a/fence/agents/apc_snmp/fence_apc_snmp.py b/fence/agents/apc_snmp/fence_apc_snmp.py
index 29aafe6..d91e9e9 100644
--- a/fence/agents/apc_snmp/fence_apc_snmp.py
+++ b/fence/agents/apc_snmp/fence_apc_snmp.py
@@ -87,7 +87,7 @@ class ApcMS:
has_switches = False
### FUNCTIONS ###
-def apc_set_device(conn, options):
+def apc_set_device(conn):
global device
agents_dir = {'.1.3.6.1.4.1.318.1.3.4.5':ApcRPDU,
@@ -109,7 +109,7 @@ def apc_resolv_port_id(conn, options):
global port_id, switch_id
if (device == None):
- apc_set_device(conn, options)
+ apc_set_device(conn)
# Now we resolv port_id/switch_id
if ((options["--plug"].isdigit()) and ((not device.has_switches) or (options["--switch"].isdigit()))):
@@ -154,7 +154,7 @@ def get_outlets_status(conn, options):
result = {}
if (device == None):
- apc_set_device(conn, options)
+ apc_set_device(conn)
res_ports = conn.walk(device.outlet_table_oid, 30)
diff --git a/fence/agents/cisco_ucs/fence_cisco_ucs.py b/fence/agents/cisco_ucs/fence_cisco_ucs.py
index d2777de..a9ca8fe 100644
--- a/fence/agents/cisco_ucs/fence_cisco_ucs.py
+++ b/fence/agents/cisco_ucs/fence_cisco_ucs.py
@@ -21,6 +21,8 @@ RE_GET_DN = re.compile(" dn=\"(.*?)\"", re.IGNORECASE)
RE_GET_DESC = re.compile(" descr=\"(.*?)\"", re.IGNORECASE)
def get_power_status(conn, options):
+ del conn
+
res = send_command(options, "<configResolveDn cookie=\"" + options["cookie"] +
"\" inHierarchical=\"false\" dn=\"org-root" + options["--suborg"] + "/ls-" +
options["--plug"] + "/power\"/>", int(options["--shell-timeout"]))
@@ -37,6 +39,8 @@ def get_power_status(conn, options):
return "off"
def set_power_status(conn, options):
+ del conn
+
action = {
'on' : "up",
'off' : "down"
@@ -51,6 +55,7 @@ def set_power_status(conn, options):
return
def get_list(conn, options):
+ del conn
outlets = { }
try:
diff --git a/fence/agents/dummy/fence_dummy.py b/fence/agents/dummy/fence_dummy.py
index ff67e7b..aa1e5c2 100644
--- a/fence/agents/dummy/fence_dummy.py
+++ b/fence/agents/dummy/fence_dummy.py
@@ -17,6 +17,8 @@ BUILD_DATE=""
plug_status = "on"
def get_power_status_file(conn, options):
+ del conn
+
try:
status_file = open(options["--status-file"], 'r')
except:
@@ -28,6 +30,8 @@ def get_power_status_file(conn, options):
return status.lower()
def set_power_status_file(conn, options):
+ del conn
+
if not (options["--action"] in [ "on", "off" ]):
return
@@ -45,12 +49,15 @@ def get_power_status_fail(conn, options):
def set_power_status_fail(conn, options):
global plug_status
+ del conn
plug_status = "unknown"
if options["--action"] == "on":
plug_status = "off"
def get_outlets_fail(conn, options):
+ del conn
+
result = {}
global plug_status
diff --git a/fence/agents/eaton_snmp/fence_eaton_snmp.py b/fence/agents/eaton_snmp/fence_eaton_snmp.py
index 970fd69..9688516 100644
--- a/fence/agents/eaton_snmp/fence_eaton_snmp.py
+++ b/fence/agents/eaton_snmp/fence_eaton_snmp.py
@@ -65,7 +65,7 @@ class EatonSwitchedePDU:
has_switches = False
### FUNCTIONS ###
-def eaton_set_device(conn, options):
+def eaton_set_device(conn):
global device
agents_dir = {'.1.3.6.1.4.1.534.6.6.6':EatonManagedePDU,
@@ -86,7 +86,7 @@ def eaton_resolv_port_id(conn, options):
global port_id, switch_id
if (device==None):
- eaton_set_device(conn, options)
+ eaton_set_device(conn)
# Restore the increment, that was removed in main for ePDU Managed
if (device.ident_str == "Eaton Switched ePDU"):
@@ -165,7 +165,7 @@ def get_outlets_status(conn, options):
result = {}
if (device==None):
- eaton_set_device(conn, options)
+ eaton_set_device(conn)
res_ports = conn.walk(device.outlet_table_oid, 30)
diff --git a/fence/agents/eps/fence_eps.py b/fence/agents/eps/fence_eps.py
index 0d9e573..3a52b3c 100644
--- a/fence/agents/eps/fence_eps.py
+++ b/fence/agents/eps/fence_eps.py
@@ -63,6 +63,7 @@ def eps_run_command(options, params):
return result
def get_power_status(conn, options):
+ del conn
ret_val = eps_run_command(options,"")
result = {}
@@ -79,6 +80,7 @@ def get_power_status(conn, options):
return result
def set_power_status(conn, options):
+ del conn
eps_run_command(options, "P%s=%s"%(options["--plug"], (options["--action"]=="on" and "1" or "0")))
# Define new option
diff --git a/fence/agents/rhevm/fence_rhevm.py b/fence/agents/rhevm/fence_rhevm.py
index c8760d9..8efdc45 100644
--- a/fence/agents/rhevm/fence_rhevm.py
+++ b/fence/agents/rhevm/fence_rhevm.py
@@ -20,6 +20,8 @@ RE_STATUS = re.compile("<state>(.*?)</state>", re.IGNORECASE)
RE_GET_NAME = re.compile("<name>(.*?)</name>", re.IGNORECASE)
def get_power_status(conn, options):
+ del conn
+
### Obtain real ID from name
res = send_command(options, "vms/?search=name%3D" + options["--plug"])
@@ -45,6 +47,7 @@ def get_power_status(conn, options):
return "on"
def set_power_status(conn, options):
+ del conn
action = {
'on' : "start",
'off' : "stop"
@@ -54,6 +57,7 @@ def set_power_status(conn, options):
send_command(options, url, "POST")
def get_list(conn, options):
+ del conn
outlets = { }
try:
diff --git a/fence/agents/vmware/fence_vmware.py b/fence/agents/vmware/fence_vmware.py
index f645650..c9310fb 100644
--- a/fence/agents/vmware/fence_vmware.py
+++ b/fence/agents/vmware/fence_vmware.py
@@ -168,7 +168,7 @@ def vmware_run_command(options, add_login_params, additional_params, additional_
# Get outlet list with status as hash table. If you will use add_vm_name, only VM with vmname is
# returned. This is used in get_status function
-def vmware_get_outlets_vi(conn, options, add_vm_name):
+def vmware_get_outlets_vi(options, add_vm_name):
outlets = {}
if (add_vm_name):
@@ -195,7 +195,7 @@ def vmware_get_outlets_vi(conn, options, add_vm_name):
return outlets
# Get outlet list with status as hash table.
-def vmware_get_outlets_vix(conn, options):
+def vmware_get_outlets_vix(options):
outlets = {}
running_machines = vmware_run_command(options, True, "list", 0)
@@ -214,10 +214,12 @@ def vmware_get_outlets_vix(conn, options):
return outlets
def get_outlets_status(conn, options):
+ del conn
+
if (vmware_internal_type==VMWARE_TYPE_ESX):
- return vmware_get_outlets_vi(conn, options, False)
+ return vmware_get_outlets_vi(options, False)
if ((vmware_internal_type==VMWARE_TYPE_SERVER1) or (vmware_internal_type==VMWARE_TYPE_SERVER2)):
- return vmware_get_outlets_vix(conn, options)
+ return vmware_get_outlets_vix(options)
def get_power_status(conn, options):
if (vmware_internal_type==VMWARE_TYPE_ESX):
@@ -234,6 +236,8 @@ def get_power_status(conn, options):
return ((options["--plug"] in outlets) and "on" or "off")
def set_power_status(conn, options):
+ del conn
+
if (vmware_internal_type==VMWARE_TYPE_ESX):
additional_params = "--operation %s --vmname '%s'" % \
((options["--action"]=="on" and "on" or "off"), quote_for_run(options["--plug"]))
More information about the cluster-commits
mailing list