X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=csit%2Flibraries%2FDataModels.robot;h=cc5a61ffc370b3c8cd5dca729a72de54b4401f62;hb=502926c7ed81fdade751fb896c92dab070af3982;hp=c91169899c9ad1f1acb872f666438003295f13ab;hpb=b57cf8978cbba41ba224a5b2e85bc2556a7ecba1;p=integration%2Ftest.git

diff --git a/csit/libraries/DataModels.robot b/csit/libraries/DataModels.robot
index c91169899c..cc5a61ffc3 100644
--- a/csit/libraries/DataModels.robot
+++ b/csit/libraries/DataModels.robot
@@ -1,37 +1,49 @@
 *** Settings ***
-Documentation     Library to deal with mdsal data models. Initially, as a common place to show and
-...               debug a list of data models.
-Library           RequestsLibrary
-Variables         ../variables/netvirt/Variables.py
+Documentation       Library to deal with mdsal data models. Initially, as a common place to show and
+...                 debug a list of data models.
+
+Library             RequestsLibrary
+
 
 *** Variables ***
-@{data_models}    ${EMPTY}
+@{internal_data_models}     ${EMPTY}
+${DISPATCHER_TABLE}         17
+${INTEGRATION_BRIDGE}       br-int
+
 
 *** Keywords ***
 Get Model Dump
-    [Arguments]    ${controller_ip}    ${data_models}=@{data_models}
     [Documentation]    Will output a list of mdsal models using ${data_models} list
+    [Arguments]    ${controller_ip}    ${data_models}=@{internal_data_models}    ${restconf_root}=restconf
     # 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
     # 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}
-    \    Log    ${resp.status_code}
-    \    ${pretty_output}=    To Json    ${resp.content}    pretty_print=True
-    \    Log    ${pretty_output}
+    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_root}/${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"
+    [Arguments]    ${ovs_ip}
+    ${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}
+    #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