commit 02d32765119c4d5ce3af989fa3474754b7bbc2f3
author Yi Hu <yih@supermicro.com> Thu Mar 07 14:34:34 2024 -0800
committer George Keishing <gkeishin@gmail.com> Fri Apr 19 12:05:37 2024 +0000
tree e7529445b9e1a6e8cf44b645621ea54b75abd5e4
parent 23ee865097ce198062efb00a9c8146dbf3e9b371

Fix for redfishtool certificate, snmp and session management

Changes:
  - Set cert_id as test variable
  - Remove colon in snmp destination when the snmp port is empty
  - Fix redfish_delete_sessions assign location
  - Set REDFISH_DELETE_SESSIONS to 0 in suite setup
  - Set REDFISH_DELETE_SESSIONS back to 1 in suite teardown

Tested:
  - redfish/service_root/test_sessions_management.robot
  - redfish/dmtf_tools/test_redfishtool_certificate.robot
  - redfish/events/test_bmc_snmp_trap.robot

Change-Id: Ibb16d52b5874484f8cf169456e2feb4ba7593e71
Signed-off-by: Wilson Suen <wilsons@supermicro.com>

redfish/service_root/test_sessions_connection.robot

diff --git a/redfish/service_root/test_sessions_connection.robot b/redfish/service_root/test_sessions_connection.robot
index d5f5303..e371ddc 100644
--- a/redfish/service_root/test_sessions_connection.robot
+++ b/redfish/service_root/test_sessions_connection.robot
@@ -5,8 +5,8 @@
 Resource         ../../lib/bmc_redfish_utils.robot
 Resource         ../../lib/openbmc_ffdc.robot
 
-Suite Setup      Disable Redfish Delete Session
-Suite Teardown   Run Keywords  Enable Redfish Delete Session  AND  Redfish.Logout
+Suite Setup      Set Redfish Delete Session Flag  ${0}
+Suite Teardown   Run Keywords  Set Redfish Delete Session Flag  ${1}  AND  Redfish.Logout
 Test Setup       Printn
 Test Teardown    FFDC On Test Case Fail
 
@@ -16,7 +16,6 @@
 ${duration}                 6h
 ${interval}                 30s
 ${reboot_interval}          30m
-${REDFISH_DELETE_SESSIONS}  ${0}
 
 
 *** Test Cases ***
@@ -60,15 +59,3 @@
 
     # Verify session is still active and no issues on connection after reboot.
     Repeat Keyword  ${reboot_interval}  Send Heartbeat
-
-Disable Redfish Delete Session
-    [Documentation]  Disable delete redfish while performing power operation keyword.
-
-    ${REDFISH_DELETE_SESSIONS}=  Set Variable  ${0}
-    Set Suite Variable  ${REDFISH_DELETE_SESSIONS}
-
-Enable Redfish Delete Session
-    [Documentation]  Enable delete redfish while performing power operation keyword.
-
-    ${REDFISH_DELETE_SESSIONS}=  Set Variable  ${1}
-    Set Suite Variable  ${REDFISH_DELETE_SESSIONS}
\ No newline at end of file

redfish/service_root/test_sessions_management.robot

diff --git a/redfish/service_root/test_sessions_management.robot b/redfish/service_root/test_sessions_management.robot
index 31aa3b4..0bde4f9 100644
--- a/redfish/service_root/test_sessions_management.robot
+++ b/redfish/service_root/test_sessions_management.robot
@@ -18,6 +18,7 @@
 # User-driven input parameter to skip operator user.
 # -v SKIP_OPERATOR_USER:1  to skip from CLI.
 ${SKIP_OPERATOR_USER}    ${0}
+${REDFISH_DELETE_SESSIONS}  ${0}
 
 
 *** Test Cases ***
@@ -293,11 +294,13 @@
 
     Create Users With Different Roles  users=${USERS}  force=${True}
     Get Default Timeout Value
+    Set Redfish Delete Session Flag  ${0}
 
 
 Suite Teardown Execution
     [Documentation]  Suite teardown execution.
 
     Delete BMC Users Via Redfish  users=${USERS}
+    Set Redfish Delete Session Flag  ${1}
     Run Keyword And Ignore Error  Delete All Redfish Sessions
     Redfish.Logout