commit f320b4e5a3ed0f5db79a50844176cb95f5c600ac
author KManimozhi123 <manimozhik@ami.com> Wed Mar 13 10:22:41 2024 +0000
committer manimozhik <manimozhik@ami.com> Fri Mar 15 13:19:21 2024 +0000
tree 6c3fc169595bbac464c64c2ff89cc4ca1520a0c7
parent e44a601b9c09a5807fc88ab038b563312ed3d5c0

IPMI: Modified script based on oem sensor

Changes:
   -Modified script based on oem sensor count in
    Verify_Sensor_And_SDR_Count_In_Get_Device_SDR_Info
   _Via_Inband_IPMI Testcase
   -Modified the function name as fetch_oem_sdr_count in ipmi_utils.py
   -Modified keyword name as Fetch OEM Sdr Count in ipmi_test_sdr.robot

Tested:
   -Ran scripts  Successfully

Change-Id: I6dabd17da4942258b855e01197d3de6229160b3d
Signed-off-by: manimozhik <manimozhik@ami.com>

ipmi/test_ipmi_inband_sdr.robot

diff --git a/ipmi/test_ipmi_inband_sdr.robot b/ipmi/test_ipmi_inband_sdr.robot
index 20c7546..7a2f863 100644
--- a/ipmi/test_ipmi_inband_sdr.robot
+++ b/ipmi/test_ipmi_inband_sdr.robot
@@ -88,8 +88,13 @@
 
     # Get SDR Count From Get Device SDR Info command.
     ${SDR_count1}=  Get SDR Count From SDR Info
+    # Get sdr oem record count from "sdr elist -vvv" command output.
+    ${sdr_data}=  Run Inband IPMI Standard Command  sdr elist -vvv  fail_on_err=0
+    ${sdr_oem}=  Fetch OEM Sdr Count  ${sdr_data}
+    ${sdr_info_record_count}=  Evaluate  ${SDR_count1} - ${sdr_oem}
+
     # Compare Get Device SDR Sdr count with SDR Elist All count from lanplus.
-    Should Be Equal As Integers  ${SDR_count1}  ${SDR_count_lan1}
+    Should Be Equal As Integers  ${sdr_info_record_count}  ${SDR_count_lan1}
 
     # Reboot Host using Chassis Power Cycle.
     IPMI Power Cycle
@@ -104,8 +109,9 @@
 
     # Get SDR Count From Get Device SDR Info command.
     ${SDR_count2}=  Get SDR Count From SDR Info
+    ${sdr_info_record_count2}=  Evaluate  ${SDR_count2} - ${sdr_oem}
     # Compare Get Device SDR Sdr count with SDR Elist All count from lanplus.
-    Should Be Equal As Integers  ${SDR_count2}  ${SDR_count_lan2}
+    Should Be Equal As Integers  ${sdr_info_record_count2}  ${SDR_count_lan2}
 
 
 Verify Timestamp In Get Device SDR Info Via Inband IPMI

ipmi/test_ipmi_sdr.robot

diff --git a/ipmi/test_ipmi_sdr.robot b/ipmi/test_ipmi_sdr.robot
index 008951f..89801ee 100755
--- a/ipmi/test_ipmi_sdr.robot
+++ b/ipmi/test_ipmi_sdr.robot
@@ -49,7 +49,7 @@
 
     # Get SDR OEM record count from "sdr elist -vvv" command output.
     ${sdr_data}=  Run IPMI Standard Command  sdr elist -vvv
-    ${sdr_oem}=  Fetch Sdr Count  ${sdr_data}
+    ${sdr_oem}=  Fetch OEM Sdr Count  ${sdr_data}
     ${sdr_info_record_count}=  Evaluate  ${sdr_info['record_count']} - ${sdr_oem}
 
     # Get sensor count from "sdr elist all" command output.

lib/ipmi_utils.py

diff --git a/lib/ipmi_utils.py b/lib/ipmi_utils.py
index a9bebd7..9e0bcc8 100644
--- a/lib/ipmi_utils.py
+++ b/lib/ipmi_utils.py
@@ -355,7 +355,7 @@
     return result
 
 
-def fetch_sdr_count(sdr_data):
+def fetch_oem_sdr_count(sdr_data):
     r"""
     Get IPMI SDR list and return the SDR OEM count.