Removing keyword to install certificate using REST
Change-Id: I7b5e7869af19e64cbbb18d2ececfd9b3fa9f6c15
Signed-off-by: Rahul Maheshwari <rahulmaheshwari@in.ibm.com>
diff --git a/lib/certificate_utils.robot b/lib/certificate_utils.robot
index a378a84..b68fe6a 100755
--- a/lib/certificate_utils.robot
+++ b/lib/certificate_utils.robot
@@ -9,37 +9,36 @@
*** Keywords ***
Install Certificate File On BMC
- [Documentation] Install certificate file in BMC using REST PUT operation.
- [Arguments] ${uri} ${status}=ok ${quiet}=${1} &{kwargs}
+ [Documentation] Install certificate file in BMC using POST operation.
+ [Arguments] ${uri} ${status}=ok &{kwargs}
# Description of argument(s):
- # uri URI for installing certificate file via REST
- # e.g. "/xyz/openbmc_project/certs/server/https".
- # status Expected status of certificate installation via REST
+ # uri URI for installing certificate file via Redfish
+ # e.g. "/redfish/v1/AccountService/LDAP/Certificates".
+ # status Expected status of certificate installation via Redfish
# e.g. error, ok.
- # quiet If enabled, turns off logging to console.
# kwargs A dictionary of keys/values to be passed directly to
- # PUT Request.
+ # POST Request.
- Initialize OpenBMC quiet=${quiet}
+ Initialize OpenBMC
${headers}= Create Dictionary Content-Type=application/octet-stream
... X-Auth-Token=${XAUTH_TOKEN}
Set To Dictionary ${kwargs} headers ${headers}
- Run Keyword If '${quiet}' == '${0}' Log Request method=Put
- ... base_uri=${uri} args=&{kwargs}
-
- ${ret}= Put Request openbmc ${uri} &{kwargs}
- Run Keyword If '${quiet}' == '${0}' Log Response ${ret}
+ ${ret}= Post Request openbmc ${uri} &{kwargs}
+ ${content_json}= To JSON ${ret.content}
+ ${cert_id}= Set Variable If '${ret.status_code}' == '${HTTP_OK}' ${content_json["Id"]} -1
Run Keyword If '${status}' == 'ok'
... Should Be Equal As Strings ${ret.status_code} ${HTTP_OK}
... ELSE IF '${status}' == 'error'
- ... Should Be Equal As Strings ${ret.status_code} ${HTTP_BAD_REQUEST}
+ ... Should Be Equal As Strings ${ret.status_code} ${HTTP_INTERNAL_SERVER_ERROR}
Delete All Sessions
+ [Return] ${cert_id}
+
Get Certificate Content From BMC Via Openssl
[Documentation] Get certificate content from BMC via openssl.