Rework old entity datastore lookups to new rpcs

[integration/test.git] / csit / libraries / DataModels.robot

diff --git a/csit/libraries/DataModels.robot b/csit/libraries/DataModels.robot
index 8fd31060d9f2132979d4a9b49a9a55a6cc4ab62a..871b8137ed23a81e5f1c61ab21c7849c4de24074 100644 (file)
--- a/csit/libraries/DataModels.robot
+++ b/csit/libraries/DataModels.robot
@@ -2,6 +2,7 @@
 Documentation     Library to deal with mdsal data models. Initially, as a common place to show and
 ...               debug a list of data models.
 Library           RequestsLibrary
+Resource          ../variables/netvirt/Variables.robot
 
 *** Variables ***
 @{internal_data_models}    ${EMPTY}
@@ -16,20 +17,21 @@ Get Model Dump
     # is resolved, we can remove the timeout=1 and max_retries=0, but likely have to modify the request itself to
     # pass a timeout to restconf
     Create Session    model_dump_session    http://${controller_ip}:${RESTCONFPORT}    auth=${AUTH}    headers=${HEADERS}    timeout=1    max_retries=0
-    : FOR    ${model}    IN    @{data_models}
-    \    ${resp}=    RequestsLibrary.Get Request    model_dump_session    restconf/${model}
-    \    ${pretty_output}=    To Json    ${resp.content}    pretty_print=True
-    \    Log    ${pretty_output}
+    FOR    ${model}    IN    @{data_models}
+        ${resp}=    RequestsLibrary.Get Request    model_dump_session    restconf/${model}
+        ${pretty_output}=    To Json    ${resp.text}    pretty_print=True
+        Log    ${pretty_output}
+    END
 
 Verify No Ingress Dispatcher Non-Default Flow Entries
     [Arguments]    ${ovs_ip}
     [Documentation]    Verify the ingress dispatcher table has no non-default flows after neutron was cleaned up
-    ${flow_output}=    Run Command On Remote System    ${ovs_ip}    sudo ovs-ofctl -O OpenFlow13 dump-flows br-int table=${DISPATCHER_TABLE} | grep -v "priority=0"
+    ${flow_output}=    Run Command On Remote System    ${ovs_ip}    sudo ovs-ofctl -O OpenFlow13 dump-flows ${INTEGRATION_BRIDGE} table=${DISPATCHER_TABLE} | grep -v "priority=0"
     Log    ${flow_output}
     #Should Not Contain    ${flow_output}    table=${DISPATCHER_TABLE} # Skipping test verification until bug 7451 is resolved
 
 Verify Flows Are Cleaned Up On All OpenStack Nodes
     [Documentation]    Verify flows are cleaned up from all OpenStack nodes
-    Run Keyword And Continue On Failure    Verify No Ingress Dispatcher Non-Default Flow Entries    ${OS_CONTROL_NODE_IP}
-    Run Keyword And Continue On Failure    Verify No Ingress Dispatcher Non-Default Flow Entries    ${OS_COMPUTE_1_IP}
-    Run Keyword And Continue On Failure    Verify No Ingress Dispatcher Non-Default Flow Entries    ${OS_COMPUTE_2_IP}
+    FOR    ${ip}    IN    @{OS_ALL_IPS}
+        Run Keyword And Continue On Failure    Verify No Ingress Dispatcher Non-Default Flow Entries    ${ip}
+    END