Step 1: Move vm scripts to the right place

[integration/test.git] / test / csit / suites / openflowplugin / Flows_OF13 / 319__metadata_mask.robot

diff --git a/test/csit/suites/openflowplugin/Flows_OF13/319__metadata_mask.robot b/test/csit/suites/openflowplugin/Flows_OF13/319__metadata_mask.robot
index e0ebe04f21590e371b4b16ab0fb46da8b8f62056..4af6e46b4eadbf6f2bce36102bf8557daf74f4e4 100644 (file)
--- a/test/csit/suites/openflowplugin/Flows_OF13/319__metadata_mask.robot
+++ b/test/csit/suites/openflowplugin/Flows_OF13/319__metadata_mask.robot
@@ -5,13 +5,12 @@ 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
 
 *** Variables ***
 ${REST_CON}       /restconf/config/opendaylight-inventory:nodes
-${REST_OPR}       /restconf/operational/opendaylight-inventory:nodes
 ${FILE}           ${CURDIR}/../../../variables/xmls/f20.xml
 ${FLOW}           143
 ${TABLE}          2
@@ -23,13 +22,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}
 
@@ -39,20 +38,20 @@ Verify flows after adding flow config on OVS
     sleep    1
     write    dpctl dump-flows -O OpenFlow13
     ${body}    OperatingSystem.Get File    ${FILE}
-    ${switchouput}    Read Until    >
+    ${switchoutput}    Read Until    >
     : FOR    ${flowElement}    IN    @{FLOWELMENTS}
-    \    should Contain    ${switchouput}    ${flowElement}
+    \    should Contain    ${switchoutput}    ${flowElement}
 
 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
@@ -61,6 +60,6 @@ Verify flows after deleting flow config on OVS
     Sleep    1
     write    dpctl dump-flows -O OpenFlow13
     ${body}    OperatingSystem.Get File    ${FILE}
-    ${switchouput}    Read Until    >
+    ${switchoutput}    Read Until    >
     : FOR    ${flowElement}    IN    @{FLOWELMENTS}
-    \    should Not Contain    ${switchouput}    ${flowElement}
+    \    should Not Contain    ${switchoutput}    ${flowElement}