diff options
| author |   Mariusz Wagner <mariusz.wagner@nokia.com> | 2019-04-16 07:25:57 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@onap.org> | 2019-04-16 07:25:57 +0000 |
| commit | 8377a6b1e5a775dfe6686aaae1da70d54568b0a0 (patch) | |
| tree | 5c89e878c4fdaf0fe5809e08a34fa52a214d7d30 /tests | |
| parent | 329de3e8b964a3736ebae26c1be7007a483c73dd (diff) | |
| parent | fba99a52e971c0069b51a2bdce0f6cde9302f018 (diff) | |
Merge "Attempt to check CSIT Wait for CBS startup"
Diffstat (limited to 'tests')
4 files changed, 20 insertions, 4 deletions
diff --git a/tests/dcaegen2/prh-testcases/prh_tests.robot b/tests/dcaegen2/prh-testcases/prh_tests.robot index 1e9802c5..3de7e91a 100644 --- a/tests/dcaegen2/prh-testcases/prh_tests.robot +++ b/tests/dcaegen2/prh-testcases/prh_tests.robot @@ -11,6 +11,7 @@ Resource ../../common.robot *** Variables *** ${DMAAP_SIMULATOR_SETUP_URL} http://${DMAAP_SIMULATOR_SETUP} ${AAI_SIMULATOR_SETUP_URL} http://${AAI_SIMULATOR_SETUP} +${CONSUL_SETUP_URL} http://${CONSUL_SETUP} ${VES_EVENT_PNF_REGISTRATION_SIMPLE} %{WORKSPACE}/tests/dcaegen2/prh-testcases/assets/json_events/ves-event-pnf-registration-simple.json ${AAI_PNF_REGISTRATION_SIMPLE} %{WORKSPACE}/tests/dcaegen2/prh-testcases/assets/json_events/aai-pnf-registration-simple.json diff --git a/tests/dcaegen2/prh-testcases/resources/docker-compose.yml b/tests/dcaegen2/prh-testcases/resources/docker-compose.yml index aca9d6ae..1b0c4702 100644 --- a/tests/dcaegen2/prh-testcases/resources/docker-compose.yml +++ b/tests/dcaegen2/prh-testcases/resources/docker-compose.yml @@ -158,4 +158,7 @@ services: - CONSUL_HOST depends_on: - consul-cfg - container_name: cbs
\ No newline at end of file + container_name: cbs + + + diff --git a/tests/dcaegen2/prh-testcases/resources/prh_library.robot b/tests/dcaegen2/prh-testcases/resources/prh_library.robot index 9b7e7830..88d4b501 100644 --- a/tests/dcaegen2/prh-testcases/resources/prh_library.robot +++ b/tests/dcaegen2/prh-testcases/resources/prh_library.robot @@ -14,6 +14,8 @@ Create sessions Set Suite Variable ${dmaap_setup_session} dmaap_setup_session Create Session aai_setup_session ${AAI_SIMULATOR_SETUP_URL} Set Suite Variable ${aai_setup_session} aai_setup_session + Create Session consul_setup_session ${CONSUL_SETUP_URL} + Set Suite Variable ${consul_setup_session} consul_setup_session Reset Simulators Reset AAI simulator @@ -31,7 +33,9 @@ Invalid event processing Valid event processing [Arguments] ${input_valid__ves_event_in_dmaap} ${input_aai} - [Timeout] 30s + [Timeout] 100s + Sleep 50s + Wait Until Keyword Succeeds 10x 3000ms Check CBS ready ${data}= Get Data From File ${input_valid__ves_event_in_dmaap} ${aai_entry_to_be_set}= Get Data From File ${input_aai} Set event in DMaaP ${data} @@ -48,7 +52,7 @@ Check PRH log ${status}= Check for log ${searched_log} Should Be Equal As Strings ${status} True -Check PNF_READY notification +Check PNF_READY nojson_objectification [Arguments] ${expected_event_pnf_ready_in_dpaap} ${resp}= Get Request ${dmaap_setup_session} /events/pnfReady headers=${suite_headers} Should Be Equal ${resp.text} ${expected_event_pnf_ready_in_dpaap} @@ -82,4 +86,11 @@ Reset AAI simulator Reset DMaaP simulator ${resp}= Post Request ${dmaap_setup_session} /reset - Should Be Equal As Strings ${resp.status_code} 200
\ No newline at end of file + Should Be Equal As Strings ${resp.status_code} 200 + + +Check CBS ready + ${resp}= Get Request ${consul_setup_session} /v1/catalog/service/cbs + Should Be Equal As Strings ${resp.status_code} 200 + #${json_as_str} Convert JSON To String ${resp.content} + #Log CBS ${json_as_str}
\ No newline at end of file diff --git a/tests/dcaegen2/prh-testcases/ssl_prh_tests.robot b/tests/dcaegen2/prh-testcases/ssl_prh_tests.robot index be260bd6..dd193318 100644 --- a/tests/dcaegen2/prh-testcases/ssl_prh_tests.robot +++ b/tests/dcaegen2/prh-testcases/ssl_prh_tests.robot @@ -11,6 +11,7 @@ Resource ../../common.robot *** Variables *** ${DMAAP_SIMULATOR_SETUP_URL} http://${DMAAP_SIMULATOR_SETUP} ${AAI_SIMULATOR_SETUP_URL} http://${AAI_SIMULATOR_SETUP} +${CONSUL_SETUP_URL} http://${CONSUL_SETUP} ${VES_EVENT_PNF_REGISTRATION_SIMPLE} %{WORKSPACE}/tests/dcaegen2/prh-testcases/assets/json_events/ves-event-pnf-registration-simple.json ${AAI_PNF_REGISTRATION_SIMPLE} %{WORKSPACE}/tests/dcaegen2/prh-testcases/assets/json_events/aai-pnf-registration-simple.json |