Increase http session timeout for shard stability

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

diff --git a/csit/libraries/VtnMaKeywords.robot b/csit/libraries/VtnMaKeywords.robot
index 0cb1511844c37aaaecbf9a11933fd82eccfab5ff..d6afc5e390c60e01b8ad85989a4f9dce94fa101a 100644 (file)
--- a/csit/libraries/VtnMaKeywords.robot
+++ b/csit/libraries/VtnMaKeywords.robot
@@ -6,16 +6,19 @@ Library           Collections
 Library           json
 Library           RequestsLibrary
 Variables         ../variables/Variables.py
+Variables         ../variables/vtn/Modules.py
 Resource          ./Utils.robot
 Resource          ./KarafKeywords.robot
 Resource          ./MininetKeywords.robot
 Resource          ./TemplatedRequests.robot
+Resource          DataModels.robot
 
 *** Variables ***
 ${vlan_topo_10}    --custom vlan_vtn_test.py --topo vlantopo
 ${vlan_topo_13}    --custom vlan_vtn_test.py --topo vlantopo --switch ovsk,protocols=OpenFlow13
 ${VERSION_VTN}    controller/nb/v2/vtn/version
 ${VTN_INVENTORY}    restconf/operational/vtn-inventory:vtn-nodes
+${ENTITY_OWNERS}    restconf/operational/entity-owners:entity-owners
 ${DUMPFLOWS_OF10}    dpctl dump-flows -OOpenFlow10
 ${DUMPFLOWS_OF13}    dpctl dump-flows -OOpenFlow13
 ${FF_DUMPFLOWS_OF10}    sh ovs-ofctl dump-flows -OOpenFlow10 s3
@@ -44,6 +47,7 @@ ${in_port}        1
 ${filter_index}    1
 @{inet_action}    set_field:192.0.0.1->ip_src    set_field:192.0.0.2->ip_dst
 ${dscp_action}    set_field:32->ip_dscp
+${dscp_be_action}    set_field:32->nw_tos_shifted
 ${dscp_flow}      mod_nw_tos:128
 @{icmp_action}    mod_tp_dst:1    mod_tp_src:3
 ${drop_action}    actions=drop
@@ -64,7 +68,7 @@ Start SuiteVtnMa
     SSHLibrary.Execute Command    sudo sed -i "$ i log4j.logger.org.opendaylight.vtn = TRACE" ${WORKSPACE}/${BUNDLEFOLDER}/etc/org.ops4j.pax.logging.cfg
     Create Session    session    http://${ODL_SYSTEM_IP}:${RESTCONFPORT}    auth=${AUTH}    headers=${HEADERS_YANG_JSON}
     BuiltIn.Wait_Until_Keyword_Succeeds    30    3    Fetch vtn list
-    Start Suite
+    Start Mininet
 
 Start SuiteVtnMaTest
     [Documentation]    Start VTN Manager Test Suite
@@ -91,15 +95,11 @@ Fetch vtn switch inventory
 
 Collect Debug Info
     [Documentation]    Check if Switch is detected.
-    ${resp_odl_inventory}=    RequestsLibrary.Get Request    session    ${OPERATIONAL_NODES_API}
-    ${resp_vtn_inventory}=    RequestsLibrary.Get Request    session    ${VTN_INVENTORY_NODE_API}
     write    ${DUMPFLOWS_OF10}
     ${result}    Read Until    mininet>
     write    ${DUMPFLOWS_OF13}
     ${result}    Read Until    mininet>
-    Log    ${resp_odl_inventory.content}
-    Log    ${resp_vtn_inventory.content}
-    Should Be Equal As Strings    ${resp_vtn_inventory.status_code}    200
+    Get Model Dump    ${ODL_SYSTEM_IP}    ${vtn_data_models}
 
 Add a Topology wait
     [Arguments]    ${topo_wait}
@@ -315,7 +315,8 @@ Verify flowactions
     [Documentation]    Verify the flowfilter actions after ping in the dumpflows
     write    ${DUMPFLOWS}
     ${result}    Read Until    mininet>
-    Should Contain    ${result}    ${actions}
+    Run Keyword If    '${actions}' == 'set_field:32->ip_dscp' and '${ODL_STREAM}' == 'beryllium'    Should Contain    ${result}    ${dscp_be_action}
+    ...    ELSE    Should Contain    ${result}    ${actions}
 
 Add a vtn flowfilter
     [Arguments]    ${vtn_name}    ${vtnflowfilter_data}