Use SSH_PORT/HTTPS_PORT in basic functions
- In order to improve the code base's ability to run with simulated
machines, specified SSH_PORT and HTTPS_PORT in basic functions that
communicate with the OBMC machine.
- Also adjusted some calls to set or pass SSH_PORT and HTTPS_PORT.
Change-Id: If3a8b317eda80ac9c071c51084ede20ce3023484
Signed-off-by: Michael Walsh <micwalsh@us.ibm.com>
diff --git a/bin/plug_ins/Auto_reboot/cp_master b/bin/plug_ins/Auto_reboot/cp_master
index 50b3f42..c1cf6ed 100755
--- a/bin/plug_ins/Auto_reboot/cp_master
+++ b/bin/plug_ins/Auto_reboot/cp_master
@@ -109,11 +109,9 @@
print_var(enable_auto_reboot)
keyword_string = "Set Auto Reboot ${%i}" % enable_auto_reboot
- cmd_buf = create_robot_cmd_string("extended/run_keyword.robot",
- OPENBMC_HOST, REST_USERNAME,
- REST_PASSWORD, keyword_string,
- lib_file_path, quiet, test_mode, debug,
- outputdir, output, log, report)
+ cmd_buf = create_robot_cmd_string("extended/run_keyword.robot", OPENBMC_HOST, SSH_PORT, HTTPS_PORT,
+ REST_USERNAME, REST_PASSWORD, keyword_string, lib_file_path, quiet,
+ test_mode, debug, outputdir, output, log, report)
if not robot_cmd_fnc(cmd_buf):
print_error_report("Robot command execution failed.")
exit(1)
diff --git a/bin/plug_ins/Stop/cp_stop_check b/bin/plug_ins/Stop/cp_stop_check
index efbc733..5cad089 100755
--- a/bin/plug_ins/Stop/cp_stop_check
+++ b/bin/plug_ins/Stop/cp_stop_check
@@ -132,11 +132,9 @@
interval + " quiet=${1} ; Rpvar state"
set_mod_global(keyword_string)
- cmd_buf = create_robot_cmd_string("extended/run_keyword.robot",
- OPENBMC_HOST, REST_USERNAME,
- REST_PASSWORD, keyword_string,
- lib_file_path, quiet, test_mode, debug,
- outputdir, output, log, report, loglevel)
+ cmd_buf = create_robot_cmd_string("extended/run_keyword.robot", OPENBMC_HOST, SSH_PORT, HTTPS_PORT,
+ REST_USERNAME, REST_PASSWORD, keyword_string, lib_file_path, quiet,
+ test_mode, debug, outputdir, output, log, report, loglevel)
if not robot_cmd_fnc(cmd_buf):
print_timen("The caller wishes to stop test execution if REST" +
" commands are failing.")