commit c1f43eddf187609db7b8a1970940a0b69d3d095f
author Rahul Maheshwari <rahulmaheshwari@in.ibm.com> Mon Jun 03 01:00:16 2019 -0500
committer George Keishing <gkeishin@in.ibm.com> Mon Jun 10 15:22:10 2019 +0000
tree b75472142fd63dcae5d10006ef0bc392dc299e06
parent 3f152ae6fc568f117082c6c1f974b774810e5e34

Added testcases to verify CA certificate replace

Change-Id: Iaa3d7a47e8077e127bd88a383cc7579f6bea27d0
Signed-off-by: Rahul Maheshwari <rahulmaheshwari@in.ibm.com>

data/variables.py

diff --git a/data/variables.py b/data/variables.py
index 46fff55..473bb10 100755
--- a/data/variables.py
+++ b/data/variables.py
@@ -149,6 +149,8 @@
 REDFISH_NW_PROTOCOL_URI = REDFISH_BASE_URI + REDFISH_NW_PROTOCOL
 REDFISH_ACCOUNTS = 'AccountService/Accounts/'
 REDFISH_ACCOUNTS_URI = REDFISH_BASE_URI + REDFISH_ACCOUNTS
+REDFISH_HTTPS_CERTIFICATE = 'Managers/bmc/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/managers/test_certificate.robot

diff --git a/redfish/managers/test_certificate.robot b/redfish/managers/test_certificate.robot
index ef6384e..d036389 100644
--- a/redfish/managers/test_certificate.robot
+++ b/redfish/managers/test_certificate.robot
@@ -36,6 +36,16 @@
     Client       Empty Certificate Empty Privatekey  error
 
 
+Verify CA Certificate Replace
+    [Documentation]  Verify CA certificate replace.
+    [Tags]  Verify_CA_Certificate_Replace
+    [Template]  Replace Certificate Via Redfish
+
+    # cert_type  cert_format        expected_status
+    CA           Valid Certificate  ok
+    CA           Empty Certificate  error
+
+
 Verify Client Certificate Install
     [Documentation]  Verify client certificate install.
     [Tags]  Verify_Client_Certificate_Install
@@ -105,7 +115,7 @@
     Install Certificate File On BMC  ${certificate_uri}  ${expected_status}  data=${file_data}
 
     # Adding delay after certificate installation.
-    Sleep  15s
+    Sleep  30s
 
     ${cert_file_content}=  OperatingSystem.Get File  ${cert_file_path}
     ${bmc_cert_content}=  Run Keyword If  '${expected_status}' == 'ok'  redfish_utils.Get Attribute
@@ -153,9 +163,11 @@
     # expected_status     Expected status of certificate replace Redfish
     #                     request (i.e. "ok" or "error").
 
-    # Install client certificate before replacing client certificate.
-    Run Keyword If  '${cert_type}' == 'Client'  Install And Verify Certificate Via Redfish
-    ...  ${cert_type}  Valid Certificate Valid Privatekey  ok
+    # Install certificate before replacing client or CA certificate.
+    Run Keyword If  '${cert_type}' == 'Client'
+    ...    Install And Verify Certificate Via Redfish  ${cert_type}  Valid Certificate Valid Privatekey  ok
+    ...  ELSE IF  '${cert_type}' == 'CA'
+    ...    Install And Verify Certificate Via Redfish  ${cert_type}  Valid Certificate  ok
 
     redfish.Login
 
@@ -164,9 +176,10 @@
 
     ${file_data}=  OperatingSystem.Get Binary File  ${cert_file_path}
 
-    ${certificate_uri}=  Set Variable If  '${cert_type}' == 'Server'
-    ...  /redfish/v1/Managers/bmc/NetworkProtocol/HTTPS/Certificates/1
-    ...  /redfish/v1/AccountService/LDAP/Certificates/1
+    ${certificate_uri}=  Set Variable If
+    ...  '${cert_type}' == 'Server'  ${{REDFISH_HTTPS_CERTIFICATE_URI}/1
+    ...  '${cert_type}' == 'Client'  ${REDFISH_LDAP_CERTIFICATE_URI}/1
+    ...  '${cert_type}' == 'CA'  ${REDFISH_CA_CERTIFICATE_URI}/1
 
     ${certificate_dict}=  Create Dictionary  @odata.id=${certificate_uri}
     ${payload}=  Create Dictionary  CertificateString=${file_data}