Add CSIT for AAF Cert Service and refactor code
Signed-off-by: Aleksandra Maciaga <aleksandra.maciaga@nokia.com>
Issue-ID: AAF-995
Change-Id: I83678b1f9aa8fad8da1d3244b19d2e20b4512f0d
diff --git a/tests/aaf/certservice/cert-service-test.robot b/tests/aaf/certservice/cert-service-test.robot
index cc72eb6..aa2691a 100644
--- a/tests/aaf/certservice/cert-service-test.robot
+++ b/tests/aaf/certservice/cert-service-test.robot
@@ -13,17 +13,32 @@
[Documentation] Run healthcheck
Run Healthcheck
+AAF Cert Service API Reload Configuration
+ [Tags] AAF-CERT-SERVICE
+ [Documentation] Reload configuration
+ Send Post Request And Validate Response /actuator/refresh 200
+
AAF Cert Service API Send Valid CSR and Valid PK
[Tags] AAF-CERT-SERVICE
[Documentation] Send request to /v1/certificate/test endpoint and expect 200
- Send Request And Validate Response ${CERT_PATH} ${VALID_CSR_FILE} ${VALID_PK_FILE} 200
+ Send Get Request with Header And Validate Response ${CERT_PATH} ${VALID_CSR_FILE} ${VALID_PK_FILE} 200
+
+AAF Cert Service API Send Valid CSR and Valid PK to Wrong Path
+ [Tags] AAF-CERT-SERVICE
+ [Documentation] Send request to /v1/certificate/ endpoint and expect 404
+ Send Get Request with Header And Validate Response /v1/certificate/ ${VALID_CSR_FILE} ${VALID_PK_FILE} 404
+
+AAF Cert Service API Send Request without Header
+ [Tags] AAF-CERT-SERVICE
+ [Documentation] Send request to /v1/certificate/ endpoint and expect 400
+ Send Get Request And Validate Response ${CERT_PATH} 400
AAF Cert Service API Send Invalid CSR and Valid PK
[Tags] AAF-CERT-SERVICE
[Documentation] Send request to /v1/certificate/test endpoint and expect 400
- Send Request And Validate Response ${CERT_PATH} ${INVALID_CSR_FILE} ${VALID_PK_FILE} 400
+ Send Get Request with Header And Validate Response ${CERT_PATH} ${INVALID_CSR_FILE} ${VALID_PK_FILE} 400
AAF Cert Service API Send Valid CSR and Invalid PK
[Tags] AAF-CERT-SERVICE
[Documentation] Send request to /v1/certificate/test endpoint and expect 400
- Send Request And Validate Response ${CERT_PATH} ${VALID_CSR_FILE} ${INVALID_PK_FILE} 400
\ No newline at end of file
+ Send Get Request with Header And Validate Response ${CERT_PATH} ${VALID_CSR_FILE} ${INVALID_PK_FILE} 400
\ No newline at end of file
diff --git a/tests/aaf/certservice/resources/cert-service-keywords.robot b/tests/aaf/certservice/resources/cert-service-keywords.robot
index caec55a..b40da52 100644
--- a/tests/aaf/certservice/resources/cert-service-keywords.robot
+++ b/tests/aaf/certservice/resources/cert-service-keywords.robot
@@ -19,18 +19,37 @@
Should Be Equal As Strings ${resp.status_code} 200
Validate Recieved Response ${resp} status UP
-Send Request And Validate Response
- [Documentation] Send request to passed url and validate received response
- [Arguments] ${path} ${csr_file} ${pk_file} ${resp_code}
- ${csr}= Get Data From File ${csr_file}
- ${pk}= Get Data From File ${pk_file}
- ${headers}= Create Dictionary CSR=${csr} PK=${pk}
- ${resp}= Get Request ${http_session} ${path} headers=${headers}
- Should Be Equal As Strings ${resp.status_code} ${resp_code}
-
Validate Recieved Response
[Documentation] Validare message that has been received
[Arguments] ${resp} ${key} ${expected_value}
${json}= Parse Json ${resp.content}
- ${value}= get from dictionary ${json} ${key}
- Should Be Equal As Strings ${value} ${expected_value}
\ No newline at end of file
+ ${value}= Get From Dictionary ${json} ${key}
+ Should Be Equal As Strings ${value} ${expected_value}
+
+Send Get Request And Validate Response
+ [Documentation] Send request to passed url and validate received response
+ [Arguments] ${path} ${resp_code}
+ ${resp}= Get Request ${http_session} ${path}
+ Should Be Equal As Strings ${resp.status_code} ${resp_code}
+
+Send Get Request with Header And Validate Response
+ [Documentation] Send request to passed url and validate received response
+ [Arguments] ${path} ${csr_file} ${pk_file} ${resp_code}
+ ${headers}= Create Header with CSR and PK ${csr_file} ${pk_file}
+ ${resp}= Get Request ${http_session} ${path} headers=${headers}
+ Should Be Equal As Strings ${resp.status_code} ${resp_code}
+
+Create Header with CSR and PK
+ [Documentation] Create header with CSR and PK
+ [Arguments] ${csr_file} ${pk_file}
+ [Return] ${headers}
+ ${csr}= Get Data From File ${csr_file}
+ ${pk}= Get Data From File ${pk_file}
+ ${headers}= Create Dictionary CSR=${csr} PK=${pk}
+
+Send Post Request And Validate Response
+ [Documentation] Send request to passed url and validate received response
+ [Arguments] ${path} ${resp_code}
+ ${resp}= Post Request ${http_session} ${path}
+ Should Be Equal As Strings ${resp.status_code} ${resp_code}
+
\ No newline at end of file