X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=tests%2Fdcaegen2%2Fprh-testcases%2Fresources%2Fprh_library.robot;h=ff02d7f84eb20f9300b804d81c07a9efa2b9ab6d;hb=ee72614cc6fe35737d24db1c99ceb13b7e5e54fd;hp=892ee523701c6aa9feab82ef8e50467046106605;hpb=86d3211823bf4cb79d296b659551fb7785bd5c2d;p=integration%2Fcsit.git diff --git a/tests/dcaegen2/prh-testcases/resources/prh_library.robot b/tests/dcaegen2/prh-testcases/resources/prh_library.robot index 892ee523..ff02d7f8 100644 --- a/tests/dcaegen2/prh-testcases/resources/prh_library.robot +++ b/tests/dcaegen2/prh-testcases/resources/prh_library.robot @@ -12,7 +12,6 @@ Verify PNF ready sent ${expected_pnf_ready_event}= Get Data From File ${test_case_directory}/expected-pnf-ready-event.json Add PNF entry in AAI ${pnf_entry} Set VES event in DMaaP ${ves_event} - Wait Until Keyword Succeeds 10x 3000ms Check CBS ready Wait Until Keyword Succeeds 10x 3000ms Check created PNF_READY notification ${expected_pnf_ready_event} Verify PNF ready sent and old logical link replaced in AAI @@ -36,32 +35,29 @@ Verify event with missing required field is logged Log Invalid ves event: ${invalid_ves_event} ${notification}= Create invalid notification ${invalid_ves_event} ${error_msg}= Set Variable Incorrect json, consumerDmaapModel can not be created: - Wait Until Keyword Succeeds 10x 3000ms Check PRH json log ${error_msg} ${notification} + Wait for PRH json log entry 20s ${error_msg} ${notification} Verify incorrect JSON event is logged - [Timeout] 60s [Arguments] ${test_case_directory} ${invalid_ves_event}= Get Data From File ${test_case_directory}/invalid-ves-event.json Set VES event in DMaaP ${invalid_ves_event} - Check PRH log |WARN |Incorrect json, consumerDmaapModel can not be created: + Wait for PRH log entry 20s java.lang.IllegalStateException: Not a JSON Object Verify missing AAI record is logged - [Timeout] 100s [Arguments] ${test_case_directory} ${incorrect_aai_entry}= Get Data From File ${test_case_directory}/incorrect-aai-entry.json ${ves_event}= Get Data From File ${test_case_directory}/ves-event.json Add PNF entry in AAI ${incorrect_aai_entry} Set VES event in DMaaP ${ves_event} - Check PRH log Request failed for URL 'https://aai:3334/aai/v12/network/pnfs/pnf/NOK6061ZW8'. Response code: 404 Not Found + Wait for PRH log entry 20s Request failed for URL 'https://aai:3334/aai/v23/network/pnfs/pnf/NOK6061ZW8'. Response code: 404 Not Found Verify AAI not responding is logged - [Timeout] 100s [Arguments] ${test_case_directory} ${ves_event}= Get Data From File ${test_case_directory}/ves-event.json Ensure Container Is Exited aai_simulator Set VES event in DMaaP ${ves_event} - Check PRH log connection timed out: aai Host is unreachable: aai - Ensure Container Is Running aai_simulator + Wait for one of PRH log entries 90s connection timed out: aai Host is unreachable: aai No route to host: aai failed to resolve 'aai' + [Teardown] Ensure Container Is Running aai_simulator Verify PNF re registration [Timeout] 500s @@ -90,7 +86,6 @@ Verify PNF ready sent when service instance non active Add service instance entry in AAI ${service_instance} Set VES event in DMaaP ${ves_event} - Wait Until Keyword Succeeds 10x 3000ms Check CBS ready Wait Until Keyword Succeeds 10x 3000ms Check created PNF_READY notification ${expected_pnf_ready_event} Check logical link not modified @@ -99,12 +94,6 @@ Check logical link not modified ${existing_logical_link}= Get Request ${aai_session} /verify/logical-link headers=${suite_headers} Should Be Equal As JSON ${expected_logical_link} ${existing_logical_link.content} -Check CBS ready - ${resp}= Get Request ${consul_session} /v1/catalog/services - Should Be Equal As Strings ${resp.status_code} 200 - Log Service Catalog response: ${resp.content} - Dictionary Should Contain Key ${resp.json()} cbs |Consul service catalog should contain CBS entry - Check created PNF_READY notification [Arguments] ${expected_event_pnf_ready_in_dmaap} ${resp}= Get Request ${dmaap_session} /verify/pnf_ready headers=${suite_headers} @@ -124,14 +113,20 @@ Check created Logical Link Should Be Equal As Strings ${resp.status_code} 200 Should Be Equal As JSON ${resp.content} ${expected_logical_link_in_aai} -Check PRH log - [Arguments] @{log_entries} - ${found}= Find one of log entryies ${log_entries} +Wait for PRH log entry + [Arguments] ${timeout} ${log_entry} + Wait for one of PRH log entries ${timeout} ${log_entry} + +Wait for one of PRH log entries + [Arguments] ${timeout} @{log_entries} + [Timeout] ${timeout} + ${found}= Wait for one of docker log entries prh ${log_entries} Should Be True ${found} -Check PRH json log - [Arguments] ${prefix} ${json} - ${found}= Find log json ${prefix} ${json} +Wait for PRH json log entry + [Arguments] ${timeout} ${prefix} ${json} + [Timeout] ${timeout} + ${found}= Wait for log entry with json message ${prefix} ${json} Should Be True ${found} Create event parsing error @@ -151,7 +146,7 @@ Add service instance entry in AAI [Arguments] ${aai_service_instance} ${headers}= Create Dictionary Accept=application/json Content-Type=application/json Log AAI url ${AAI_SIMULATOR_SETUP_URL} - ${resp}= Put Request ${aai_session} /setup/add_service_instace headers=${suite_headers} data=${aai_service_instance} + ${resp}= Put Request ${aai_session} /setup/add_service_instance headers=${suite_headers} data=${aai_service_instance} Should Be Equal As Strings ${resp.status_code} 200 Add logical link entry in AAI @@ -209,4 +204,9 @@ Verify logging level Verify logs with heartbeat Get Request prh_session /heartbeat - Check PRH log Heartbeat request received \ No newline at end of file + Verify PRH logs contains Heartbeat request received + +Verify PRH logs contains + [Arguments] ${expected_entry} + ${log}= Get docker logs since test start prh + Should Contain ${log} ${expected_entry}