Added IPMI_USER_OPTIONS support to ipmi_client.robot.
- Needed the ability to speficy additional ipmitool options (e.g. -vvv)
to resolve product code defects.
- Also fixed coding-standards compliance violations in the
'Run External IPMI Standard Command' keyword.
- Note: Support for IPMI_USER_OPTIONS is currently provided only in
'Run External IPMI Standard Command' where the need arose. Later
changes can expand this support to other keywords.
Change-Id: I8fb0b05a03a146f48c2d99cac60066493f824a5f
Signed-off-by: Michael Walsh <micwalsh@us.ibm.com>
diff --git a/lib/ipmi_client.robot b/lib/ipmi_client.robot
index 52bd897..bd96c39 100755
--- a/lib/ipmi_client.robot
+++ b/lib/ipmi_client.robot
@@ -15,7 +15,8 @@
${netfnByte}= ${EMPTY}
${cmdByte}= ${EMPTY}
${arrayByte}= array:byte:
-${IPMI_EXT_CMD}= ipmitool -I lanplus -C 3 -P
+${IPMI_EXT_CMD}= ipmitool -I lanplus -C 3
+${IPMI_USER_OPTIONS} ${EMPTY}
${IPMI_INBAND_CMD}= ipmitool -C 3
${HOST}= -H
${RAW}= raw
@@ -104,7 +105,7 @@
Run External IPMI RAW Command
[Arguments] ${args}
${ipmi_raw_cmd}= Catenate SEPARATOR=
- ... ${IPMI_EXT_CMD}${SPACE}${IPMI_PASSWORD}${SPACE}
+ ... ${IPMI_EXT_CMD} -P${SPACE}${IPMI_PASSWORD}${SPACE}
... ${HOST}${SPACE}${OPENBMC_HOST}${SPACE}${RAW}${SPACE}${args}
${rc} ${output}= Run and Return RC and Output ${ipmi_raw_cmd}
Should Be Equal ${rc} ${0} msg=${output}
@@ -112,12 +113,13 @@
Run External IPMI Standard Command
[Arguments] ${args}
- ${ipmi_cmd}= Catenate SEPARATOR=
- ... ${IPMI_EXT_CMD}${SPACE}${IPMI_PASSWORD}${SPACE}
- ... ${HOST}${SPACE}${OPENBMC_HOST}${SPACE}${args}
- ${rc} ${output}= Run and Return RC and Output ${ipmi_cmd}
- Should Be Equal ${rc} ${0} msg=${output}
- [Return] ${output}
+
+ ${ipmi_cmd}= Catenate SEPARATOR=
+ ... ${IPMI_EXT_CMD} ${IPMI_USER_OPTIONS} -P${SPACE}${IPMI_PASSWORD}
+ ... ${SPACE}${HOST}${SPACE}${OPENBMC_HOST}${SPACE}${args}
+ ${rc} ${output}= Run and Return RC and Output ${ipmi_cmd}
+ Should Be Equal ${rc} ${0} msg=${output}
+ [Return] ${output}
Check If IPMI Tool Exist
[Documentation] Check if IPMI Tool installed or not.