Migrate Get Requests invocations(libraries)

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

diff --git a/csit/libraries/DataModels.robot b/csit/libraries/DataModels.robot
index cc5a61ffc370b3c8cd5dca729a72de54b4401f62..69e4c6a1cba9e6160afa73a1ac96e55c9be19df0 100644 (file)
--- a/csit/libraries/DataModels.robot
+++ b/csit/libraries/DataModels.robot
@@ -3,6 +3,7 @@ Documentation       Library to deal with mdsal data models. Initially, as a comm
 ...                 debug a list of data models.
 
 Library             RequestsLibrary
+Resource            Utils.robot
 
 
 *** Variables ***
@@ -14,7 +15,7 @@ ${INTEGRATION_BRIDGE}       br-int
 *** Keywords ***
 Get Model Dump
     [Documentation]    Will output a list of mdsal models using ${data_models} list
-    [Arguments]    ${controller_ip}    ${data_models}=@{internal_data_models}    ${restconf_root}=restconf
+    [Arguments]    ${controller_ip}    ${data_models}=@{internal_data_models}    ${restconf_root}=rests
     # while feature request in bug 7892 is not done, we will quickly timeout and not retry the model dump get
     # request. This is because when it's done in a failed cluster state, it could take 20s for the reesponse to
     # to come back as the internal clustering times out waiting for a leader which will not come. When bug 7892
@@ -28,22 +29,15 @@ Get Model Dump
     ...    timeout=1
     ...    max_retries=0
     FOR    ${model}    IN    @{data_models}
-        ${resp}=    RequestsLibrary.Get Request    model_dump_session    ${restconf_root}/${model}
-        ${pretty_output}=    To Json    ${resp.text}    pretty_print=True
-        Log    ${pretty_output}
+        ${resp}=    RequestsLibrary.GET On Session    model_dump_session    url=${restconf_root}/${model}
+        Utils.Log Content    ${resp.text}
     END
 
 Verify No Ingress Dispatcher Non-Default Flow Entries
     [Documentation]    Verify the ingress dispatcher table has no non-default flows after neutron was cleaned up
     [Arguments]    ${ovs_ip}
-    ${flow_output}=    Run Command On Remote System
+    ${flow_output}=    Utils.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
-    FOR    ${ip}    IN    @{OS_ALL_IPS}
-        Run Keyword And Continue On Failure    Verify No Ingress Dispatcher Non-Default Flow Entries    ${ip}
-    END