New variable to test SOL over ssh using port 22
-This added a new variable OPENBMC_CONSOLE_CLIENT that is empty
by default
-The new variable allows the SOL tests to be executed using the
port 22 instead of port 2200, to do this is necessary execute the
obmc-console-client instead of shell.
-Also using a variable is possible to execute another console
client in the future
-Strip returning string cmd to removed the space that I added at
the end
Test:
Run the SOL test setting:
HOST_SOL_PORT=22 and
OPENBMC_CONSOLE_CLIENT="obmc-console-client"
Signed-off-by: Jorge Cisneros <jcisneros3@lenovo.com>
Change-Id: I13f97750d1d8ec7e00e77983ce728997e916b89b
diff --git a/lib/common_utils.robot b/lib/common_utils.robot
index 3c3d8e4..b1d3eae 100755
--- a/lib/common_utils.robot
+++ b/lib/common_utils.robot
@@ -303,9 +303,9 @@
${ssh_pw_file_path}= Set Variable ${output}
${cmd}= Catenate ${ssh_pw_file_path} ${OPENBMC_PASSWORD} -p ${HOST_SOL_PORT}
- ... -o "StrictHostKeyChecking no" ${OPENBMC_USERNAME}@${OPENBMC_HOST}
+ ... -o "StrictHostKeyChecking no" ${OPENBMC_USERNAME}@${OPENBMC_HOST} ${OPENBMC_CONSOLE_CLIENT}
- [Return] ${cmd}
+ [Return] ${cmd.strip()}
Get SOL Console Pid
diff --git a/lib/resource.robot b/lib/resource.robot
index 1e08066..d15ed70 100755
--- a/lib/resource.robot
+++ b/lib/resource.robot
@@ -80,6 +80,7 @@
${HOST_SOL_PORT} 2200
${OPENBMC_SERIAL_HOST} ${EMPTY}
${OPENBMC_SERIAL_PORT} ${EMPTY}
+${OPENBMC_CONSOLE_CLIENT} ${EMPTY}
# OS related parameters.
${OS_HOST} ${EMPTY}