Step 1: Move vm scripts to the right place

[integration/test.git] / test / csit / suites / openflowplugin / Flows_OF13 / 315__timeout_vlan_pcp_vlan.robot

diff --git a/test/csit/suites/openflowplugin/Flows_OF13/315__timeout_vlan_pcp_vlan.robot b/test/csit/suites/openflowplugin/Flows_OF13/315__timeout_vlan_pcp_vlan.robot
index 429d02df5969de6de975193a42d3dd3cc55b87e1..c8563eb04531fa2b9947c232620b89513fe99a36 100644 (file)
--- a/test/csit/suites/openflowplugin/Flows_OF13/315__timeout_vlan_pcp_vlan.robot
+++ b/test/csit/suites/openflowplugin/Flows_OF13/315__timeout_vlan_pcp_vlan.robot
@@ -5,7 +5,7 @@ Suite Teardown    Delete All Sessions
 Library           SSHLibrary
 Library           Collections
 Library           OperatingSystem
-Library           ../../../libraries/RequestsLibrary.py
+Library           RequestsLibrary
 Library           ../../../libraries/Common.py
 Variables         ../../../variables/Variables.py
 
@@ -14,7 +14,7 @@ ${REST_CON}       /restconf/config/opendaylight-inventory:nodes
 ${FILE}           ${CURDIR}/../../../variables/xmls/f16.xml
 ${FLOW}           139
 ${TABLE}          2
-@{FLOWELMENTS}    table=2    idle_timeout=300    hard_timeout=600    priority=16    dl_vlan=78    dl_vlan_pcp=3
+@{FLOWELMENTS}    table=2    priority=16    dl_vlan=78    dl_vlan_pcp=3
 ...               dl_src=00:00:00:11:23:ae    dl_dst=ff:ff:29:01:19:61    dec_ttl
 
 *** Test Cases ***
@@ -23,13 +23,13 @@ Add a flow - Output to physical port#
     [Tags]    Push
     ${body}    OperatingSystem.Get File    ${FILE}
     Set Suite Variable    ${body}
-    ${resp}    Putxml    session    ${REST_CON}/node/openflow:1/table/${TABLE}/flow/${FLOW}    data=${body}
+    ${resp}    RequestsLibrary.Put    session    ${REST_CON}/node/openflow:1/table/${TABLE}/flow/${FLOW}    headers=${HEADERS_XML}    data=${body}
     Should Be Equal As Strings    ${resp.status_code}    200
 
 Verify after adding flow config - Output to physical port#
     [Documentation]    Verify the flow
     [Tags]    Get
-    ${resp}    get    session    ${REST_CON}/node/openflow:1/table/${TABLE}/flow/${FLOW}    headers=${ACCEPT_XML}
+    ${resp}    RequestsLibrary.Get    session    ${REST_CON}/node/openflow:1/table/${TABLE}/flow/${FLOW}    headers=${ACCEPT_XML}
     Should Be Equal As Strings    ${resp.status_code}    200
     compare xml    ${body}    ${resp.content}
 
@@ -45,13 +45,13 @@ Verify flows after adding flow config on OVS
 Remove a flow - Output to physical port#
     [Documentation]    Remove a flow
     [Tags]    remove
-    ${resp}    Delete    session    ${REST_CON}/node/openflow:1/table/${TABLE}/flow/${FLOW}
+    ${resp}    RequestsLibrary.Delete    session    ${REST_CON}/node/openflow:1/table/${TABLE}/flow/${FLOW}
     Should Be Equal As Strings    ${resp.status_code}    200
 
 Verify after deleting flow config - Output to physical port#
     [Documentation]    Verify the flow
     [Tags]    Get
-    ${resp}    Get    session    ${REST_CON}/node/openflow:1/table/${TABLE}
+    ${resp}    RequestsLibrary.Get    session    ${REST_CON}/node/openflow:1/table/${TABLE}
     Should Not Contain    ${resp.content}    ${FLOW}
 
 Verify flows after deleting flow config on OVS