commit 4d4302835588e40baff7a7ccaf1f705c9b224911
author ganesanb <ganesanb@ami.com> Thu Apr 27 14:33:23 2023 +0000
committer George Keishing <gkeishin@gmail.com> Thu May 11 15:13:50 2023 +0000
tree 78bb6d778d5d7a019d1636ee33f733fce7cb6fcd
parent f43724440dd1d04b5f0fdd1b942fb060a896b82a

Managers ID : Introduced variable to declare Managers ID in resource.robot and updated all the scripts in openbmc-test-automation

Changes:
    - Introduced ${MANAGER_ID} variable in resource.robot
    - Replaced all the Managers/bmc to Managers/${MANAGER_ID} across all the scripts
    - Also in data/variables.py updated chassis id for the few redfish uri.

Tested:
     - Ran All The Scripts Successfully

Change-Id: Iff3673aae27657e0799dec5cb94c1651a0cd5d18
Signed-off-by: ganesanb <ganesanb@ami.com>
Signed-off-by: George Keishing <gkeishin@in.ibm.com>

redfish/update_service/test_firmware_inventory.robot

diff --git a/redfish/update_service/test_firmware_inventory.robot b/redfish/update_service/test_firmware_inventory.robot
index 7ee8835..b9b59c7 100644
--- a/redfish/update_service/test_firmware_inventory.robot
+++ b/redfish/update_service/test_firmware_inventory.robot
@@ -85,7 +85,7 @@
     [Documentation]  Verify BMC version from FirmwareInventory same as in manager.
     [Tags]  Verify_BMC_Version_Matches_With_FirmwareInventory
 
-    ${bmc_manager}=  Redfish.Get  /redfish/v1/Managers/bmc
+    ${bmc_manager}=  Redfish.Get  /redfish/v1/Managers/${MANAGER_ID}
     ${manager_bmc_version}=  Get BMC Version
     # Check for manager version and cat /etc/os-release.
     Should Be Equal As Strings
@@ -195,7 +195,7 @@
     # /redfish/v1/UpdateService/FirmwareInventory/632c5114
     # /redfish/v1/UpdateService/FirmwareInventory/e702a011
 
-    ${firmware_inv_path}=  Redfish.Get Properties  ${REDFISH_BASE_URI}Managers/bmc
+    ${firmware_inv_path}=  Redfish.Get Properties  ${REDFISH_BASE_URI}Managers/${MANAGER_ID}
     ${firmware_inv_path}=  Get From Dictionary  ${firmware_inv_path}  Links
     ${sw_image}=  Get From Dictionary  ${firmware_inv_path}  SoftwareImages
 
@@ -271,11 +271,11 @@
     ${sw_inv_list}=  Get Functional Firmware  BMC image
     ${sw_inv_dict}=  Get Non Functional Firmware  ${sw_inv_list}  True
 
-    # /redfish/v1/Managers/bmc
+    # /redfish/v1/Managers/${MANAGER_ID}
     # "FirmwareVersion": "2.8.0-dev-150-g04508dc9f"
 
     ${firmware_version}=  Redfish.Get Attribute
-    ...  ${REDFISH_BASE_URI}Managers/bmc  FirmwareVersion
+    ...  ${REDFISH_BASE_URI}Managers/${MANAGER_ID}  FirmwareVersion
 
     Should Be Equal  ${sw_inv_dict['version']}  ${firmware_version}
 
@@ -297,11 +297,11 @@
     ${sw_inv_list}=  Get Functional Firmware  BMC image
     ${sw_inv_list}=  Get Non Functional Firmware List  ${sw_inv_list}  False
 
-    # /redfish/v1/Managers/bmc
+    # /redfish/v1/Managers/${MANAGER_ID}
     # "FirmwareVersion": "2.8.0-dev-150-g04508dc9f"
 
     ${firmware_version}=  Redfish.Get Attribute
-    ...  ${REDFISH_BASE_URI}Managers/bmc  FirmwareVersion
+    ...  ${REDFISH_BASE_URI}Managers/${MANAGER_ID}  FirmwareVersion
 
     FOR  ${sw_inv}  IN  @{sw_inv_list}
       Should Not Be Equal  ${sw_inv['version']}  ${firmware_version}
@@ -348,7 +348,7 @@
     # /redfish/v1/UpdateService/FirmwareInventory/632c5114
     # /redfish/v1/UpdateService/FirmwareInventory/632c5444
 
-    ${firmware_inv_path}=  Redfish.Get Properties  ${REDFISH_BASE_URI}Managers/bmc
+    ${firmware_inv_path}=  Redfish.Get Properties  ${REDFISH_BASE_URI}Managers/${MANAGER_ID}
     ${firmware_inv_path}=  Get From Dictionary  ${firmware_inv_path}  Links
     ${active_sw_image}=  Get From Dictionary  ${firmware_inv_path}  ActiveSoftwareImage
     ${active_sw_image}=  Get From Dictionary  ${active_sw_image}  @odata.id