Dcaegen2 Jenkins jobs are failing

[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 c53d5d1..1bf18bb 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    failed to resolve '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,30 +94,24 @@ 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}
     Should Be Equal As Strings    ${resp.status_code}    200
-    Should Be Equal As JSON    ${resp.content}    ${expected_event_pnf_ready_in_dmaap}
+    Should Be Equal As JSON    ${resp.text}    ${expected_event_pnf_ready_in_dmaap}
 
 Check created PNF_UPDATE notification
     [Arguments]    ${expected_event_pnf_update_in_dmaap}
     ${resp}=    Get Request    ${dmaap_session}    /verify/pnf_update    headers=${suite_headers}
-    Log    Response from DMaaP: ${resp.content}
+    Log    Response from DMaaP: ${resp.text}
     Should Be Equal As Strings    ${resp.status_code}    200
-    Should Be Equal As JSON    ${resp.content}    ${expected_event_pnf_update_in_dmaap}
+    Should Be Equal As JSON    ${resp.text}    ${expected_event_pnf_update_in_dmaap}
 
 Check created Logical Link
     [Arguments]    ${expected_logical_link_in_aai}
     ${resp}=    Get Request    ${aai_session}    /verify/logical-link    headers=${suite_headers}
     Should Be Equal As Strings    ${resp.status_code}    200
-    Should Be Equal As JSON    ${resp.content}    ${expected_logical_link_in_aai}
+    Should Be Equal As JSON    ${resp.text}    ${expected_logical_link_in_aai}
 
 Wait for PRH log entry
     [Arguments]    ${timeout}    ${log_entry}
@@ -207,7 +199,7 @@ Verify logging level
     [Arguments]    ${logger}    ${expected_log_level}
     ${resp}=    Get Request    prh_session  /actuator/loggers/${logger}
     Should Be Equal As Integers    ${resp.status_code}    200
-    Log    ${resp.content}
+    Log    ${resp.text}
     Should Be Equal As Strings   ${resp.json()["configuredLevel"]}    ${expected_log_level}    ignore_case=true
 
 Verify logs with heartbeat
@@ -215,6 +207,7 @@ Verify logs with heartbeat
     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}
+    [Arguments]    ${expected_entry}
+    ${log}=    Get docker logs since test start    prh
+    ${logStr}=  Convert To String    ${log}
+    Should Contain    ${logStr}    ${expected_entry}