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>

data/variables.py

diff --git a/data/variables.py b/data/variables.py
index 286ae17..9c9ec42 100755
--- a/data/variables.py
+++ b/data/variables.py
@@ -184,29 +184,48 @@
 REDFISH_BASE_URI = "/redfish/v1/"
 REDFISH_SESSION = REDFISH_BASE_URI + "SessionService/Sessions"
 REDFISH_SESSION_URI = "SessionService/Sessions/"
-REDFISH_NW_ETH0 = "Managers/bmc/EthernetInterfaces/eth0/"
+REDFISH_MANAGERS_ID = BuiltIn().get_variable_value(
+    "${MANAGER_ID}", default="bmc"
+)
+REDFISH_NW_ETH0 = (
+    "Managers/" + REDFISH_MANAGERS_ID + "/EthernetInterfaces/eth0/"
+)
 REDFISH_NW_ETH0_URI = REDFISH_BASE_URI + REDFISH_NW_ETH0
-REDFISH_NW_ETH_IFACE = REDFISH_BASE_URI + "Managers/bmc/EthernetInterfaces/"
-REDFISH_NW_PROTOCOL = "Managers/bmc/NetworkProtocol"
+REDFISH_NW_ETH_IFACE = (
+    REDFISH_BASE_URI
+    + "Managers/"
+    + REDFISH_MANAGERS_ID
+    + "/EthernetInterfaces/"
+)
+REDFISH_NW_PROTOCOL = "Managers/" + REDFISH_MANAGERS_ID + "/NetworkProtocol"
 REDFISH_NW_PROTOCOL_URI = REDFISH_BASE_URI + REDFISH_NW_PROTOCOL
 REDFISH_ACCOUNTS_SERVICE = "AccountService/"
 REDFISH_ACCOUNTS_SERVICE_URI = REDFISH_BASE_URI + REDFISH_ACCOUNTS_SERVICE
 REDFISH_ACCOUNTS = "AccountService/Accounts/"
 REDFISH_ACCOUNTS_URI = REDFISH_BASE_URI + REDFISH_ACCOUNTS
-REDFISH_HTTPS_CERTIFICATE = "Managers/bmc/NetworkProtocol/HTTPS/Certificates"
+REDFISH_HTTPS_CERTIFICATE = (
+    "Managers/" + REDFISH_MANAGERS_ID + "/NetworkProtocol/HTTPS/Certificates"
+)
 REDFISH_HTTPS_CERTIFICATE_URI = REDFISH_BASE_URI + REDFISH_HTTPS_CERTIFICATE
 REDFISH_LDAP_CERTIFICATE = "AccountService/LDAP/Certificates"
 REDFISH_LDAP_CERTIFICATE_URI = REDFISH_BASE_URI + REDFISH_LDAP_CERTIFICATE
-REDFISH_CA_CERTIFICATE = "Managers/bmc/Truststore/Certificates"
+REDFISH_CA_CERTIFICATE = (
+    "Managers/" + REDFISH_MANAGERS_ID + "/Truststore/Certificates"
+)
 REDFISH_CA_CERTIFICATE_URI = REDFISH_BASE_URI + REDFISH_CA_CERTIFICATE
+REDFISH_CHASSIS_ID = BuiltIn().get_variable_value(
+    "${CHASSIS_ID}", default="chassis"
+)
 REDFISH_CHASSIS_URI = REDFISH_BASE_URI + "Chassis/"
-REDFISH_CHASSIS_THERMAL = "chassis/Thermal/"
+REDFISH_CHASSIS_THERMAL = REDFISH_CHASSIS_ID + "/Thermal/"
 REDFISH_CHASSIS_THERMAL_URI = REDFISH_CHASSIS_URI + REDFISH_CHASSIS_THERMAL
-REDFISH_CHASSIS_POWER = "chassis/Power/"
+REDFISH_CHASSIS_POWER = REDFISH_CHASSIS_ID + "/Power/"
 REDFISH_CHASSIS_POWER_URI = REDFISH_CHASSIS_URI + REDFISH_CHASSIS_POWER
-REDFISH_CHASSIS_SENSORS = "chassis/Sensors"
+REDFISH_CHASSIS_SENSORS = REDFISH_CHASSIS_ID + "/Sensors"
 REDFISH_CHASSIS_SENSORS_URI = REDFISH_CHASSIS_URI + REDFISH_CHASSIS_SENSORS
-REDFISH_BMC_DUMP = "Managers/bmc/LogServices/Dump/Entries"
+REDFISH_BMC_DUMP = (
+    "Managers/" + REDFISH_MANAGERS_ID + "/LogServices/Dump/Entries"
+)
 REDFISH_DUMP_URI = REDFISH_BASE_URI + REDFISH_BMC_DUMP
 
 # Boot options and URI variables.