Set system, chassis, and bmc as global variables
Changes:
- Add SYSTEM_ID as a global variable and set to default value system
- Replace redfish/v1/Systems/system to redfish/v1/Systems/SYSTEM_ID
- Replace redfish/v1/Chassis/chassis to redfish/v1/Chassis/CHASSIS_ID
- Replace redfish/v1/Managers/bmc to redfish/v1/Managers/MANAGER_ID
Tested:
- Tested on sandbox with the changes with sample test run with
sample test ID runs
1. without SYSTEM_ID provided
2. with -v SYSTEM_ID:system1
3. with export SYSTEM_ID=""
3. with export SYSTEM_ID="system2"
Change-Id: Ifc412b20038cef1eba632caaa6c300be328259bd
Signed-off-by: Wilson Suen <wilsons@supermicro.com>
Signed-off-by: George Keishing <gkeishin@in.ibm.com>
diff --git a/lib/utils.robot b/lib/utils.robot
index eeeb9a0..e0fd04f 100755
--- a/lib/utils.robot
+++ b/lib/utils.robot
@@ -375,7 +375,7 @@
Redfish Get Power Restore Policy
[Documentation] Returns the BMC power restore policy.
- ${power_restore_policy}= Redfish.Get Attribute /redfish/v1/Systems/system PowerRestorePolicy
+ ${power_restore_policy}= Redfish.Get Attribute /redfish/v1/Systems/${SYSTEM_ID} PowerRestorePolicy
[Return] ${power_restore_policy}
Get Auto Reboot
@@ -388,7 +388,7 @@
Redfish Get Auto Reboot
[Documentation] Returns auto reboot setting.
- ${resp}= Redfish.Get Attribute /redfish/v1/Systems/system Boot
+ ${resp}= Redfish.Get Attribute /redfish/v1/Systems/${SYSTEM_ID} Boot
[Return] ${resp["AutomaticRetryConfig"]}
@@ -691,7 +691,7 @@
# Description of argument(s):
# power_restore_policy Power restore policy (e.g. "AlwaysOff", "AlwaysOn", "LastState").
- Redfish.Patch /redfish/v1/Systems/system body={"PowerRestorePolicy": "${power_restore_policy}"}
+ Redfish.Patch /redfish/v1/Systems/${SYSTEM_ID} body={"PowerRestorePolicy": "${power_restore_policy}"}
... valid_status_codes=[${HTTP_OK}, ${HTTP_NO_CONTENT}]
@@ -749,7 +749,7 @@
# Description of argument(s):
# setting The reboot setting, "RetryAttempts" and "Disabled".
- Redfish.Patch /redfish/v1/Systems/system body={"Boot": {"AutomaticRetryConfig": "${setting}"}}
+ Redfish.Patch /redfish/v1/Systems/${SYSTEM_ID} body={"Boot": {"AutomaticRetryConfig": "${setting}"}}
... valid_status_codes=[${HTTP_OK}, ${HTTP_NO_CONTENT}]
${current_setting}= Redfish Get Auto Reboot
@@ -881,10 +881,10 @@
${payload}= Create Dictionary Boot=${data}
- Redfish.Patch /redfish/v1/Systems/system body=&{payload}
+ Redfish.Patch /redfish/v1/Systems/${SYSTEM_ID} body=&{payload}
... valid_status_codes=[${HTTP_OK},${HTTP_NO_CONTENT}]
- ${resp}= Redfish.Get Attribute /redfish/v1/Systems/system Boot
+ ${resp}= Redfish.Get Attribute /redfish/v1/Systems/${SYSTEM_ID} Boot
Should Be Equal As Strings ${resp["BootSourceOverrideEnabled"]} ${override_enabled}
Should Be Equal As Strings ${resp["BootSourceOverrideTarget"]} ${override_target}
Run Keyword If '${PLATFORM_ARCH_TYPE}' == 'x86'
@@ -916,7 +916,7 @@
# Description of argument(s):
# match_state Expected match state (e.g. Enabled, Starting, Error)
- ${Status}= Redfish.Get Attribute /redfish/v1/Managers/bmc Status
+ ${Status}= Redfish.Get Attribute /redfish/v1/Managers/${MANAGER_ID} Status
Should Be Equal As Strings ${match_state} ${Status['State']}
@@ -946,7 +946,7 @@
# "LastState": "OSRunning"
# },
- ${boot_progress}= Redfish.Get Properties /redfish/v1/Systems/system/
+ ${boot_progress}= Redfish.Get Properties /redfish/v1/Systems/${SYSTEM_ID}/
Return From Keyword If "${PLATFORM_ARCH_TYPE}" == "x86"
... NA ${boot_progress["Status"]["State"]}