Moved a keyword from certificate suite to utils
Change-Id: I51935be6e1cf16cbffc75f7ccb3d05ceaf692a59
Signed-off-by: Rahul Maheshwari <rahulmaheshwari@in.ibm.com>
diff --git a/lib/certificate_utils.robot b/lib/certificate_utils.robot
index dc6cdba..c779948 100755
--- a/lib/certificate_utils.robot
+++ b/lib/certificate_utils.robot
@@ -241,3 +241,45 @@
... Should Contain ${cert_file_content} ${bmc_cert_content}
... ELSE
... Should Not Contain ${cert_file_content} ${bmc_cert_content}
+
+
+Install And Verify Certificate Via Redfish
+ [Documentation] Install and verify certificate using Redfish.
+ [Arguments] ${cert_type} ${cert_format} ${expected_status} ${delete_cert}=${True}
+
+ # Description of argument(s):
+ # cert_type Certificate type (e.g. "Client" or "CA").
+ # cert_format Certificate file format
+ # (e.g. "Valid_Certificate_Valid_Privatekey").
+ # expected_status Expected status of certificate replace Redfish
+ # request (i.e. "ok" or "error").
+ # delete_cert Certificate will be deleted before installing if this True.
+
+ Run Keyword If '${cert_type}' == 'CA' and '${delete_cert}' == '${True}'
+ ... Delete All CA Certificate Via Redfish
+ ... ELSE IF '${cert_type}' == 'Client' and '${delete_cert}' == '${True}'
+ ... Delete Certificate Via BMC CLI ${cert_type}
+
+ ${cert_file_path}= Generate Certificate File Via Openssl ${cert_format}
+ ${bytes}= OperatingSystem.Get Binary File ${cert_file_path}
+ ${file_data}= Decode Bytes To String ${bytes} UTF-8
+
+ ${certificate_uri}= Set Variable If
+ ... '${cert_type}' == 'Client' ${REDFISH_LDAP_CERTIFICATE_URI}
+ ... '${cert_type}' == 'CA' ${REDFISH_CA_CERTIFICATE_URI}
+
+ Run Keyword If '${cert_format}' == 'Expired Certificate' Modify BMC Date future
+ ... ELSE IF '${cert_format}' == 'Not Yet Valid Certificate' Modify BMC Date old
+
+ ${cert_id}= Install Certificate File On BMC ${certificate_uri} ${expected_status} data=${file_data}
+ Logging Installed certificate id: ${cert_id}
+
+ # Adding delay after certificate installation.
+ Sleep 30s
+
+ ${cert_file_content}= OperatingSystem.Get File ${cert_file_path}
+ ${bmc_cert_content}= Run Keyword If '${expected_status}' == 'ok' redfish_utils.Get Attribute
+ ... ${certificate_uri}/${cert_id} CertificateString
+
+ Run Keyword If '${expected_status}' == 'ok' Should Contain ${cert_file_content} ${bmc_cert_content}
+ [Return] ${cert_id}
diff --git a/redfish/managers/test_certificate.robot b/redfish/managers/test_certificate.robot
index 315e1a3..4669969 100644
--- a/redfish/managers/test_certificate.robot
+++ b/redfish/managers/test_certificate.robot
@@ -254,47 +254,6 @@
*** Keywords ***
-Install And Verify Certificate Via Redfish
- [Documentation] Install and verify certificate using Redfish.
- [Arguments] ${cert_type} ${cert_format} ${expected_status} ${delete_cert}=${True}
-
- # Description of argument(s):
- # cert_type Certificate type (e.g. "Client" or "CA").
- # cert_format Certificate file format
- # (e.g. "Valid_Certificate_Valid_Privatekey").
- # expected_status Expected status of certificate replace Redfish
- # request (i.e. "ok" or "error").
- # delete_cert Certificate will be deleted before installing if this True.
-
- Run Keyword If '${cert_type}' == 'CA' and '${delete_cert}' == '${True}'
- ... Delete All CA Certificate Via Redfish
- ... ELSE IF '${cert_type}' == 'Client' and '${delete_cert}' == '${True}'
- ... Delete Certificate Via BMC CLI ${cert_type}
-
- ${cert_file_path}= Generate Certificate File Via Openssl ${cert_format}
- ${bytes}= OperatingSystem.Get Binary File ${cert_file_path}
- ${file_data}= Decode Bytes To String ${bytes} UTF-8
-
- ${certificate_uri}= Set Variable If
- ... '${cert_type}' == 'Client' ${REDFISH_LDAP_CERTIFICATE_URI}
- ... '${cert_type}' == 'CA' ${REDFISH_CA_CERTIFICATE_URI}
-
- Run Keyword If '${cert_format}' == 'Expired Certificate' Modify BMC Date future
- ... ELSE IF '${cert_format}' == 'Not Yet Valid Certificate' Modify BMC Date old
-
- ${cert_id}= Install Certificate File On BMC ${certificate_uri} ${expected_status} data=${file_data}
- Logging Installed certificate id: ${cert_id}
-
- # Adding delay after certificate installation.
- Sleep 30s
-
- ${cert_file_content}= OperatingSystem.Get File ${cert_file_path}
- ${bmc_cert_content}= Run Keyword If '${expected_status}' == 'ok' redfish_utils.Get Attribute
- ... ${certificate_uri}/${cert_id} CertificateString
-
- Run Keyword If '${expected_status}' == 'ok' Should Contain ${cert_file_content} ${bmc_cert_content}
- [Return] ${cert_id}
-
Modify BMC Date
[Documentation] Modify date in BMC.
[Arguments] ${date_set_type}=current