commit cb6b53b8c90fdc4636acfc2e1824831a8a9f532b
author Michael Shepos <shepos@us.ibm.com> Mon Mar 15 23:23:10 2021 -0500
committer George Keishing <gkeishin@in.ibm.com> Thu Mar 18 15:11:27 2021 +0000
tree a7c47766138ecac9a242efb1066c64714cb214de
parent 7e8547152fcbf63e67651b34f14e90330b1af0ea

Pass in REDFISH_SUPPORT_TRANS_STATE to robot_cmd_fnc

Signed-off-by: Michael Shepos <shepos@us.ibm.com>
Change-Id: I68a824b706c6781b833c69f45f244baf62a8ce0e

bin/plug_ins/Auto_reboot/cp_master

diff --git a/bin/plug_ins/Auto_reboot/cp_master b/bin/plug_ins/Auto_reboot/cp_master
index 5d2a707..2f4851e 100755
--- a/bin/plug_ins/Auto_reboot/cp_master
+++ b/bin/plug_ins/Auto_reboot/cp_master
@@ -6,6 +6,7 @@
 
 import os
 import sys
+from robot.libraries.BuiltIn import BuiltIn
 
 save_dir_path = sys.path.pop(0)
 
@@ -34,6 +35,12 @@
 
 AUTO_REBOOT_DISABLE = "1"
 
+REDFISH_SUPPORT_TRANS_STATE = int(os.environ.get('REDFISH_SUPPORT_TRANS_STATE', 0))
+try:
+    REDFISH_SUPPORT_TRANS_STATE = REDFISH_SUPPORT_TRANS_STATE or \
+        int(BuiltIn().get_variable_value("${REDFISH_SUPPORT_TRANS_STATE}", default=0))
+except:
+    pass
 
 def validate_parms():
 
@@ -73,8 +80,9 @@
 
     cmd_buf = create_robot_cmd_string("extended/run_keyword.robot", OPENBMC_HOST, SSH_PORT, HTTPS_PORT,
                                       REST_USERNAME, REST_PASSWORD, OPENBMC_USERNAME, OPENBMC_PASSWORD,
-                                      keyword_string, lib_file_path, quiet,
+                                      REDFISH_SUPPORT_TRANS_STATE, 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)

lib/obmc_boot_test.py

diff --git a/lib/obmc_boot_test.py b/lib/obmc_boot_test.py
index ccc81c4..5ba505a 100755
--- a/lib/obmc_boot_test.py
+++ b/lib/obmc_boot_test.py
@@ -66,6 +66,8 @@
 status_dir_path = os.environ.get('STATUS_DIR_PATH', "")
 if status_dir_path != "":
     status_dir_path = os.path.normpath(status_dir_path) + os.sep
+redfish_support_trans_state = int(os.environ.get('REDFISH_SUPPORT_TRANS_STATE', 0)) or \
+    int(BuiltIn().get_variable_value("${REDFISH_SUPPORT_TRANS_STATE}", default=0))
 redfish_supported = BuiltIn().get_variable_value("${REDFISH_SUPPORTED}", default=False)
 redfish_rest_supported = BuiltIn().get_variable_value("${REDFISH_REST_SUPPORTED}", default=False)
 if redfish_supported:
@@ -272,7 +274,7 @@
                          "status_dir_path", "base_tool_dir_path",
                          "ffdc_list_file_path", "ffdc_report_list_path",
                          "ffdc_summary_list_path", "execdir", "redfish_supported",
-                         "redfish_rest_supported"]
+                         "redfish_rest_supported", "redfish_support_trans_state"]
 
     plug_in_vars = parm_list + additional_values