Gitweb:
http://git.fedorahosted.org/git/?p=fence-agents.git;a=commitdiff;h=096711...
Commit: 0967113e52b7a4ad1aa67c4bc0bd2ca40a760d03
Parent: ca6c5f27f828a1d99deeb6724b279fa0f29210a0
Author: Marek 'marx' Grac <mgrac(a)redhat.com>
AuthorDate: Thu Feb 26 10:52:03 2015 +0100
Committer: Marek 'marx' Grac <mgrac(a)redhat.com>
CommitterDate: Thu Feb 26 10:52:03 2015 +0100
fencing_snmp: Replace device_opt "community" with "snmp"
Previously, all dependencies of SNMP fence agents were dependant on "community".
What
is quite confusing. This update makes all original depencies + "community" be
dependant
on "snmp".
---
fence/agents/apc_snmp/fence_apc_snmp.py | 2 +-
fence/agents/cisco_mds/fence_cisco_mds.py | 2 +-
fence/agents/eaton_snmp/fence_eaton_snmp.py | 2 +-
fence/agents/emerson/fence_emerson.py | 2 +-
fence/agents/ibmblade/fence_ibmblade.py | 2 +-
fence/agents/ifmib/fence_ifmib.py | 2 +-
fence/agents/intelmodular/fence_intelmodular.py | 2 +-
fence/agents/ipdu/fence_ipdu.py | 2 +-
fence/agents/lib/fencing.py.py | 8 ++++++--
9 files changed, 14 insertions(+), 10 deletions(-)
diff --git a/fence/agents/apc_snmp/fence_apc_snmp.py
b/fence/agents/apc_snmp/fence_apc_snmp.py
index 878ac0a..8bb3d48 100644
--- a/fence/agents/apc_snmp/fence_apc_snmp.py
+++ b/fence/agents/apc_snmp/fence_apc_snmp.py
@@ -187,7 +187,7 @@ def get_outlets_status(conn, options):
# Main agent method
def main():
device_opt = ["ipaddr", "login", "passwd",
"no_login", "no_password", \
- "port", "snmp_version", "community"]
+ "port", "snmp_version", "snmp"]
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 4d2b40c..ba9d917 100644
--- a/fence/agents/cisco_mds/fence_cisco_mds.py
+++ b/fence/agents/cisco_mds/fence_cisco_mds.py
@@ -75,7 +75,7 @@ def main():
global PORT_OID
device_opt = ["fabric_fencing", "ipaddr", "login",
"passwd", "no_login", "no_password", \
- "port", "snmp_version", "community"]
+ "port", "snmp_version", "snmp"]
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 0934d48..812790d 100644
--- a/fence/agents/eaton_snmp/fence_eaton_snmp.py
+++ b/fence/agents/eaton_snmp/fence_eaton_snmp.py
@@ -202,7 +202,7 @@ def get_outlets_status(conn, options):
# Main agent method
def main():
device_opt = ["ipaddr", "login", "passwd",
"no_login", "no_password", \
- "port", "snmp_version", "community"]
+ "port", "snmp_version", "snmp"]
atexit.register(atexit_handler)
diff --git a/fence/agents/emerson/fence_emerson.py
b/fence/agents/emerson/fence_emerson.py
index af7f132..a98351a 100644
--- a/fence/agents/emerson/fence_emerson.py
+++ b/fence/agents/emerson/fence_emerson.py
@@ -46,7 +46,7 @@ def get_outlets_status(conn, _):
def main():
device_opt = ["ipaddr", "login", "passwd",
"no_login", "no_password", \
- "port", "snmp_version", "community"]
+ "port", "snmp_version", "snmp"]
atexit.register(atexit_handler)
diff --git a/fence/agents/ibmblade/fence_ibmblade.py
b/fence/agents/ibmblade/fence_ibmblade.py
index a42fd26..b4810a5 100644
--- a/fence/agents/ibmblade/fence_ibmblade.py
+++ b/fence/agents/ibmblade/fence_ibmblade.py
@@ -53,7 +53,7 @@ def get_outlets_status(conn, _):
# Main agent method
def main():
device_opt = ["ipaddr", "login", "passwd",
"no_login", "no_password", \
- "port", "snmp_version", "community"]
+ "port", "snmp_version", "snmp"]
atexit.register(atexit_handler)
diff --git a/fence/agents/ifmib/fence_ifmib.py b/fence/agents/ifmib/fence_ifmib.py
index a019cec..7df7683 100644
--- a/fence/agents/ifmib/fence_ifmib.py
+++ b/fence/agents/ifmib/fence_ifmib.py
@@ -93,7 +93,7 @@ def get_outlets_status(conn, options):
# Main agent method
def main():
device_opt = ["fabric_fencing", "ipaddr", "login",
"passwd", "no_login", "no_password", \
- "port", "snmp_version", "community"]
+ "port", "snmp_version", "snmp"]
atexit.register(atexit_handler)
diff --git a/fence/agents/intelmodular/fence_intelmodular.py
b/fence/agents/intelmodular/fence_intelmodular.py
index bbb7dd1..e91ccc0 100644
--- a/fence/agents/intelmodular/fence_intelmodular.py
+++ b/fence/agents/intelmodular/fence_intelmodular.py
@@ -64,7 +64,7 @@ def get_outlets_status(conn, options):
# Main agent method
def main():
device_opt = ["ipaddr", "login", "passwd",
"no_login", "no_password",
- "port", "snmp_version", "community"]
+ "port", "snmp_version", "snmp"]
atexit.register(atexit_handler)
diff --git a/fence/agents/ipdu/fence_ipdu.py b/fence/agents/ipdu/fence_ipdu.py
index 351296b..642dc79 100644
--- a/fence/agents/ipdu/fence_ipdu.py
+++ b/fence/agents/ipdu/fence_ipdu.py
@@ -131,7 +131,7 @@ def main():
global device
device_opt = ["ipaddr", "login", "passwd",
"no_login", "no_password", \
- "port", "snmp_version", "community"]
+ "port", "snmp_version", "snmp"]
atexit.register(atexit_handler)
diff --git a/fence/agents/lib/fencing.py.py b/fence/agents/lib/fencing.py.py
index 79b9218..4e68879 100644
--- a/fence/agents/lib/fencing.py.py
+++ b/fence/agents/lib/fencing.py.py
@@ -418,6 +418,10 @@ all_opt = {
"shortdesc" : "Path to sudo binary",
"default" : "@SUDO_PATH@",
"order": 300},
+ "snmp": {
+ "getopt" : "",
+ "help" : "",
+ "order" : 1},
"on_target": {
"getopt" : "",
"help" : "",
@@ -435,8 +439,8 @@ DEPENDENCY_OPT = {
"ipaddr" : ["ipport", "inet4_only",
"inet6_only"],
"port" : ["separator"],
"ssl" : ["ssl_secure", "ssl_insecure",
"gnutlscli_path"],
- "community" : ["snmp_auth_prot", "snmp_sec_level",
"snmp_priv_prot", \
- "snmp_priv_passwd", "snmp_priv_passwd_script"]
+ "snmp" : ["snmp_auth_prot", "snmp_sec_level",
"snmp_priv_prot", \
+ "snmp_priv_passwd", "snmp_priv_passwd_script",
"community"]
}
class fspawn(pexpect.spawn):