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>
diff --git a/redfish/dmtf_tools/Redfish_JsonSchema_ResponseValidator.robot b/redfish/dmtf_tools/Redfish_JsonSchema_ResponseValidator.robot
index 3b42faf..fdba6ae 100644
--- a/redfish/dmtf_tools/Redfish_JsonSchema_ResponseValidator.robot
+++ b/redfish/dmtf_tools/Redfish_JsonSchema_ResponseValidator.robot
@@ -56,7 +56,7 @@
${validate_errs}= Shell Cmd cat validate_errs
Log ${validate_errs}
- # URL /redfish/v1/Managers/bmc strip the last ending string and save off
+ # URL /redfish/v1/Managers/${MANAGER_ID} strip the last ending string and save off
# the logs for debugging "validate_errs_AccountService" and move to logs/.
Run Keyword If ${status} == ${False}
... Shell Cmd mv validate_errs logs/validate_errs_${url.rsplit("/")[-1]}
diff --git a/redfish/dmtf_tools/test_redfishtool_certificate.robot b/redfish/dmtf_tools/test_redfishtool_certificate.robot
index 327d1f8..9c3a68b 100644
--- a/redfish/dmtf_tools/test_redfishtool_certificate.robot
+++ b/redfish/dmtf_tools/test_redfishtool_certificate.robot
@@ -137,7 +137,7 @@
${file_data}= Decode Bytes To String ${bytes} UTF-8
${certificate_dict}= Create Dictionary
- ... @odata.id=/redfish/v1/Managers/bmc/NetworkProtocol/HTTPS/Certificates/1
+ ... @odata.id=/redfish/v1/Managers/${MANAGER_ID}/NetworkProtocol/HTTPS/Certificates/1
${dict_objects}= Create Dictionary CertificateString=${file_data}
... CertificateType=PEM CertificateUri=${certificate_dict}
@@ -284,7 +284,7 @@
Delete All CA Certificate Via Redfisthtool
[Documentation] Delete all CA certificate via Redfish.
- ${cmd_output}= Redfishtool Get /redfish/v1/Managers/bmc/Truststore/Certificates
+ ${cmd_output}= Redfishtool Get /redfish/v1/Managers/${MANAGER_ID}/Truststore/Certificates
${cmd_output}= Convert String to JSON ${cmd_output}
${cert_list}= Set Variable ${cmd_output["Members"]}
FOR ${cert} IN @{cert_list}