Fix deprecrated Run Keyword If for VMI
Changes:
- Run Keyword If is deprecated since
Robot Framework version 5.*, use IF and END or Inline IF
Tested:
- Checked using robot dry-run to make sure the
syntax is not broken
Change-Id: Ic217689a0f5283f4ba636d8ec021f8fc474a9b25
Signed-off-by: Megha G N <Megha.G.N@ibm.com>
diff --git a/openpower/ext_interfaces/test_vmicert_management.robot b/openpower/ext_interfaces/test_vmicert_management.robot
index a586a0b..a7ff413 100644
--- a/openpower/ext_interfaces/test_vmicert_management.robot
+++ b/openpower/ext_interfaces/test_vmicert_management.robot
@@ -603,8 +603,9 @@
# username Username to create a REST session.
# password Password to create a REST session.
- Run Keyword If "${XAUTH_TOKEN}" != "${EMPTY}" or ${force_create} == ${True}
- ... Initialize OpenBMC rest_username=${username} rest_password=${password}
+ IF "${XAUTH_TOKEN}" != "${EMPTY}" or ${force_create} == ${True}
+ Initialize OpenBMC rest_username=${username} rest_password=${password}
+ END
${data}= Create Dictionary
${headers}= Create Dictionary X-Auth-Token=${XAUTH_TOKEN}
@@ -636,8 +637,9 @@
# This is not applicable for root certificate.
# valid_status_code Expected status code from REST request.
- Run Keyword If "${XAUTH_TOKEN}" != "${EMPTY}" or ${force_create} == ${True}
- ... Initialize OpenBMC rest_username=${username} rest_password=${password}
+ IF "${XAUTH_TOKEN}" != "${EMPTY}" or ${force_create} == ${True}
+ Initialize OpenBMC rest_username=${username} rest_password=${password}
+ END
${data}= Create Dictionary
${headers}= Create Dictionary X-Auth-Token=${XAUTH_TOKEN}
@@ -664,10 +666,10 @@
# file_name Name of CSR or signed CERT file.
# is_csr_file A True value means a CSR while a False is for signed CERT file.
- ${subject}= Run Keyword If ${is_csr_file}
- ... Run openssl req -in ${file_name} -text -noout | grep Subject:
- ... ELSE
- ... Run openssl x509 -in ${file_name} -text -noout | grep Subject:
+ ${openssl_cmd}= Set Variable If ${is_csr_file}
+ ... openssl req -in ${file_name} -text -noout | grep Subject:
+ ... openssl x509 -in ${file_name} -text -noout | grep Subject:
+ ${subject}= Run ${openssl_cmd}
RETURN ${subject}
@@ -680,8 +682,10 @@
# file_name Name of CSR or CERT file.
# is_csr_file A True value means a CSR while a False is for signed CERT file.
- ${PublicKey}= Run Keyword If ${is_csr_file} Run openssl req -in ${file_name} -noout -pubkey
- ... ELSE Run openssl x509 -in ${file_name} -noout -pubkey
+ ${openssl_cmd}= Set Variable If ${is_csr_file}
+ ... openssl req -in ${file_name} -noout -pubkey
+ ... openssl x509 -in ${file_name} -noout -pubkey
+ ${PublicKey}= Run ${openssl_cmd}
RETURN ${PublicKey}