Step 1: Move vm scripts to the right place

[integration/test.git] / test / csit / suites / openflowplugin / Flows_OF13 / 305__ttl.robot

diff --git a/test/csit/suites/openflowplugin/Flows_OF13/305__ttl.robot b/test/csit/suites/openflowplugin/Flows_OF13/305__ttl.robot
index 8420815d948e94c4b6bbf61637b97a7a25707ab0..82d44e54192f1d2c21b23e121f4c165c4ff1c997 100644 (file)
--- a/test/csit/suites/openflowplugin/Flows_OF13/305__ttl.robot
+++ b/test/csit/suites/openflowplugin/Flows_OF13/305__ttl.robot
@@ -15,15 +15,14 @@ Library           SSHLibrary
 Library           Collections
 Library           OperatingSystem
 Library           String
+Library           RequestsLibrary
 Library           XML
-Resource          ../../../libraries/FlowLib.txt
-Library           ../../../libraries/RequestsLibrary.py
+Resource          ../../../libraries/FlowLib.robot
 Library           ../../../libraries/Common.py
 Variables         ../../../variables/Variables.py
 
 *** Variables ***
 ${REST_CON}       /restconf/config/opendaylight-inventory:nodes
-${REST_OPR}       /restconf/operational/opendaylight-inventory:nodes
 ${GENERIC_ACTION_FLOW_FILE}    ${CURDIR}/../../../variables/xmls/genericActionFlow.xml
 ${ipv4_src}       10.1.2.0/24
 ${ipv4_dst}       40.4.0.0/16
@@ -38,35 +37,35 @@ ${copy_ttl_out_doc}    OFPAT_COPY_TTL_OUT = 11, /* Copy TTL "outwards" -- from n
 ${set_mpls_ttl_doc}    OFPAT_SET_MPLS_TTL = 15, /* MPLS TTL */
 ${dec_mpls_ttl_doc}    OFPAT_DEC_MPLS_TTL = 16, /* Decrement MPLS TTL */
 
-*** Test Cases ***    ODL flow action        action key             action value    tableID    flowID    verify OVS?    OVS specific string?
+*** Test Cases ***    ODL flow action        action key             action value    tableID    flowID    priority    verify OVS?    OVS specific string?
 Set_IP_TTL            [Documentation]        ${set_ip_ttl_doc}
                       [Tags]                 ttl                    set
-                      set-nw-ttl-action      nw-ttl                 1               2          101       no             set_ttl
+                      set-nw-ttl-action      nw-ttl                 1               2          101       10          no             set_ttl
 
 Dec_TTL               [Documentation]        ${dec_ttl_doc}
                       [Tags]                 ttl                    dec
-                      dec-nw-ttl             none                   none            3          305       yes            dec_ttl
+                      dec-nw-ttl             none                   none            3          305       311          yes            dec_ttl
 
 Copy_TTL_In           [Documentation]        ${copy_ttl_in_doc}
                       [Tags]                 ttl                    copyin
-                      copy-ttl-in            none                   none            9          202       no             copy_ttl_in
+                      copy-ttl-in            none                   none            9          202       9          no             copy_ttl_in
 
 Copy_TTL_Out          [Documentation]        ${copy_ttl_out_doc}
                       [Tags]                 ttl                    copyout
-                      copy-ttl-out           none                   none            8          909       no             copy_ttl_out
+                      copy-ttl-out           none                   none            8          909       4242          no             copy_ttl_out
 
 Set_MPLS_TTL          [Documentation]        ${set_mpls_ttl_doc}
                       [Tags]                 ttl                    setmpls
-                      set-mpls-ttl-action    mpls-ttl               1               4          505       yes            set_mpls_ttl
+                      set-mpls-ttl-action    mpls-ttl               1               4          505       9021          yes            set_mpls_ttl
 
 Dec_MPLS_TTL          [Documentation]        ${dec_mpls_ttl_doc}
                       [Tags]                 ttl                    decmpls
-                      dec-mpls-ttl           none                   none            2          1001      yes            dec_mpls_ttl
+                      dec-mpls-ttl           none                   none            2          1001      81          yes            dec_mpls_ttl
 
 *** Keywords ***
 Create And Remove Flow
-    [Arguments]    ${flow_action}    ${action_key}    ${action_value}    ${table_id}    ${flow_id}    ${verify_switch_flag}
-    ...    ${additional_ovs_flowelements}
+    [Arguments]    ${flow_action}    ${action_key}    ${action_value}    ${table_id}    ${flow_id}    ${priority}
+    ...    ${verify_switch_flag}    ${additional_ovs_flowelements}
     @{OVS_FLOWELEMENTS}    Create List    dl_dst=${eth_dst}    table=${table_id}    dl_src=${eth_src}    nw_src=${ipv4_src}    nw_dst=${ipv4_dst}
     ...    ${additional_ovs_flowelements}
     ##The dictionaries here will be used to populate the match and action elements of the flow mod
@@ -76,6 +75,7 @@ Create And Remove Flow
     ${flow}=    Create Inventory Flow
     Set "${flow}" "table_id" With "${table_id}"
     Set "${flow}" "id" With "${flow_id}"
+    Set "${flow}" "priority" With "${priority}"
     Clear Flow Actions    ${flow}
     Set Flow Action    ${flow}    0    0    ${flow_action}
     Set Flow Ethernet Match    ${flow}    ${ethernet_match_dict}