Gitweb: http://git.fedorahosted.org/git/?p=fence-agents.git;a=commitdiff;h=4b05b5ae2... Commit: 4b05b5ae21409b7c86c32062aa34b93de02c8974 Parent: 6692c808071fc1c61389277eefabde44cc31ae37 Author: Marek 'marx' Grac mgrac@redhat.com AuthorDate: Wed Apr 23 17:58:03 2014 +0200 Committer: Marek 'marx' Grac mgrac@redhat.com CommitterDate: Mon May 5 12:02:21 2014 +0200
[cleanup] function array_to_dict() from agents to library
--- fence/agents/cisco_mds/fence_cisco_mds.py | 7 +------ fence/agents/ifmib/fence_ifmib.py | 7 +------ fence/agents/lib/fencing.py.py | 5 +++++ 3 files changed, 7 insertions(+), 12 deletions(-)
diff --git a/fence/agents/cisco_mds/fence_cisco_mds.py b/fence/agents/cisco_mds/fence_cisco_mds.py index 82b28a0..22f1143 100644 --- a/fence/agents/cisco_mds/fence_cisco_mds.py +++ b/fence/agents/cisco_mds/fence_cisco_mds.py @@ -10,7 +10,7 @@ import sys, re import atexit sys.path.append("@FENCEAGENTSLIBDIR@") from fencing import * -from fencing import fail_usage +from fencing import fail_usage, array_to_dict from fencing_snmp import FencingSnmp
#BEGIN_VERSION_GENERATION @@ -51,11 +51,6 @@ def get_power_status(conn, options): def set_power_status(conn, options): conn.set(PORT_OID, (options["--action"]=="on" and 1 or 2))
-# Convert array of format [[key1, value1], [key2, value2], ... [keyN, valueN]] to dict, where key is -# in format a.b.c.d...z and returned dict has key only z -def array_to_dict(ar): - return dict([[x[0].split(".")[-1], x[1]] for x in ar]) - def get_outlets_status(conn, options): result = {}
diff --git a/fence/agents/ifmib/fence_ifmib.py b/fence/agents/ifmib/fence_ifmib.py index 04edbf9..e8eff1b 100644 --- a/fence/agents/ifmib/fence_ifmib.py +++ b/fence/agents/ifmib/fence_ifmib.py @@ -12,7 +12,7 @@ import sys import atexit sys.path.append("@FENCEAGENTSLIBDIR@") from fencing import * -from fencing import fail_usage +from fencing import fail_usage, array_to_dict from fencing_snmp import FencingSnmp
#BEGIN_VERSION_GENERATION @@ -74,11 +74,6 @@ def set_power_status(conn, options):
conn.set("%s.%d"%(STATUSES_OID, port_num), (options["--action"]=="on" and STATUS_UP or STATUS_DOWN))
-# Convert array of format [[key1, value1], [key2, value2], ... [keyN, valueN]] to dict, where key is -# in format a.b.c.d...z and returned dict has key only z -def array_to_dict(ar): - return dict([[x[0].split(".")[-1], x[1]] for x in ar]) - def get_outlets_status(conn, options): result = {}
diff --git a/fence/agents/lib/fencing.py.py b/fence/agents/lib/fencing.py.py index c366423..3e5c788 100644 --- a/fence/agents/lib/fencing.py.py +++ b/fence/agents/lib/fencing.py.py @@ -1148,3 +1148,8 @@ def fence_logout(conn, logout_string, sleep=0): pass except pexpect.ExceptionPexpect: pass + +# Convert array of format [[key1, value1], [key2, value2], ... [keyN, valueN]] to dict, where key is +# in format a.b.c.d...z and returned dict has key only z +def array_to_dict(ar): + return dict([[x[0].split(".")[-1], x[1]] for x in ar])