DMTF Tools: Handled DMTF Tools Download If Branch Name Was Different
Changes:
- Recently, In DMTF Tools website for few of tools repository stable branch name was changed from master to main.
- Handled Download DMTF Tools keyword, to download dmtf tool from their respective stable branch.
Tested:
- Ran All The Scripts Successfully
Change-Id: I7d86799051a95df4728bd728a9c90bdbe0107dad
Signed-off-by: ganesanb <ganesanb@ami.com>
diff --git a/redfish/dmtf_tools/Redfish_Interop_Validator.robot b/redfish/dmtf_tools/Redfish_Interop_Validator.robot
index e5f9b6e..cb1c493 100644
--- a/redfish/dmtf_tools/Redfish_Interop_Validator.robot
+++ b/redfish/dmtf_tools/Redfish_Interop_Validator.robot
@@ -14,6 +14,7 @@
... --ip https://${OPENBMC_HOST}:${HTTPS_PORT} --authtype=Session -u ${OPENBMC_USERNAME}
... -p ${OPENBMC_PASSWORD} --logdir ${EXECDIR}${/}logs${/} --debugging
... ${EXECDIR}/data/openbmc_redfish_interop_profile.json
+${branch_name} master
*** Test Case ***
@@ -21,7 +22,7 @@
[Documentation] Check conformance based on the OpenBMC Interoperability profile.
[Tags] Test_BMC_Redfish_Using_Redfish_Interop_Validator
- Download DMTF Tool ${rsv_dir_path} ${rsv_github_url}
+ Download DMTF Tool ${rsv_dir_path} ${rsv_github_url} ${branch_name}
${rc} ${output}= Run DMTF Tool ${rsv_dir_path} ${cmd_str_master} check_error=1
diff --git a/redfish/dmtf_tools/Redfish_JsonSchema_ResponseValidator.robot b/redfish/dmtf_tools/Redfish_JsonSchema_ResponseValidator.robot
index daac8be..3b42faf 100644
--- a/redfish/dmtf_tools/Redfish_JsonSchema_ResponseValidator.robot
+++ b/redfish/dmtf_tools/Redfish_JsonSchema_ResponseValidator.robot
@@ -14,13 +14,15 @@
${command_string} ${DEFAULT_PYTHON} ${rsv_dir_path}${/}Redfish-JsonSchema-ResponseValidator.py
... -r https://${OPENBMC_HOST} -u ${OPENBMC_USERNAME} -p ${OPENBMC_PASSWORD} -S -v
+${branch_name} main
+
*** Test Case ***
Test BMC Redfish Using Redfish JsonSchema ResponseValidator
[Documentation] Check OpenBMC conformance with JsonSchema files at the DMTF site.
[Tags] Test_BMC_Redfish_Using_Redfish_JsonSchema_ResponseValidator
- Download DMTF Tool ${rsv_dir_path} ${rsv_github_url}
+ Download DMTF Tool ${rsv_dir_path} ${rsv_github_url} ${branch_name}
Redfish.Login
${url_list}= redfish_utils.List Request /redfish/v1
diff --git a/redfish/dmtf_tools/Redfish_Reference_Checker.robot b/redfish/dmtf_tools/Redfish_Reference_Checker.robot
index a9a80f1..1911171 100644
--- a/redfish/dmtf_tools/Redfish_Reference_Checker.robot
+++ b/redfish/dmtf_tools/Redfish_Reference_Checker.robot
@@ -18,6 +18,8 @@
${command_string} ${DEFAULT_PYTHON} ${rsv_dir_path}${/}RedfishReferenceTool.py
... --nochkcert 'https://${OPENBMC_HOST}:${HTTPS_PORT}/redfish/v1/$metadata'
+${branch_name} main
+
*** Test Case ***
Test BMC Redfish Reference
@@ -36,5 +38,5 @@
[Documentation] Do test case setup tasks.
Printn
- Download DMTF Tool ${rsv_dir_path} ${rsv_github_url}
+ Download DMTF Tool ${rsv_dir_path} ${rsv_github_url} ${branch_name}
diff --git a/redfish/dmtf_tools/Redfish_Service_Validator.robot b/redfish/dmtf_tools/Redfish_Service_Validator.robot
index 382a2b3..ca54e41 100644
--- a/redfish/dmtf_tools/Redfish_Service_Validator.robot
+++ b/redfish/dmtf_tools/Redfish_Service_Validator.robot
@@ -16,6 +16,7 @@
${cmd_str_master} ${DEFAULT_PYTHON} ${rsv_dir_path}${/}RedfishServiceValidator.py
... --ip https://${OPENBMC_HOST}:${HTTPS_PORT} --authtype=Session -u ${OPENBMC_USERNAME}
... -p ${OPENBMC_PASSWORD} --logdir ${EXECDIR}${/}logs${/} --debugging
+${branch_name} master
*** Test Case ***
@@ -23,7 +24,7 @@
[Documentation] Check conformance with a Redfish service interface.
[Tags] Test_BMC_Redfish_Using_Redfish_Service_Validator
- Download DMTF Tool ${rsv_dir_path} ${rsv_github_url}
+ Download DMTF Tool ${rsv_dir_path} ${rsv_github_url} ${branch_name}
${rc} ${output}= Run DMTF Tool ${rsv_dir_path} ${cmd_str_master} check_error=1
@@ -61,7 +62,7 @@
Redfish Create User ${username} ${password} ${role} ${enabled}
Redfish.Logout
- Download DMTF Tool ${rsv_dir_path} ${rsv_github_url}
+ Download DMTF Tool ${rsv_dir_path} ${rsv_github_url} ${branch_name}
${cmd}= Catenate ${DEFAULT_PYTHON} ${rsv_dir_path}${/}RedfishServiceValidator.py
... --ip https://${OPENBMC_HOST}:${HTTPS_PORT} --authtype=Session -u ${username}
diff --git a/redfish/dmtf_tools/Redfish_Usecase_Checkers.robot b/redfish/dmtf_tools/Redfish_Usecase_Checkers.robot
index 6dd0522..df989ac 100644
--- a/redfish/dmtf_tools/Redfish_Usecase_Checkers.robot
+++ b/redfish/dmtf_tools/Redfish_Usecase_Checkers.robot
@@ -29,6 +29,7 @@
${power_on_timeout} 15 mins
${power_off_timeout} 15 mins
${state_change_timeout} 3 mins
+${branch_name} main
*** Test Case ***
@@ -71,7 +72,7 @@
[Documentation] Do test case setup tasks.
Printn
- Download DMTF Tool ${rsv_dir_path} ${rsv_github_url}
+ Download DMTF Tool ${rsv_dir_path} ${rsv_github_url} ${branch_name}
Test Teardown Execution