Update PRH tests to use file based conifg

[integration/csit.git] / tests / dcaegen2 / prh-testcases / resources / prh_library.robot

diff --git a/tests/dcaegen2/prh-testcases/resources/prh_library.robot b/tests/dcaegen2/prh-testcases/resources/prh_library.robot
index 212dfe0..ff02d7f 100644 (file)
--- 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
@@ -50,14 +49,14 @@ Verify missing AAI record is logged
     ${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}
-    Wait for PRH log entry    20s    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
     [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}
-    Wait for one of PRH log entries    90s    connection timed out: aai    Host is unreachable: aai    No route to host: aai
+    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
@@ -87,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
@@ -96,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}
@@ -217,4 +209,4 @@ Verify logs with heartbeat
 Verify PRH logs contains
    [Arguments]    ${expected_entry}
    ${log}=    Get docker logs since test start    prh
-   Should Contain    ${log}    ${expected_entry}
\ No newline at end of file
+   Should Contain    ${log}    ${expected_entry}