|
 |
035a21 |
diff -uNr a/fence/agents/ipmilan/fence_ipmilan.py b/fence/agents/ipmilan/fence_ipmilan.py
|
|
|
035a21 |
--- a/fence/agents/ipmilan/fence_ipmilan.py 2017-09-29 13:16:33.097610593 +0200
|
|
|
035a21 |
+++ b/fence/agents/ipmilan/fence_ipmilan.py 2017-09-29 13:30:15.340293733 +0200
|
|
|
035a21 |
@@ -72,6 +72,9 @@
|
|
|
035a21 |
if options.has_key("--privlvl"):
|
|
|
035a21 |
cmd += " -L " + options["--privlvl"]
|
|
|
035a21 |
|
|
|
035a21 |
+ if "--hexadecimal-kg" in options:
|
|
|
035a21 |
+ cmd += " -y " + options["--hexadecimal-kg"]
|
|
|
035a21 |
+
|
|
|
035a21 |
# --action / -o
|
|
|
035a21 |
cmd += " chassis power " + action
|
|
|
035a21 |
|
|
|
035a21 |
@@ -136,6 +139,14 @@
|
|
|
035a21 |
"shortdesc" : "Bridge IPMI requests to the remote target address",
|
|
|
035a21 |
"order": 1
|
|
|
035a21 |
}
|
|
|
035a21 |
+ all_opt["hexadecimal_kg"] = {
|
|
|
035a21 |
+ "getopt" : ":",
|
|
|
035a21 |
+ "longopt" : "hexadecimal-kg",
|
|
|
035a21 |
+ "help" : "--hexadecimal-kg=[key] Hexadecimal-encoded Kg key for IPMIv2 authentication",
|
|
|
035a21 |
+ "required" : "0",
|
|
|
035a21 |
+ "shortdesc" : "Hexadecimal-encoded Kg key for IPMIv2 authentication",
|
|
|
035a21 |
+ "order": 1
|
|
|
035a21 |
+ }
|
|
|
035a21 |
all_opt["obsolete_ip"] = {
|
|
|
035a21 |
"getopt" : "i:",
|
|
|
035a21 |
"longopt" : "obsolete-ip",
|
|
|
035a21 |
@@ -156,7 +167,7 @@
|
|
|
035a21 |
|
|
|
035a21 |
device_opt = ["ipaddr", "login", "no_login", "no_password", "passwd",
|
|
|
035a21 |
"diag", "lanplus", "auth", "cipher", "privlvl", "sudo",
|
|
|
035a21 |
- "ipmitool_path", "method", "target", "obsolete_ip", "timeout"]
|
|
|
035a21 |
+ "ipmitool_path", "method", "target", "hexadecimal_kg", "obsolete_ip", "timeout"]
|
|
|
035a21 |
define_new_opts()
|
|
|
035a21 |
|
|
|
035a21 |
all_opt["power_wait"]["default"] = 2
|
|
|
035a21 |
diff -uNr a/tests/data/metadata/fence_idrac.xml b/tests/data/metadata/fence_idrac.xml
|
|
|
035a21 |
--- a/tests/data/metadata/fence_idrac.xml 2017-09-29 13:16:33.133610272 +0200
|
|
|
035a21 |
+++ b/tests/data/metadata/fence_idrac.xml 2017-09-29 13:59:22.124806409 +0200
|
|
|
035a21 |
@@ -12,6 +12,11 @@
|
|
|
035a21 |
<content type="integer" default="623" />
|
|
|
035a21 |
<shortdesc lang="en">TCP/UDP port to use for connection with device</shortdesc>
|
|
|
035a21 |
</parameter>
|
|
|
035a21 |
+ <parameter name="hexadecimal_kg" unique="0" required="0">
|
|
|
035a21 |
+ <getopt mixed="--hexadecimal-kg=[key]" />
|
|
|
035a21 |
+ <content type="string" />
|
|
|
035a21 |
+ <shortdesc lang="en">Hexadecimal-encoded Kg key for IPMIv2 authentication</shortdesc>
|
|
|
035a21 |
+ </parameter>
|
|
|
035a21 |
<parameter name="port" unique="0" required="0" deprecated="1">
|
|
|
035a21 |
<getopt mixed="-n, --plug=[ip]" />
|
|
|
035a21 |
<content type="string" />
|
|
|
035a21 |
diff -uNr a/tests/data/metadata/fence_ilo3.xml b/tests/data/metadata/fence_ilo3.xml
|
|
|
035a21 |
--- a/tests/data/metadata/fence_ilo3.xml 2017-09-29 13:16:33.133610272 +0200
|
|
|
035a21 |
+++ b/tests/data/metadata/fence_ilo3.xml 2017-09-29 13:59:22.123806418 +0200
|
|
|
035a21 |
@@ -12,6 +12,11 @@
|
|
|
035a21 |
<content type="integer" default="623" />
|
|
|
035a21 |
<shortdesc lang="en">TCP/UDP port to use for connection with device</shortdesc>
|
|
|
035a21 |
</parameter>
|
|
|
035a21 |
+ <parameter name="hexadecimal_kg" unique="0" required="0">
|
|
|
035a21 |
+ <getopt mixed="--hexadecimal-kg=[key]" />
|
|
|
035a21 |
+ <content type="string" />
|
|
|
035a21 |
+ <shortdesc lang="en">Hexadecimal-encoded Kg key for IPMIv2 authentication</shortdesc>
|
|
|
035a21 |
+ </parameter>
|
|
|
035a21 |
<parameter name="port" unique="0" required="0" deprecated="1">
|
|
|
035a21 |
<getopt mixed="-n, --plug=[ip]" />
|
|
|
035a21 |
<content type="string" />
|
|
|
035a21 |
diff -uNr a/tests/data/metadata/fence_ilo4.xml b/tests/data/metadata/fence_ilo4.xml
|
|
|
035a21 |
--- a/tests/data/metadata/fence_ilo4.xml 2017-09-29 13:16:33.134610263 +0200
|
|
|
035a21 |
+++ b/tests/data/metadata/fence_ilo4.xml 2017-09-29 13:59:22.123806418 +0200
|
|
|
035a21 |
@@ -12,6 +12,11 @@
|
|
|
035a21 |
<content type="integer" default="623" />
|
|
|
035a21 |
<shortdesc lang="en">TCP/UDP port to use for connection with device</shortdesc>
|
|
|
035a21 |
</parameter>
|
|
|
035a21 |
+ <parameter name="hexadecimal_kg" unique="0" required="0">
|
|
|
035a21 |
+ <getopt mixed="--hexadecimal-kg=[key]" />
|
|
|
035a21 |
+ <content type="string" />
|
|
|
035a21 |
+ <shortdesc lang="en">Hexadecimal-encoded Kg key for IPMIv2 authentication</shortdesc>
|
|
|
035a21 |
+ </parameter>
|
|
|
035a21 |
<parameter name="port" unique="0" required="0" deprecated="1">
|
|
|
035a21 |
<getopt mixed="-n, --plug=[ip]" />
|
|
|
035a21 |
<content type="string" />
|
|
|
035a21 |
diff -uNr a/tests/data/metadata/fence_imm.xml b/tests/data/metadata/fence_imm.xml
|
|
|
035a21 |
--- a/tests/data/metadata/fence_imm.xml 2017-09-29 13:16:33.134610263 +0200
|
|
|
035a21 |
+++ b/tests/data/metadata/fence_imm.xml 2017-09-29 13:59:22.123806418 +0200
|
|
|
035a21 |
@@ -12,6 +12,11 @@
|
|
|
035a21 |
<content type="integer" default="623" />
|
|
|
035a21 |
<shortdesc lang="en">TCP/UDP port to use for connection with device</shortdesc>
|
|
|
035a21 |
</parameter>
|
|
|
035a21 |
+ <parameter name="hexadecimal_kg" unique="0" required="0">
|
|
|
035a21 |
+ <getopt mixed="--hexadecimal-kg=[key]" />
|
|
|
035a21 |
+ <content type="string" />
|
|
|
035a21 |
+ <shortdesc lang="en">Hexadecimal-encoded Kg key for IPMIv2 authentication</shortdesc>
|
|
|
035a21 |
+ </parameter>
|
|
|
035a21 |
<parameter name="port" unique="0" required="0" deprecated="1">
|
|
|
035a21 |
<getopt mixed="-n, --plug=[ip]" />
|
|
|
035a21 |
<content type="string" />
|
|
|
035a21 |
diff -uNr a/tests/data/metadata/fence_ipmilan.xml b/tests/data/metadata/fence_ipmilan.xml
|
|
|
035a21 |
--- a/tests/data/metadata/fence_ipmilan.xml 2017-09-29 13:16:33.134610263 +0200
|
|
|
035a21 |
+++ b/tests/data/metadata/fence_ipmilan.xml 2017-09-29 13:35:55.835265303 +0200
|
|
|
035a21 |
@@ -12,6 +12,11 @@
|
|
|
035a21 |
<content type="integer" default="623" />
|
|
|
035a21 |
<shortdesc lang="en">TCP/UDP port to use for connection with device</shortdesc>
|
|
|
035a21 |
</parameter>
|
|
|
035a21 |
+ <parameter name="hexadecimal_kg" unique="0" required="0">
|
|
|
035a21 |
+ <getopt mixed="--hexadecimal-kg=[key]" />
|
|
|
035a21 |
+ <content type="string" />
|
|
|
035a21 |
+ <shortdesc lang="en">Hexadecimal-encoded Kg key for IPMIv2 authentication</shortdesc>
|
|
|
035a21 |
+ </parameter>
|
|
|
035a21 |
<parameter name="port" unique="0" required="0" deprecated="1">
|
|
|
035a21 |
<getopt mixed="-n, --plug=[ip]" />
|
|
|
035a21 |
<content type="string" />
|