Remove ODL_STREAM variable from libraries/ChangeCounter.robot

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

diff --git a/csit/libraries/VtnMaKeywords.robot b/csit/libraries/VtnMaKeywords.robot
index 0cb1511844c37aaaecbf9a11933fd82eccfab5ff..949d3fb9b6671fffad0e1c73edcf6415c642598e 100644 (file)
--- a/csit/libraries/VtnMaKeywords.robot
+++ b/csit/libraries/VtnMaKeywords.robot
@@ -44,6 +44,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 +65,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
@@ -315,7 +316,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}