commit 20f3bf739b0ab1818813eb895739ce06265fcb87
author Rahul Maheshwari <rahulmaheshwari@in.ibm.com> Tue Dec 18 04:24:20 2018 -0600
committer George Keishing <gkeishin@in.ibm.com> Tue Dec 18 17:03:39 2018 +0000
tree 634689cdebfb394150d750bcb61dd34c546f4a32
parent b3489249ef0c76b9e77fead534973023e3c21b83

Changes to run test with Inband IPMI also

Change-Id: I944d34fa99cb5cf5978b43508014b123826bc2fa
Signed-off-by: Rahul Maheshwari <rahulmaheshwari@in.ibm.com>

lib/ipmi_client.robot

diff --git a/lib/ipmi_client.robot b/lib/ipmi_client.robot
index fc5900d..cadae5e 100755
--- a/lib/ipmi_client.robot
+++ b/lib/ipmi_client.robot
@@ -38,11 +38,16 @@
 
 Run IPMI Standard Command
     [Documentation]  Run the standard IPMI command.
-    [Arguments]  ${args}
+    [Arguments]  ${args}  ${fail_on_err}=${1}
+
+    # Description of argument(s):
+    # args         IPMI command to be executed.
+    # fail_on_err  Fail if keyword the IPMI command fails
+
     ${resp}=  Run Keyword If  '${IPMI_COMMAND}' == 'External'
-    ...  Run External IPMI Standard Command  ${args}
+    ...  Run External IPMI Standard Command  ${args}  ${fail_on_err}
     ...  ELSE IF  '${IPMI_COMMAND}' == 'Inband'
-    ...  Run Inband IPMI Standard Command  ${args}
+    ...  Run Inband IPMI Standard Command  ${args}  ${fail_on_err}
     ...  ELSE IF  '${IPMI_COMMAND}' == 'Dbus'
     ...  Run Dbus IPMI Standard Command  ${args}
     ...  ELSE  Fail  msg=Invalid IPMI Command type provided : ${IPMI_COMMAND}
@@ -90,8 +95,8 @@
 
 Run Inband IPMI Standard Command
     [Documentation]  Run the standard IPMI command in-band.
-    [Arguments]  ${args}  ${os_host}=${OS_HOST}  ${os_username}=${OS_USERNAME}
-    ...          ${os_password}=${OS_PASSWORD}
+    [Arguments]  ${args}  ${fail_on_err}=${1}  ${os_host}=${OS_HOST}
+    ...          ${os_username}=${OS_USERNAME}  ${os_password}=${OS_PASSWORD}
 
     # Description of arguments:
     # ${args}  parameters to IPMI command.
@@ -104,6 +109,7 @@
 
     ${inband_std_cmd}=  Catenate  ${IPMI_INBAND_CMD}  ${args}
     ${stdout}  ${stderr}=  Execute Command  ${inband_std_cmd}  return_stderr=True
+    Return From Keyword If  ${fail_on_err} == ${0}  ${stderr}
     Should Be Empty  ${stderr}  msg=${stdout}
     [Return]  ${stdout}
 

tests/ipmi/test_general_ipmi.robot

diff --git a/tests/ipmi/test_general_ipmi.robot b/tests/ipmi/test_general_ipmi.robot
index b79f45f..55896b5 100755
--- a/tests/ipmi/test_general_ipmi.robot
+++ b/tests/ipmi/test_general_ipmi.robot
@@ -658,7 +658,7 @@
 
     # Note: IPMI network channel logically starts from 1.
     :FOR  ${channel_number}  IN RANGE  1  ${channel_count}
-    \  Run External IPMI Standard Command  lan print ${channel_number}
+    \  Run IPMI Standard Command  lan print ${channel_number}
 
 
 Test Invalid IPMI Channel Response