commit b56a253e8316008cdc6ea77a96bbd82b88aa186f
author manashsarma <manashsarma@in.ibm.com> Tue Nov 17 06:17:40 2020 -0600
committer George Keishing <gkeishin@in.ibm.com> Mon Nov 23 05:26:21 2020 +0000
tree b72217e1dbeb330123405f48e1e0fcbc655c4959
parent 1603ff9f3a25c71e4efd31a1bcfbe578c8407e11

Fix installation failure of ladap cert in GUI automtation TC

Change-Id: I9fd892ff936ef173e04e836da7a787962be85c06
Signed-off-by: manashsarma <manashsarma@in.ibm.com>

gui/gui_test/access_control/test_obmc_gui_certificate.robot

diff --git a/gui/gui_test/access_control/test_obmc_gui_certificate.robot b/gui/gui_test/access_control/test_obmc_gui_certificate.robot
index 0d8eeaf..2a236e1 100644
--- a/gui/gui_test/access_control/test_obmc_gui_certificate.robot
+++ b/gui/gui_test/access_control/test_obmc_gui_certificate.robot
@@ -84,7 +84,7 @@
     Delete All CA Certificate Via Redfish
 
     # Install CA certificate via Redfish.
-    ${file_data}=  Generate Certificate File Data
+    ${file_data}=  Generate Certificate File Data  CA
     Install Certificate File On BMC  ${REDFISH_CA_CERTIFICATE_URI}  ok  data=${file_data}
 
     # Verify CA certificate availability in GUI.
@@ -96,7 +96,7 @@
     [Tags]  Verify_Installed_HTTPS_Certificate
 
     # Install HTTPS certificate.
-    ${file_data}=  Generate Certificate File Data
+    ${file_data}=  Generate Certificate File Data  Server
     Install Certificate File On BMC  ${REDFISH_HTTPS_CERTIFICATE_URI}  ok  data=${file_data}
 
     # Verify certificate is available in GUI.
@@ -110,7 +110,7 @@
     Delete Certificate Via BMC CLI  Client
 
     # Install LDAP certificate.
-    ${file_data}=  Generate Certificate File Data
+    ${file_data}=  Generate Certificate File Data  Client
     Install Certificate File On BMC  ${REDFISH_LDAP_CERTIFICATE_URI}  ok  data=${file_data}
 
     # Verify certificate is available in GUI.
@@ -122,7 +122,15 @@
 Generate Certificate File Data
     [Documentation]  Generate data of certificate file.
 
-    ${cert_file_path}=  Generate Certificate File Via Openssl  Valid Certificate  365
+    [Arguments]  ${cert_type}
+
+    # Description of Arguments(s):
+    # cert_type      Certificate type (e.g. "Client" or  "CA").
+
+    ${cert_file_path}=  Run Keyword If  '${cert_type}' == 'Client' or 'Server'
+    ...    Generate Certificate File Via Openssl  Valid Certificate Valid Privatekey
+    ...  ELSE IF  '${cert_type}' == 'CA'
+    ...    Generate Certificate File Via Openssl  Valid Certificate
     ${bytes}=  OperatingSystem.Get Binary File  ${cert_file_path}
     ${file_data}=  Decode Bytes To String  ${bytes}  UTF-8