From: Junaid Zulfiqar Date: Mon, 8 Feb 2016 05:47:50 +0000 (-0800) Subject: Moved calls to "RequestLibrary. Request" in suites/openflowplugin/ X-Git-Tag: release/beryllium-sr1~123 X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?p=integration%2Ftest.git;a=commitdiff_plain;h=ffd25cfa9e839930852beacb46ca6d3109103f5d Moved calls to "RequestLibrary. Request" in suites/openflowplugin/ + RequestsLibrary.Get Request + RequestsLibrary.Post Request + RequestsLibrary.Delete Request + RequestsLibrary.get Request + RequestsLibrary.Put Request Change-Id: I0168df379cc51abdf7aa81647b3ec3866a32d849 Signed-off-by: Junaid Zulfiqar --- diff --git a/csit/suites/openflowplugin/AD_SAL_NSF_OF10/010__switch_manager.robot b/csit/suites/openflowplugin/AD_SAL_NSF_OF10/010__switch_manager.robot index a5bf5162fe..7c8ac6dd28 100644 --- a/csit/suites/openflowplugin/AD_SAL_NSF_OF10/010__switch_manager.robot +++ b/csit/suites/openflowplugin/AD_SAL_NSF_OF10/010__switch_manager.robot @@ -18,7 +18,7 @@ List all nodes [Tags] adsal Log ${TOPO_TREE_LEVEL} ${topo_nodes} Get Nodes From Topology ${TOPO_TREE_LEVEL} - ${resp} RequestsLibrary.Get ${ODL_CONTROLLER_SESSION} ${REST_CONTEXT}/default/nodes + ${resp} RequestsLibrary.Get Request ${ODL_CONTROLLER_SESSION} ${REST_CONTEXT}/default/nodes Should Be Equal As Strings ${resp.status_code} 200 Response status code error ${jsondata}= To JSON ${resp.content} ${nodes} Extract All Nodes ${jsondata} @@ -27,7 +27,7 @@ List all nodes Check node 1 connectors [Documentation] List node connectors and verify all connectors are there [Tags] adsal - ${resp} RequestsLibrary.Get ${ODL_CONTROLLER_SESSION} ${REST_CONTEXT}/default/node/OF/00:00:00:00:00:00:00:01 + ${resp} RequestsLibrary.Get Request ${ODL_CONTROLLER_SESSION} ${REST_CONTEXT}/default/node/OF/00:00:00:00:00:00:00:01 Should Be Equal As Strings ${resp.status_code} 200 Response status code error Should Contain ${resp.content} s1-eth1 Should Contain ${resp.content} s1-eth2 @@ -35,7 +35,7 @@ Check node 1 connectors Check node 2 connectors [Documentation] List node connectors and verify all connectors are there [Tags] adsal - ${resp} RequestsLibrary.Get ${ODL_CONTROLLER_SESSION} ${REST_CONTEXT}/default/node/OF/00:00:00:00:00:00:00:02 + ${resp} RequestsLibrary.Get Request ${ODL_CONTROLLER_SESSION} ${REST_CONTEXT}/default/node/OF/00:00:00:00:00:00:00:02 Should Be Equal As Strings ${resp.status_code} 200 Response status code error Should Contain ${resp.content} s2-eth1 Should Contain ${resp.content} s2-eth2 @@ -44,7 +44,7 @@ Check node 2 connectors Check node 3 connectors [Documentation] List node connectors and verify all connectors are there [Tags] adsal - ${resp} RequestsLibrary.Get ${ODL_CONTROLLER_SESSION} ${REST_CONTEXT}/default/node/OF/00:00:00:00:00:00:00:03 + ${resp} RequestsLibrary.Get Request ${ODL_CONTROLLER_SESSION} ${REST_CONTEXT}/default/node/OF/00:00:00:00:00:00:00:03 Should Be Equal As Strings ${resp.status_code} 200 Response status code error Should Contain ${resp.content} s3-eth1 Should Contain ${resp.content} s3-eth2 @@ -76,7 +76,7 @@ Remove property from nodeconnector Get node [Arguments] ${node_id} ${node_type} [Documentation] Get a specific node - ${resp} RequestsLibrary.Get ${ODL_CONTROLLER_SESSION} ${REST_CONTEXT}/${CONTAINER}/nodes + ${resp} RequestsLibrary.Get Request ${ODL_CONTROLLER_SESSION} ${REST_CONTEXT}/${CONTAINER}/nodes Should Be Equal As Strings ${resp.status_code} 200 Response status code error ${result} TO JSON ${resp.content} ${node} Create Dictionary id=${node_id} type={node_type} @@ -87,31 +87,31 @@ Get node Add property to node [Arguments] ${node_type} ${node_id} ${property} ${value} [Documentation] Add property to node - ${resp} RequestsLibrary.Put ${ODL_CONTROLLER_SESSION} ${REST_CONTEXT}/${CONTAINER}/node/${node_type}/${node_id}/property/${property}/${value} + ${resp} RequestsLibrary.Put Request ${ODL_CONTROLLER_SESSION} ${REST_CONTEXT}/${CONTAINER}/node/${node_type}/${node_id}/property/${property}/${value} Should Be Equal As Strings ${resp.status_code} 201 Response status code error Remove property from node [Arguments] ${node_type} ${node_id} ${property} [Documentation] Remove property from node - ${resp} RequestsLibrary.Delete ${ODL_CONTROLLER_SESSION} ${REST_CONTEXT}/${CONTAINER}/node/${node_type}/${node_id}/property/${property} + ${resp} RequestsLibrary.Delete Request ${ODL_CONTROLLER_SESSION} ${REST_CONTEXT}/${CONTAINER}/node/${node_type}/${node_id}/property/${property} Should Be Equal As Strings ${resp.status_code} 204 Response status code error Add property to nodeconnector [Arguments] ${node_type} ${node_id} ${nc_type} ${nc_id} ${property} ${value} [Documentation] Add property to nodeconnector - ${resp} RequestsLibrary.Put ${ODL_CONTROLLER_SESSION} ${REST_CONTEXT}/${CONTAINER}/nodeconnector/${node_type}/${node_id}/${nc_type}/${nc_id}/property/${property}/${value} + ${resp} RequestsLibrary.Put Request ${ODL_CONTROLLER_SESSION} ${REST_CONTEXT}/${CONTAINER}/nodeconnector/${node_type}/${node_id}/${nc_type}/${nc_id}/property/${property}/${value} Should Be Equal As Strings ${resp.status_code} 201 Response status code error Remove property from nodeconnector [Arguments] ${node_type} ${node_id} ${nc_type} ${nc_id} ${property} [Documentation] Remove property from nodeconnector - ${resp} RequestsLibrary.Delete ${ODL_CONTROLLER_SESSION} ${REST_CONTEXT}/${CONTAINER}/nodeconnector/${node_type}/${node_id}/${nc_type}/${nc_id}/property/${property} + ${resp} RequestsLibrary.Delete Request ${ODL_CONTROLLER_SESSION} ${REST_CONTEXT}/${CONTAINER}/nodeconnector/${node_type}/${node_id}/${nc_type}/${nc_id}/property/${property} Should Be Equal As Strings ${resp.status_code} 204 Response status code error Node property should exist [Arguments] ${node_type} ${node_id} ${property} ${value} [Documentation] Property of node should exist - ${resp} RequestsLibrary.Get ${ODL_CONTROLLER_SESSION} ${REST_CONTEXT}/${CONTAINER}/nodes + ${resp} RequestsLibrary.Get Request ${ODL_CONTROLLER_SESSION} ${REST_CONTEXT}/${CONTAINER}/nodes Should Be Equal As Strings ${resp.status_code} 200 Response status code error ${result} TO JSON ${resp.content} Log ${result} @@ -126,7 +126,7 @@ Node property should exist Node property should not exist [Arguments] ${node_type} ${node_id} ${property} ${value} [Documentation] Property of node should not exist - ${resp} RequestsLibrary.Get ${ODL_CONTROLLER_SESSION} ${REST_CONTEXT}/${CONTAINER}/nodes + ${resp} RequestsLibrary.Get Request ${ODL_CONTROLLER_SESSION} ${REST_CONTEXT}/${CONTAINER}/nodes Should Be Equal As Strings ${resp.status_code} 200 Response status code error ${result} TO JSON ${resp.content} Log ${result} @@ -141,7 +141,7 @@ Node property should not exist Nodeconnector property should exist [Arguments] ${node_type} ${node_id} ${nc_type} ${nc_id} ${property} ${value} [Documentation] Property of nodeconnector should exist - ${resp} RequestsLibrary.Get ${ODL_CONTROLLER_SESSION} ${REST_CONTEXT}/${CONTAINER}/node/${node_type}/${node_id} + ${resp} RequestsLibrary.Get Request ${ODL_CONTROLLER_SESSION} ${REST_CONTEXT}/${CONTAINER}/node/${node_type}/${node_id} Should Be Equal As Strings ${resp.status_code} 200 Response status code error ${result} TO JSON ${resp.content} Log ${result} @@ -153,7 +153,7 @@ Nodeconnector property should exist Nodeconnector property should not exist [Arguments] ${node_type} ${node_id} ${nc_type} ${nc_id} ${property} ${value} [Documentation] Property of nodeconnector should not exist - ${resp} RequestsLibrary.Get ${ODL_CONTROLLER_SESSION} ${REST_CONTEXT}/${CONTAINER}/node/${node_type}/${node_id} + ${resp} RequestsLibrary.Get Request ${ODL_CONTROLLER_SESSION} ${REST_CONTEXT}/${CONTAINER}/node/${node_type}/${node_id} Should Be Equal As Strings ${resp.status_code} 200 Response status code error ${result} TO JSON ${resp.content} Log ${result} diff --git a/csit/suites/openflowplugin/AD_SAL_NSF_OF10/020__topology_manager.robot b/csit/suites/openflowplugin/AD_SAL_NSF_OF10/020__topology_manager.robot index 2f2ed81956..373500a76f 100644 --- a/csit/suites/openflowplugin/AD_SAL_NSF_OF10/020__topology_manager.robot +++ b/csit/suites/openflowplugin/AD_SAL_NSF_OF10/020__topology_manager.robot @@ -28,9 +28,9 @@ Add a userlink [Tags] adsal ${body} Set Variable {"name":"${name}", "status":"Success", "srcNodeConnector":"OF|1@OF|00:00:00:00:00:00:00:02", "dstNodeConnector":"OF|1@OF|00:00:00:00:00:00:00:03"} ${expected_content} To JSON ${body} - ${resp} RequestsLibrary.Put session ${REST_CONTEXT}/${CONTAINER}/userLink/${name} data=${body} + ${resp} RequestsLibrary.Put Request session ${REST_CONTEXT}/${CONTAINER}/userLink/${name} data=${body} Should Be Equal As Strings ${resp.status_code} 201 - ${resp} RequestsLibrary.Get session ${REST_CONTEXT}/${CONTAINER}/userLinks + ${resp} RequestsLibrary.Get Request session ${REST_CONTEXT}/${CONTAINER}/userLinks Should Be Equal As Strings ${resp.status_code} 200 ${result} To JSON ${resp.content} ${resp_content} Get From Dictionary ${result} userLinks @@ -40,9 +40,9 @@ Remove a userlink [Documentation] Remove a userlink, list to validate the result. [Tags] adsal ${expected_content} Create Dictionary name=${name} status=Success srcNodeConnector=OF|1@OF|00:00:00:00:00:00:00:02 dstNodeConnector=OF|1@OF|00:00:00:00:00:00:00:03 - ${resp} RequestsLibrary.Delete session ${REST_CONTEXT}/${CONTAINER}/userLink/${name} + ${resp} RequestsLibrary.Delete Request session ${REST_CONTEXT}/${CONTAINER}/userLink/${name} Should Be Equal As Strings ${resp.status_code} 204 - ${resp} RequestsLibrary.Get session ${REST_CONTEXT}/${CONTAINER}/userLinks + ${resp} RequestsLibrary.Get Request session ${REST_CONTEXT}/${CONTAINER}/userLinks Should Be Equal As Strings ${resp.status_code} 200 ${result} To JSON ${resp.content} ${resp_content} Get From Dictionary ${result} userLinks diff --git a/csit/suites/openflowplugin/AD_SAL_NSF_OF10/040__flow_programmer.robot b/csit/suites/openflowplugin/AD_SAL_NSF_OF10/040__flow_programmer.robot index 44826dbd1f..3407b732bc 100644 --- a/csit/suites/openflowplugin/AD_SAL_NSF_OF10/040__flow_programmer.robot +++ b/csit/suites/openflowplugin/AD_SAL_NSF_OF10/040__flow_programmer.robot @@ -20,9 +20,9 @@ Add a flow [Tags] adsal ${body} Set Variable {"installInHw":"true","name":"flow1","node":{"id":"00:00:00:00:00:00:00:02","type":"OF"},"priority":"1","etherType":"0x800","nwDst":"10.0.0.1/32","actions":["OUTPUT=1"]} ${expected_content} To JSON ${body} - ${resp} RequestsLibrary.Put session ${REST_CONTEXT}/${CONTAINER}/node/OF/${node_id}/staticFlow/${name} data=${body} + ${resp} RequestsLibrary.Put Request session ${REST_CONTEXT}/${CONTAINER}/node/OF/${node_id}/staticFlow/${name} data=${body} Should Be Equal As Strings ${resp.status_code} 201 - ${resp} RequestsLibrary.Get session ${REST_CONTEXT}/${CONTAINER} + ${resp} RequestsLibrary.Get Request session ${REST_CONTEXT}/${CONTAINER} Should Be Equal As Strings ${resp.status_code} 200 ${result} To JSON ${resp.content} ${resp_content} Get From Dictionary ${result} flowConfig @@ -41,9 +41,9 @@ Remove a flow ${actions} Create List OUTPUT=1 ${expected_content} Create Dictionary name=${name} installInHw=true node=${node} priority=1 etherType=0x800 ... nwDst=10.0.0.1/32 actions=${actions} - ${resp} RequestsLibrary.Delete session ${REST_CONTEXT}/${CONTAINER}/node/OF/${node_id}/staticFlow/${name} + ${resp} RequestsLibrary.Delete Request session ${REST_CONTEXT}/${CONTAINER}/node/OF/${node_id}/staticFlow/${name} Should Be Equal As Strings ${resp.status_code} 204 - ${resp} RequestsLibrary.Get session ${REST_CONTEXT}/${CONTAINER} + ${resp} RequestsLibrary.Get Request session ${REST_CONTEXT}/${CONTAINER} Should Be Equal As Strings ${resp.status_code} 200 ${result} To JSON ${resp.content} ${resp_content} Get From Dictionary ${result} flowConfig diff --git a/csit/suites/openflowplugin/AD_SAL_NSF_OF13/010__switch_manager.robot b/csit/suites/openflowplugin/AD_SAL_NSF_OF13/010__switch_manager.robot index a5bf5162fe..7c8ac6dd28 100644 --- a/csit/suites/openflowplugin/AD_SAL_NSF_OF13/010__switch_manager.robot +++ b/csit/suites/openflowplugin/AD_SAL_NSF_OF13/010__switch_manager.robot @@ -18,7 +18,7 @@ List all nodes [Tags] adsal Log ${TOPO_TREE_LEVEL} ${topo_nodes} Get Nodes From Topology ${TOPO_TREE_LEVEL} - ${resp} RequestsLibrary.Get ${ODL_CONTROLLER_SESSION} ${REST_CONTEXT}/default/nodes + ${resp} RequestsLibrary.Get Request ${ODL_CONTROLLER_SESSION} ${REST_CONTEXT}/default/nodes Should Be Equal As Strings ${resp.status_code} 200 Response status code error ${jsondata}= To JSON ${resp.content} ${nodes} Extract All Nodes ${jsondata} @@ -27,7 +27,7 @@ List all nodes Check node 1 connectors [Documentation] List node connectors and verify all connectors are there [Tags] adsal - ${resp} RequestsLibrary.Get ${ODL_CONTROLLER_SESSION} ${REST_CONTEXT}/default/node/OF/00:00:00:00:00:00:00:01 + ${resp} RequestsLibrary.Get Request ${ODL_CONTROLLER_SESSION} ${REST_CONTEXT}/default/node/OF/00:00:00:00:00:00:00:01 Should Be Equal As Strings ${resp.status_code} 200 Response status code error Should Contain ${resp.content} s1-eth1 Should Contain ${resp.content} s1-eth2 @@ -35,7 +35,7 @@ Check node 1 connectors Check node 2 connectors [Documentation] List node connectors and verify all connectors are there [Tags] adsal - ${resp} RequestsLibrary.Get ${ODL_CONTROLLER_SESSION} ${REST_CONTEXT}/default/node/OF/00:00:00:00:00:00:00:02 + ${resp} RequestsLibrary.Get Request ${ODL_CONTROLLER_SESSION} ${REST_CONTEXT}/default/node/OF/00:00:00:00:00:00:00:02 Should Be Equal As Strings ${resp.status_code} 200 Response status code error Should Contain ${resp.content} s2-eth1 Should Contain ${resp.content} s2-eth2 @@ -44,7 +44,7 @@ Check node 2 connectors Check node 3 connectors [Documentation] List node connectors and verify all connectors are there [Tags] adsal - ${resp} RequestsLibrary.Get ${ODL_CONTROLLER_SESSION} ${REST_CONTEXT}/default/node/OF/00:00:00:00:00:00:00:03 + ${resp} RequestsLibrary.Get Request ${ODL_CONTROLLER_SESSION} ${REST_CONTEXT}/default/node/OF/00:00:00:00:00:00:00:03 Should Be Equal As Strings ${resp.status_code} 200 Response status code error Should Contain ${resp.content} s3-eth1 Should Contain ${resp.content} s3-eth2 @@ -76,7 +76,7 @@ Remove property from nodeconnector Get node [Arguments] ${node_id} ${node_type} [Documentation] Get a specific node - ${resp} RequestsLibrary.Get ${ODL_CONTROLLER_SESSION} ${REST_CONTEXT}/${CONTAINER}/nodes + ${resp} RequestsLibrary.Get Request ${ODL_CONTROLLER_SESSION} ${REST_CONTEXT}/${CONTAINER}/nodes Should Be Equal As Strings ${resp.status_code} 200 Response status code error ${result} TO JSON ${resp.content} ${node} Create Dictionary id=${node_id} type={node_type} @@ -87,31 +87,31 @@ Get node Add property to node [Arguments] ${node_type} ${node_id} ${property} ${value} [Documentation] Add property to node - ${resp} RequestsLibrary.Put ${ODL_CONTROLLER_SESSION} ${REST_CONTEXT}/${CONTAINER}/node/${node_type}/${node_id}/property/${property}/${value} + ${resp} RequestsLibrary.Put Request ${ODL_CONTROLLER_SESSION} ${REST_CONTEXT}/${CONTAINER}/node/${node_type}/${node_id}/property/${property}/${value} Should Be Equal As Strings ${resp.status_code} 201 Response status code error Remove property from node [Arguments] ${node_type} ${node_id} ${property} [Documentation] Remove property from node - ${resp} RequestsLibrary.Delete ${ODL_CONTROLLER_SESSION} ${REST_CONTEXT}/${CONTAINER}/node/${node_type}/${node_id}/property/${property} + ${resp} RequestsLibrary.Delete Request ${ODL_CONTROLLER_SESSION} ${REST_CONTEXT}/${CONTAINER}/node/${node_type}/${node_id}/property/${property} Should Be Equal As Strings ${resp.status_code} 204 Response status code error Add property to nodeconnector [Arguments] ${node_type} ${node_id} ${nc_type} ${nc_id} ${property} ${value} [Documentation] Add property to nodeconnector - ${resp} RequestsLibrary.Put ${ODL_CONTROLLER_SESSION} ${REST_CONTEXT}/${CONTAINER}/nodeconnector/${node_type}/${node_id}/${nc_type}/${nc_id}/property/${property}/${value} + ${resp} RequestsLibrary.Put Request ${ODL_CONTROLLER_SESSION} ${REST_CONTEXT}/${CONTAINER}/nodeconnector/${node_type}/${node_id}/${nc_type}/${nc_id}/property/${property}/${value} Should Be Equal As Strings ${resp.status_code} 201 Response status code error Remove property from nodeconnector [Arguments] ${node_type} ${node_id} ${nc_type} ${nc_id} ${property} [Documentation] Remove property from nodeconnector - ${resp} RequestsLibrary.Delete ${ODL_CONTROLLER_SESSION} ${REST_CONTEXT}/${CONTAINER}/nodeconnector/${node_type}/${node_id}/${nc_type}/${nc_id}/property/${property} + ${resp} RequestsLibrary.Delete Request ${ODL_CONTROLLER_SESSION} ${REST_CONTEXT}/${CONTAINER}/nodeconnector/${node_type}/${node_id}/${nc_type}/${nc_id}/property/${property} Should Be Equal As Strings ${resp.status_code} 204 Response status code error Node property should exist [Arguments] ${node_type} ${node_id} ${property} ${value} [Documentation] Property of node should exist - ${resp} RequestsLibrary.Get ${ODL_CONTROLLER_SESSION} ${REST_CONTEXT}/${CONTAINER}/nodes + ${resp} RequestsLibrary.Get Request ${ODL_CONTROLLER_SESSION} ${REST_CONTEXT}/${CONTAINER}/nodes Should Be Equal As Strings ${resp.status_code} 200 Response status code error ${result} TO JSON ${resp.content} Log ${result} @@ -126,7 +126,7 @@ Node property should exist Node property should not exist [Arguments] ${node_type} ${node_id} ${property} ${value} [Documentation] Property of node should not exist - ${resp} RequestsLibrary.Get ${ODL_CONTROLLER_SESSION} ${REST_CONTEXT}/${CONTAINER}/nodes + ${resp} RequestsLibrary.Get Request ${ODL_CONTROLLER_SESSION} ${REST_CONTEXT}/${CONTAINER}/nodes Should Be Equal As Strings ${resp.status_code} 200 Response status code error ${result} TO JSON ${resp.content} Log ${result} @@ -141,7 +141,7 @@ Node property should not exist Nodeconnector property should exist [Arguments] ${node_type} ${node_id} ${nc_type} ${nc_id} ${property} ${value} [Documentation] Property of nodeconnector should exist - ${resp} RequestsLibrary.Get ${ODL_CONTROLLER_SESSION} ${REST_CONTEXT}/${CONTAINER}/node/${node_type}/${node_id} + ${resp} RequestsLibrary.Get Request ${ODL_CONTROLLER_SESSION} ${REST_CONTEXT}/${CONTAINER}/node/${node_type}/${node_id} Should Be Equal As Strings ${resp.status_code} 200 Response status code error ${result} TO JSON ${resp.content} Log ${result} @@ -153,7 +153,7 @@ Nodeconnector property should exist Nodeconnector property should not exist [Arguments] ${node_type} ${node_id} ${nc_type} ${nc_id} ${property} ${value} [Documentation] Property of nodeconnector should not exist - ${resp} RequestsLibrary.Get ${ODL_CONTROLLER_SESSION} ${REST_CONTEXT}/${CONTAINER}/node/${node_type}/${node_id} + ${resp} RequestsLibrary.Get Request ${ODL_CONTROLLER_SESSION} ${REST_CONTEXT}/${CONTAINER}/node/${node_type}/${node_id} Should Be Equal As Strings ${resp.status_code} 200 Response status code error ${result} TO JSON ${resp.content} Log ${result} diff --git a/csit/suites/openflowplugin/AD_SAL_NSF_OF13/020__topology_manager.robot b/csit/suites/openflowplugin/AD_SAL_NSF_OF13/020__topology_manager.robot index 2f2ed81956..373500a76f 100644 --- a/csit/suites/openflowplugin/AD_SAL_NSF_OF13/020__topology_manager.robot +++ b/csit/suites/openflowplugin/AD_SAL_NSF_OF13/020__topology_manager.robot @@ -28,9 +28,9 @@ Add a userlink [Tags] adsal ${body} Set Variable {"name":"${name}", "status":"Success", "srcNodeConnector":"OF|1@OF|00:00:00:00:00:00:00:02", "dstNodeConnector":"OF|1@OF|00:00:00:00:00:00:00:03"} ${expected_content} To JSON ${body} - ${resp} RequestsLibrary.Put session ${REST_CONTEXT}/${CONTAINER}/userLink/${name} data=${body} + ${resp} RequestsLibrary.Put Request session ${REST_CONTEXT}/${CONTAINER}/userLink/${name} data=${body} Should Be Equal As Strings ${resp.status_code} 201 - ${resp} RequestsLibrary.Get session ${REST_CONTEXT}/${CONTAINER}/userLinks + ${resp} RequestsLibrary.Get Request session ${REST_CONTEXT}/${CONTAINER}/userLinks Should Be Equal As Strings ${resp.status_code} 200 ${result} To JSON ${resp.content} ${resp_content} Get From Dictionary ${result} userLinks @@ -40,9 +40,9 @@ Remove a userlink [Documentation] Remove a userlink, list to validate the result. [Tags] adsal ${expected_content} Create Dictionary name=${name} status=Success srcNodeConnector=OF|1@OF|00:00:00:00:00:00:00:02 dstNodeConnector=OF|1@OF|00:00:00:00:00:00:00:03 - ${resp} RequestsLibrary.Delete session ${REST_CONTEXT}/${CONTAINER}/userLink/${name} + ${resp} RequestsLibrary.Delete Request session ${REST_CONTEXT}/${CONTAINER}/userLink/${name} Should Be Equal As Strings ${resp.status_code} 204 - ${resp} RequestsLibrary.Get session ${REST_CONTEXT}/${CONTAINER}/userLinks + ${resp} RequestsLibrary.Get Request session ${REST_CONTEXT}/${CONTAINER}/userLinks Should Be Equal As Strings ${resp.status_code} 200 ${result} To JSON ${resp.content} ${resp_content} Get From Dictionary ${result} userLinks diff --git a/csit/suites/openflowplugin/AD_SAL_NSF_OF13/040__flow_programmer.robot b/csit/suites/openflowplugin/AD_SAL_NSF_OF13/040__flow_programmer.robot index 44826dbd1f..3407b732bc 100644 --- a/csit/suites/openflowplugin/AD_SAL_NSF_OF13/040__flow_programmer.robot +++ b/csit/suites/openflowplugin/AD_SAL_NSF_OF13/040__flow_programmer.robot @@ -20,9 +20,9 @@ Add a flow [Tags] adsal ${body} Set Variable {"installInHw":"true","name":"flow1","node":{"id":"00:00:00:00:00:00:00:02","type":"OF"},"priority":"1","etherType":"0x800","nwDst":"10.0.0.1/32","actions":["OUTPUT=1"]} ${expected_content} To JSON ${body} - ${resp} RequestsLibrary.Put session ${REST_CONTEXT}/${CONTAINER}/node/OF/${node_id}/staticFlow/${name} data=${body} + ${resp} RequestsLibrary.Put Request session ${REST_CONTEXT}/${CONTAINER}/node/OF/${node_id}/staticFlow/${name} data=${body} Should Be Equal As Strings ${resp.status_code} 201 - ${resp} RequestsLibrary.Get session ${REST_CONTEXT}/${CONTAINER} + ${resp} RequestsLibrary.Get Request session ${REST_CONTEXT}/${CONTAINER} Should Be Equal As Strings ${resp.status_code} 200 ${result} To JSON ${resp.content} ${resp_content} Get From Dictionary ${result} flowConfig @@ -41,9 +41,9 @@ Remove a flow ${actions} Create List OUTPUT=1 ${expected_content} Create Dictionary name=${name} installInHw=true node=${node} priority=1 etherType=0x800 ... nwDst=10.0.0.1/32 actions=${actions} - ${resp} RequestsLibrary.Delete session ${REST_CONTEXT}/${CONTAINER}/node/OF/${node_id}/staticFlow/${name} + ${resp} RequestsLibrary.Delete Request session ${REST_CONTEXT}/${CONTAINER}/node/OF/${node_id}/staticFlow/${name} Should Be Equal As Strings ${resp.status_code} 204 - ${resp} RequestsLibrary.Get session ${REST_CONTEXT}/${CONTAINER} + ${resp} RequestsLibrary.Get Request session ${REST_CONTEXT}/${CONTAINER} Should Be Equal As Strings ${resp.status_code} 200 ${result} To JSON ${resp.content} ${resp_content} Get From Dictionary ${result} flowConfig diff --git a/csit/suites/openflowplugin/Flows_Additional_TCs/010_Lithium_Rps_Calls_Ovs.robot b/csit/suites/openflowplugin/Flows_Additional_TCs/010_Lithium_Rps_Calls_Ovs.robot index 232b230391..9f44bd4fcd 100644 --- a/csit/suites/openflowplugin/Flows_Additional_TCs/010_Lithium_Rps_Calls_Ovs.robot +++ b/csit/suites/openflowplugin/Flows_Additional_TCs/010_Lithium_Rps_Calls_Ovs.robot @@ -15,13 +15,13 @@ ${send_echo_url} /restconf/operations/sal-echo:send-echo *** Test Cases *** Sending Barrier [Documentation] Test to send barrier - ${resp}= RequestsLibrary.Post session ${send_barrier_url} data=${RPC_SEND_BARRIER_DATA} headers=${HEADERS_XML} + ${resp}= RequestsLibrary.Post Request session ${send_barrier_url} data=${RPC_SEND_BARRIER_DATA} headers=${HEADERS_XML} Log ${resp.content} Should Be Equal As Strings ${resp.status_code} 200 Sending Echo [Documentation] Test to send echo - ${resp}= RequestsLibrary.Post session ${send_echo_url} data=${RPC_SEND_ECHO_DATA} headers=${HEADERS_XML} + ${resp}= RequestsLibrary.Post Request session ${send_echo_url} data=${RPC_SEND_ECHO_DATA} headers=${HEADERS_XML} Log ${resp.content} Should Be Equal As Strings ${resp.status_code} 200 @@ -39,7 +39,7 @@ Final Phase Are Switches Connected Topo [Documentation] Checks wheather switches are connected to controller - ${resp}= RequestsLibrary.Get session ${OPERATIONAL_TOPO_API}/topology/flow:1 headers=${ACCEPT_XML} + ${resp}= RequestsLibrary.Get Request session ${OPERATIONAL_TOPO_API}/topology/flow:1 headers=${ACCEPT_XML} Log ${resp.content} ${count}= Get Element Count ${resp.content} xpath=node Should Be Equal As Numbers ${count} 1 diff --git a/csit/suites/openflowplugin/Flows_Additional_TCs/020_Lithium_Rps_Calls_Cpqd.robot b/csit/suites/openflowplugin/Flows_Additional_TCs/020_Lithium_Rps_Calls_Cpqd.robot index e433485caf..c86fbfb7ab 100644 --- a/csit/suites/openflowplugin/Flows_Additional_TCs/020_Lithium_Rps_Calls_Cpqd.robot +++ b/csit/suites/openflowplugin/Flows_Additional_TCs/020_Lithium_Rps_Calls_Cpqd.robot @@ -15,7 +15,7 @@ ${start} sudo mn --controller=remote,ip=${ODL_SYSTEM_IP} --topo tree,1 *** Test Cases *** Sending Update Table [Documentation] Test to send table update request - ${resp}= RequestsLibrary.Post session ${send_update_table_url} data=${RPC_SEND_UPDATE_TABLE_DATA} headers=${HEADERS_XML} + ${resp}= RequestsLibrary.Post Request session ${send_update_table_url} data=${RPC_SEND_UPDATE_TABLE_DATA} headers=${HEADERS_XML} Log ${resp.content} Should Be Equal As Strings ${resp.status_code} 200 @@ -33,7 +33,7 @@ Final Phase Are Switches Connected Topo [Documentation] Checks wheather switches are connected to controller - ${resp}= RequestsLibrary.Get session ${OPERATIONAL_TOPO_API}/topology/flow:1 headers=${ACCEPT_XML} + ${resp}= RequestsLibrary.Get Request session ${OPERATIONAL_TOPO_API}/topology/flow:1 headers=${ACCEPT_XML} Log ${resp.content} ${count}= Get Element Count ${resp.content} xpath=node Should Be Equal As Numbers ${count} 1 diff --git a/csit/suites/openflowplugin/Flows_Additional_TCs/030_Flow_Update_Test.robot b/csit/suites/openflowplugin/Flows_Additional_TCs/030_Flow_Update_Test.robot index 405314740b..3043a91e80 100644 --- a/csit/suites/openflowplugin/Flows_Additional_TCs/030_Flow_Update_Test.robot +++ b/csit/suites/openflowplugin/Flows_Additional_TCs/030_Flow_Update_Test.robot @@ -53,14 +53,14 @@ Final Phase Are Switches Connected Topo [Documentation] Checks wheather switches are connected to controller - ${resp}= RequestsLibrary.Get session ${OPERATIONAL_TOPO_API}/topology/flow:1 headers=${ACCEPT_XML} + ${resp}= RequestsLibrary.Get Request session ${OPERATIONAL_TOPO_API}/topology/flow:1 headers=${ACCEPT_XML} Log ${resp.content} ${count}= Get Element Count ${resp.content} xpath=node Should Be Equal As Numbers ${count} 1 Delete Flow [Documentation] Removes used flow - ${resp}= RequestsLibrary.Delete session ${CONFIG_NODES_API}/node/openflow:${switch_idx}/table/${table_id}/flow/${flow_id} + ${resp}= RequestsLibrary.Delete Request session ${CONFIG_NODES_API}/node/openflow:${switch_idx}/table/${table_id}/flow/${flow_id} Log ${resp.content} ${msg}= Set Variable Delete flow for ${CONFIG_NODES_API}/node/openflow:${switch_idx}/table/${table_id}/flow/${flow_id} failed, http response ${resp.status_code} received. Should Be Equal As Strings ${resp.status_code} 200 msg=${msg} diff --git a/csit/suites/openflowplugin/Flows_OF13/300__dst_ip.robot b/csit/suites/openflowplugin/Flows_OF13/300__dst_ip.robot index 7bab1e98b1..ec7292024b 100644 --- a/csit/suites/openflowplugin/Flows_OF13/300__dst_ip.robot +++ b/csit/suites/openflowplugin/Flows_OF13/300__dst_ip.robot @@ -22,13 +22,13 @@ Add a flow - Output to physical port# [Tags] Push ${body} OperatingSystem.Get File ${FILE} Set Suite Variable ${body} - ${resp} RequestsLibrary.Put session ${REST_CON}/node/openflow:1/table/${TABLE}/flow/${FLOW} headers=${HEADERS_XML} data=${body} + ${resp} RequestsLibrary.Put Request 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} RequestsLibrary.get session ${REST_CON}/node/openflow:1/table/${TABLE}/flow/${FLOW} headers=${ACCEPT_XML} + ${resp} RequestsLibrary.get Request 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} RequestsLibrary.Delete session ${REST_CON}/node/openflow:1/table/${TABLE}/flow/${FLOW} + ${resp} RequestsLibrary.Delete Request 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} RequestsLibrary.Get session ${REST_CON}/node/openflow:1/table/${TABLE} + ${resp} RequestsLibrary.Get Request session ${REST_CON}/node/openflow:1/table/${TABLE} Should Not Contain ${resp.content} ${FLOW} Verify flows after deleting flow config on OVS diff --git a/csit/suites/openflowplugin/Flows_OF13/301__src_ip.robot b/csit/suites/openflowplugin/Flows_OF13/301__src_ip.robot index d6b3c099fe..4453536836 100644 --- a/csit/suites/openflowplugin/Flows_OF13/301__src_ip.robot +++ b/csit/suites/openflowplugin/Flows_OF13/301__src_ip.robot @@ -22,13 +22,13 @@ Add a flow - Output to physical port# [Tags] Push ${body} OperatingSystem.Get File ${FILE} Set Suite Variable ${body} - ${resp} RequestsLibrary.Put session ${REST_CON}/node/openflow:1/table/${TABLE}/flow/${FLOW} headers=${HEADERS_XML} data=${body} + ${resp} RequestsLibrary.Put Request 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} RequestsLibrary.Get session ${REST_CON}/node/openflow:1/table/${TABLE}/flow/${FLOW} headers=${ACCEPT_XML} + ${resp} RequestsLibrary.Get Request 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} RequestsLibrary.Delete session ${REST_CON}/node/openflow:1/table/${TABLE}/flow/${FLOW} + ${resp} RequestsLibrary.Delete Request 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} RequestsLibrary.Get session ${REST_CON}/node/openflow:1/table/${TABLE} + ${resp} RequestsLibrary.Get Request session ${REST_CON}/node/openflow:1/table/${TABLE} Should Not Contain ${resp.content} ${FLOW} Verify flows after deleting flow config on OVS diff --git a/csit/suites/openflowplugin/Flows_OF13/302__dst_mac.robot b/csit/suites/openflowplugin/Flows_OF13/302__dst_mac.robot index e435c97b20..6f24ca0611 100644 --- a/csit/suites/openflowplugin/Flows_OF13/302__dst_mac.robot +++ b/csit/suites/openflowplugin/Flows_OF13/302__dst_mac.robot @@ -22,13 +22,13 @@ Add a flow - Output to physical port# [Tags] Push ${body} OperatingSystem.Get File ${FILE} Set Suite Variable ${body} - ${resp} RequestsLibrary.Put session ${REST_CON}/node/openflow:1/table/${TABLE}/flow/${FLOW} headers=${HEADERS_XML} data=${body} + ${resp} RequestsLibrary.Put Request 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} RequestsLibrary.Get session ${REST_CON}/node/openflow:1/table/${TABLE}/flow/${FLOW} headers=${ACCEPT_XML} + ${resp} RequestsLibrary.Get Request 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} RequestsLibrary.Delete session ${REST_CON}/node/openflow:1/table/${TABLE}/flow/${FLOW} + ${resp} RequestsLibrary.Delete Request 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} RequestsLibrary.Get session ${REST_CON}/node/openflow:1/table/${TABLE} + ${resp} RequestsLibrary.Get Request session ${REST_CON}/node/openflow:1/table/${TABLE} Should Not Contain ${resp.content} ${FLOW} Verify flows after deleting flow config on OVS diff --git a/csit/suites/openflowplugin/Flows_OF13/304__eth_ip_port.robot b/csit/suites/openflowplugin/Flows_OF13/304__eth_ip_port.robot index 02e75a544d..e60b287764 100644 --- a/csit/suites/openflowplugin/Flows_OF13/304__eth_ip_port.robot +++ b/csit/suites/openflowplugin/Flows_OF13/304__eth_ip_port.robot @@ -22,13 +22,13 @@ Add a flow - Output to physical port# [Tags] Push ${body} OperatingSystem.Get File ${FILE} Set Suite Variable ${body} - ${resp} RequestsLibrary.Put session ${REST_CON}/node/openflow:1/table/${TABLE}/flow/${FLOW} headers=${HEADERS_XML} data=${body} + ${resp} RequestsLibrary.Put Request 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} RequestsLibrary.Get session ${REST_CON}/node/openflow:1/table/${TABLE}/flow/${FLOW} headers=${ACCEPT_XML} + ${resp} RequestsLibrary.Get Request 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} RequestsLibrary.Delete session ${REST_CON}/node/openflow:1/table/${TABLE}/flow/${FLOW} + ${resp} RequestsLibrary.Delete Request 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} RequestsLibrary.Get session ${REST_CON}/node/openflow:1/table/${TABLE} + ${resp} RequestsLibrary.Get Request session ${REST_CON}/node/openflow:1/table/${TABLE} Should Not Contain ${resp.content} ${FLOW} Verify flows after deleting flow config on OVS diff --git a/csit/suites/openflowplugin/Flows_OF13/306__eth_ip_qos.robot b/csit/suites/openflowplugin/Flows_OF13/306__eth_ip_qos.robot index e8452e7c88..e5b5100acf 100644 --- a/csit/suites/openflowplugin/Flows_OF13/306__eth_ip_qos.robot +++ b/csit/suites/openflowplugin/Flows_OF13/306__eth_ip_qos.robot @@ -23,13 +23,13 @@ Add a flow - Output to physical port# [Tags] Push ${body} OperatingSystem.Get File ${FILE} Set Suite Variable ${body} - ${resp} RequestsLibrary.Put session ${REST_CON}/node/openflow:1/table/${TABLE}/flow/${FLOW} headers=${HEADERS_XML} data=${body} + ${resp} RequestsLibrary.Put Request 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} RequestsLibrary.Get session ${REST_CON}/node/openflow:1/table/${TABLE}/flow/${FLOW} headers=${ACCEPT_XML} + ${resp} RequestsLibrary.Get Request 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} @@ -46,13 +46,13 @@ Verify flows after adding flow config on OVS Remove a flow - Output to physical port# [Documentation] Remove a flow [Tags] remove - ${resp} RequestsLibrary.Delete session ${REST_CON}/node/openflow:1/table/${TABLE}/flow/${FLOW} + ${resp} RequestsLibrary.Delete Request 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} RequestsLibrary.Get session ${REST_CON}/node/openflow:1/table/${TABLE} + ${resp} RequestsLibrary.Get Request session ${REST_CON}/node/openflow:1/table/${TABLE} Should Not Contain ${resp.content} ${FLOW} Verify flows after deleting flow config on OVS diff --git a/csit/suites/openflowplugin/Flows_OF13/307__eth_ip_qos_port_tcpport.robot b/csit/suites/openflowplugin/Flows_OF13/307__eth_ip_qos_port_tcpport.robot index 29b690bf61..1aa0438b2b 100644 --- a/csit/suites/openflowplugin/Flows_OF13/307__eth_ip_qos_port_tcpport.robot +++ b/csit/suites/openflowplugin/Flows_OF13/307__eth_ip_qos_port_tcpport.robot @@ -23,13 +23,13 @@ Add a flow - Output to physical port# [Tags] Push ${body} OperatingSystem.Get File ${FILE} Set Suite Variable ${body} - ${resp} RequestsLibrary.Put session ${REST_CON}/node/openflow:1/table/${TABLE}/flow/${FLOW} headers=${HEADERS_XML} data=${body} + ${resp} RequestsLibrary.Put Request 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} RequestsLibrary.Get session ${REST_CON}/node/openflow:1/table/${TABLE}/flow/${FLOW} headers=${ACCEPT_XML} + ${resp} RequestsLibrary.Get Request 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} @@ -52,7 +52,7 @@ Remove a flow - Output to physical port# Verify after deleting flow config - Output to physical port# [Documentation] Verify the flow [Tags] Get - ${resp} RequestsLibrary.Get session ${REST_CON}/node/openflow:1/table/${TABLE} + ${resp} RequestsLibrary.Get Request session ${REST_CON}/node/openflow:1/table/${TABLE} Should Not Contain ${resp.content} ${FLOW} Verify flows after deleting flow config on OVS diff --git a/csit/suites/openflowplugin/Flows_OF13/308__eth_ip_qos_port_tcpport_mpls.robot b/csit/suites/openflowplugin/Flows_OF13/308__eth_ip_qos_port_tcpport_mpls.robot index 812d3e1489..7506c41e5c 100644 --- a/csit/suites/openflowplugin/Flows_OF13/308__eth_ip_qos_port_tcpport_mpls.robot +++ b/csit/suites/openflowplugin/Flows_OF13/308__eth_ip_qos_port_tcpport_mpls.robot @@ -23,13 +23,13 @@ Add a flow - Output to physical port# [Tags] Push ${body} OperatingSystem.Get File ${FILE} Set Suite Variable ${body} - ${resp} RequestsLibrary.Put session ${REST_CON}/node/openflow:1/table/${TABLE}/flow/${FLOW} headers=${HEADERS_XML} data=${body} + ${resp} RequestsLibrary.Put Request 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} RequestsLibrary.Get session ${REST_CON}/node/openflow:1/table/${TABLE}/flow/${FLOW} headers=${ACCEPT_XML} + ${resp} RequestsLibrary.Get Request 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} @@ -46,13 +46,13 @@ Verify flows after adding flow config on OVS Remove a flow - Output to physical port# [Documentation] Remove a flow [Tags] remove - ${resp} RequestsLibrary.Delete session ${REST_CON}/node/openflow:1/table/${TABLE}/flow/${FLOW} + ${resp} RequestsLibrary.Delete Request 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} RequestsLibrary.Get session ${REST_CON}/node/openflow:1/table/${TABLE} + ${resp} RequestsLibrary.Get Request session ${REST_CON}/node/openflow:1/table/${TABLE} Should Not Contain ${resp.content} ${FLOW} Verify flows after deleting flow config on OVS diff --git a/csit/suites/openflowplugin/Flows_OF13/309__eth_ip_qos_sctp.robot b/csit/suites/openflowplugin/Flows_OF13/309__eth_ip_qos_sctp.robot index 92b253e188..25f662b333 100644 --- a/csit/suites/openflowplugin/Flows_OF13/309__eth_ip_qos_sctp.robot +++ b/csit/suites/openflowplugin/Flows_OF13/309__eth_ip_qos_sctp.robot @@ -23,13 +23,13 @@ Add a flow - Output to physical port# [Tags] Push ${body} OperatingSystem.Get File ${FILE} Set Suite Variable ${body} - ${resp} RequestsLibrary.Put session ${REST_CON}/node/openflow:1/table/${TABLE}/flow/${FLOW} data=${body} + ${resp} RequestsLibrary.Put Request session ${REST_CON}/node/openflow:1/table/${TABLE}/flow/${FLOW} 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} RequestsLibrary.Get session ${REST_CON}/node/openflow:1/table/${TABLE}/flow/${FLOW} headers=${ACCEPT_XML} + ${resp} RequestsLibrary.Get Request 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} @@ -46,13 +46,13 @@ Verify flows after adding flow config on OVS Remove a flow - Output to physical port# [Documentation] Remove a flow [Tags] remove - ${resp} RequestsLibrary.Delete session ${REST_CON}/node/openflow:1/table/${TABLE}/flow/${FLOW} + ${resp} RequestsLibrary.Delete Request 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} RequestsLibrary.Get session ${REST_CON}/node/openflow:1/table/${TABLE} + ${resp} RequestsLibrary.Get Request session ${REST_CON}/node/openflow:1/table/${TABLE} Should Not Contain ${resp.content} ${FLOW} Verify flows after deleting flow config on OVS diff --git a/csit/suites/openflowplugin/Flows_OF13/310__eth_ip_qos_icmp.robot b/csit/suites/openflowplugin/Flows_OF13/310__eth_ip_qos_icmp.robot index d81c1f5311..7247a3cdd7 100644 --- a/csit/suites/openflowplugin/Flows_OF13/310__eth_ip_qos_icmp.robot +++ b/csit/suites/openflowplugin/Flows_OF13/310__eth_ip_qos_icmp.robot @@ -23,13 +23,13 @@ Add a flow - Output to physical port# [Tags] Push ${body} OperatingSystem.Get File ${FILE} Set Suite Variable ${body} - ${resp} RequestsLibrary.Put session ${REST_CON}/node/openflow:1/table/${TABLE}/flow/${FLOW} headers=${HEADERS_XML} data=${body} + ${resp} RequestsLibrary.Put Request 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} RequestsLibrary.Get session ${REST_CON}/node/openflow:1/table/${TABLE}/flow/${FLOW} headers=${ACCEPT_XML} + ${resp} RequestsLibrary.Get Request 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} @@ -46,13 +46,13 @@ Verify flows after adding flow config on OVS Remove a flow - Output to physical port# [Documentation] Remove a flow [Tags] remove - ${resp} RequestsLibrary.Delete session ${REST_CON}/node/openflow:1/table/${TABLE}/flow/${FLOW} + ${resp} RequestsLibrary.Delete Request 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} RequestsLibrary.Get session ${REST_CON}/node/openflow:1/table/${TABLE} + ${resp} RequestsLibrary.Get Request session ${REST_CON}/node/openflow:1/table/${TABLE} Should Not Contain ${resp.content} ${FLOW} Verify flows after deleting flow config on OVS diff --git a/csit/suites/openflowplugin/Flows_OF13/311__eth_arp.robot b/csit/suites/openflowplugin/Flows_OF13/311__eth_arp.robot index 01c5b58907..e502458bfe 100644 --- a/csit/suites/openflowplugin/Flows_OF13/311__eth_arp.robot +++ b/csit/suites/openflowplugin/Flows_OF13/311__eth_arp.robot @@ -22,13 +22,13 @@ Add a flow - Output to physical port# [Tags] Push ${body} OperatingSystem.Get File ${FILE} Set Suite Variable ${body} - ${resp} RequestsLibrary.Put session ${REST_CON}/node/openflow:1/table/${TABLE}/flow/${FLOW} headers=${HEADERS_XML} data=${body} + ${resp} RequestsLibrary.Put Request 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} RequestsLibrary.Get session ${REST_CON}/node/openflow:1/table/${TABLE}/flow/${FLOW} headers=${ACCEPT_XML} + ${resp} RequestsLibrary.Get Request 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} RequestsLibrary.Delete session ${REST_CON}/node/openflow:1/table/${TABLE}/flow/${FLOW} + ${resp} RequestsLibrary.Delete Request 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} RequestsLibrary.Get session ${REST_CON}/node/openflow:1/table/${TABLE} + ${resp} RequestsLibrary.Get Request session ${REST_CON}/node/openflow:1/table/${TABLE} Should Not Contain ${resp.content} ${FLOW} Verify flows after deleting flow config on OVS diff --git a/csit/suites/openflowplugin/Flows_OF13/312__eth_arp_transport.robot b/csit/suites/openflowplugin/Flows_OF13/312__eth_arp_transport.robot index 22d1c35292..5e4b7ead1e 100644 --- a/csit/suites/openflowplugin/Flows_OF13/312__eth_arp_transport.robot +++ b/csit/suites/openflowplugin/Flows_OF13/312__eth_arp_transport.robot @@ -23,13 +23,13 @@ Add a flow - Output to physical port# [Tags] Push ${body} OperatingSystem.Get File ${FILE} Set Suite Variable ${body} - ${resp} RequestsLibrary.Put session ${REST_CON}/node/openflow:1/table/${TABLE}/flow/${FLOW} headers=${HEADERS_XML} data=${body} + ${resp} RequestsLibrary.Put Request 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} RequestsLibrary.Get session ${REST_CON}/node/openflow:1/table/${TABLE}/flow/${FLOW} headers=${ACCEPT_XML} + ${resp} RequestsLibrary.Get Request 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} @@ -46,13 +46,13 @@ Verify flows after adding flow config on OVS Remove a flow - Output to physical port# [Documentation] Remove a flow [Tags] remove - ${resp} RequestsLibrary.Delete session ${REST_CON}/node/openflow:1/table/${TABLE}/flow/${FLOW} + ${resp} RequestsLibrary.Delete Request 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} RequestsLibrary.Get session ${REST_CON}/node/openflow:1/table/${TABLE} + ${resp} RequestsLibrary.Get Request session ${REST_CON}/node/openflow:1/table/${TABLE} Should Not Contain ${resp.content} ${FLOW} Verify flows after deleting flow config on OVS diff --git a/csit/suites/openflowplugin/Flows_OF13/313__eth_arp_transport_hardware.robot b/csit/suites/openflowplugin/Flows_OF13/313__eth_arp_transport_hardware.robot index 3d7f732e73..e3d30dac35 100644 --- a/csit/suites/openflowplugin/Flows_OF13/313__eth_arp_transport_hardware.robot +++ b/csit/suites/openflowplugin/Flows_OF13/313__eth_arp_transport_hardware.robot @@ -23,13 +23,13 @@ Add a flow - Output to physical port# [Tags] Push ${body} OperatingSystem.Get File ${FILE} Set Suite Variable ${body} - ${resp} RequestsLibrary.Put session ${REST_CON}/node/openflow:1/table/${TABLE}/flow/${FLOW} headers=${HEADERS_XML} data=${body} + ${resp} RequestsLibrary.Put Request 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} RequestsLibrary.Get session ${REST_CON}/node/openflow:1/table/${TABLE}/flow/${FLOW} headers=${ACCEPT_XML} + ${resp} RequestsLibrary.Get Request 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} @@ -46,13 +46,13 @@ Verify flows after adding flow config on OVS Remove a flow - Output to physical port# [Documentation] Remove a flow [Tags] remove - ${resp} RequestsLibrary.Delete session ${REST_CON}/node/openflow:1/table/${TABLE}/flow/${FLOW} + ${resp} RequestsLibrary.Delete Request 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} RequestsLibrary.Get session ${REST_CON}/node/openflow:1/table/${TABLE} + ${resp} RequestsLibrary.Get Request session ${REST_CON}/node/openflow:1/table/${TABLE} Should Not Contain ${resp.content} ${FLOW} Verify flows after deleting flow config on OVS diff --git a/csit/suites/openflowplugin/Flows_OF13/314__eth_vlan.robot b/csit/suites/openflowplugin/Flows_OF13/314__eth_vlan.robot index 6d27a9e55a..36b357df34 100644 --- a/csit/suites/openflowplugin/Flows_OF13/314__eth_vlan.robot +++ b/csit/suites/openflowplugin/Flows_OF13/314__eth_vlan.robot @@ -22,13 +22,13 @@ Add a flow - Output to physical port# [Tags] Push ${body} OperatingSystem.Get File ${FILE} Set Suite Variable ${body} - ${resp} RequestsLibrary.Put session ${REST_CON}/node/openflow:1/table/${TABLE}/flow/${FLOW} headers=${HEADERS_XML} data=${body} + ${resp} RequestsLibrary.Put Request 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} RequestsLibrary.Get session ${REST_CON}/node/openflow:1/table/${TABLE}/flow/${FLOW} headers=${ACCEPT_XML} + ${resp} RequestsLibrary.Get Request 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} RequestsLibrary.Delete session ${REST_CON}/node/openflow:1/table/${TABLE}/flow/${FLOW} + ${resp} RequestsLibrary.Delete Request 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} RequestsLibrary.Get session ${REST_CON}/node/openflow:1/table/${TABLE} + ${resp} RequestsLibrary.Get Request session ${REST_CON}/node/openflow:1/table/${TABLE} Should Not Contain ${resp.content} ${FLOW} Verify flows after deleting flow config on OVS diff --git a/csit/suites/openflowplugin/Flows_OF13/315__timeout_vlan_pcp_vlan.robot b/csit/suites/openflowplugin/Flows_OF13/315__timeout_vlan_pcp_vlan.robot index b99efd2d8e..24f652cd41 100644 --- a/csit/suites/openflowplugin/Flows_OF13/315__timeout_vlan_pcp_vlan.robot +++ b/csit/suites/openflowplugin/Flows_OF13/315__timeout_vlan_pcp_vlan.robot @@ -22,13 +22,13 @@ Add a flow - Output to physical port# [Tags] Push ${body} OperatingSystem.Get File ${FILE} Set Suite Variable ${body} - ${resp} RequestsLibrary.Put session ${REST_CON}/node/openflow:1/table/${TABLE}/flow/${FLOW} headers=${HEADERS_XML} data=${body} + ${resp} RequestsLibrary.Put Request 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} RequestsLibrary.Get session ${REST_CON}/node/openflow:1/table/${TABLE}/flow/${FLOW} headers=${ACCEPT_XML} + ${resp} RequestsLibrary.Get Request 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} @@ -44,13 +44,13 @@ Verify flows after adding flow config on OVS Remove a flow - Output to physical port# [Documentation] Remove a flow [Tags] remove - ${resp} RequestsLibrary.Delete session ${REST_CON}/node/openflow:1/table/${TABLE}/flow/${FLOW} + ${resp} RequestsLibrary.Delete Request 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} RequestsLibrary.Get session ${REST_CON}/node/openflow:1/table/${TABLE} + ${resp} RequestsLibrary.Get Request session ${REST_CON}/node/openflow:1/table/${TABLE} Should Not Contain ${resp.content} ${FLOW} Verify flows after deleting flow config on OVS diff --git a/csit/suites/openflowplugin/Flows_OF13/316__eth_mpls_tc_bos.robot b/csit/suites/openflowplugin/Flows_OF13/316__eth_mpls_tc_bos.robot index b5c4572b95..55bcc61165 100644 --- a/csit/suites/openflowplugin/Flows_OF13/316__eth_mpls_tc_bos.robot +++ b/csit/suites/openflowplugin/Flows_OF13/316__eth_mpls_tc_bos.robot @@ -23,13 +23,13 @@ Add a flow - Output to physical port# [Tags] Push ${body} OperatingSystem.Get File ${FILE} Set Suite Variable ${body} - ${resp} RequestsLibrary.Put session ${REST_CON}/node/openflow:1/table/${TABLE}/flow/${FLOW} headers=${HEADERS_XML} data=${body} + ${resp} RequestsLibrary.Put Request 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} RequestsLibrary.Get session ${REST_CON}/node/openflow:1/table/${TABLE}/flow/${FLOW} headers=${ACCEPT_XML} + ${resp} RequestsLibrary.Get Request 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} @@ -46,13 +46,13 @@ Verify flows after adding flow config on OVS Remove a flow - Output to physical port# [Documentation] Remove a flow [Tags] remove - ${resp} RequestsLibrary.Delete session ${REST_CON}/node/openflow:1/table/${TABLE}/flow/${FLOW} + ${resp} RequestsLibrary.Delete Request 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} RequestsLibrary.Get session ${REST_CON}/node/openflow:1/table/${TABLE} + ${resp} RequestsLibrary.Get Request session ${REST_CON}/node/openflow:1/table/${TABLE} Should Not Contain ${resp.content} ${FLOW} Verify flows after deleting flow config on OVS diff --git a/csit/suites/openflowplugin/Flows_OF13/317__eth_ipv6.robot b/csit/suites/openflowplugin/Flows_OF13/317__eth_ipv6.robot index d973672995..729be07a47 100644 --- a/csit/suites/openflowplugin/Flows_OF13/317__eth_ipv6.robot +++ b/csit/suites/openflowplugin/Flows_OF13/317__eth_ipv6.robot @@ -22,13 +22,13 @@ Add a flow - Output to physical port# [Tags] Push ${body} OperatingSystem.Get File ${FILE} Set Suite Variable ${body} - ${resp} RequestsLibrary.Put session ${REST_CON}/node/openflow:1/table/${TABLE}/flow/${FLOW} headers=${HEADERS_XML} data=${body} + ${resp} RequestsLibrary.Put Request 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} RequestsLibrary.Get session ${REST_CON}/node/openflow:1/table/${TABLE}/flow/${FLOW} headers=${ACCEPT_XML} + ${resp} RequestsLibrary.Get Request 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} RequestsLibrary.Delete session ${REST_CON}/node/openflow:1/table/${TABLE}/flow/${FLOW} + ${resp} RequestsLibrary.Delete Request 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} RequestsLibrary.Get session ${REST_CON}/node/openflow:1/table/${TABLE} + ${resp} RequestsLibrary.Get Request session ${REST_CON}/node/openflow:1/table/${TABLE} Should Not Contain ${resp.content} ${FLOW} Verify flows after deleting flow config on OVS diff --git a/csit/suites/openflowplugin/Flows_OF13/318__metadata.robot b/csit/suites/openflowplugin/Flows_OF13/318__metadata.robot index 2d95024aff..14a5de3601 100644 --- a/csit/suites/openflowplugin/Flows_OF13/318__metadata.robot +++ b/csit/suites/openflowplugin/Flows_OF13/318__metadata.robot @@ -22,13 +22,13 @@ Add a flow - Output to physical port# [Tags] Push ${body} OperatingSystem.Get File ${FILE} Set Suite Variable ${body} - ${resp} RequestsLibrary.Put session ${REST_CON}/node/openflow:1/table/${TABLE}/flow/${FLOW} headers=${HEADERS_XML} data=${body} + ${resp} RequestsLibrary.Put Request 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} RequestsLibrary.Get session ${REST_CON}/node/openflow:1/table/${TABLE}/flow/${FLOW} headers=${ACCEPT_XML} + ${resp} RequestsLibrary.Get Request 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} RequestsLibrary.Delete session ${REST_CON}/node/openflow:1/table/${TABLE}/flow/${FLOW} + ${resp} RequestsLibrary.Delete Request 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} RequestsLibrary.Get session ${REST_CON}/node/openflow:1/table/${TABLE} + ${resp} RequestsLibrary.Get Request session ${REST_CON}/node/openflow:1/table/${TABLE} Should Not Contain ${resp.content} ${FLOW} Verify flows after deleting flow config on OVS diff --git a/csit/suites/openflowplugin/Flows_OF13/319__metadata_mask.robot b/csit/suites/openflowplugin/Flows_OF13/319__metadata_mask.robot index 6c4223eb93..99b865677a 100644 --- a/csit/suites/openflowplugin/Flows_OF13/319__metadata_mask.robot +++ b/csit/suites/openflowplugin/Flows_OF13/319__metadata_mask.robot @@ -22,13 +22,13 @@ Add a flow - Output to physical port# [Tags] Push ${body} OperatingSystem.Get File ${FILE} Set Suite Variable ${body} - ${resp} RequestsLibrary.Put session ${REST_CON}/node/openflow:1/table/${TABLE}/flow/${FLOW} headers=${HEADERS_XML} data=${body} + ${resp} RequestsLibrary.Put Request 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} RequestsLibrary.Get session ${REST_CON}/node/openflow:1/table/${TABLE}/flow/${FLOW} headers=${ACCEPT_XML} + ${resp} RequestsLibrary.Get Request 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} RequestsLibrary.Delete session ${REST_CON}/node/openflow:1/table/${TABLE}/flow/${FLOW} + ${resp} RequestsLibrary.Delete Request 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} RequestsLibrary.Get session ${REST_CON}/node/openflow:1/table/${TABLE} + ${resp} RequestsLibrary.Get Request session ${REST_CON}/node/openflow:1/table/${TABLE} Should Not Contain ${resp.content} ${FLOW} Verify flows after deleting flow config on OVS diff --git a/csit/suites/openflowplugin/Flows_OF13/320__ipv6_meta_qos_udp.robot b/csit/suites/openflowplugin/Flows_OF13/320__ipv6_meta_qos_udp.robot index a35eb4cd6f..70213cdbb1 100644 --- a/csit/suites/openflowplugin/Flows_OF13/320__ipv6_meta_qos_udp.robot +++ b/csit/suites/openflowplugin/Flows_OF13/320__ipv6_meta_qos_udp.robot @@ -23,13 +23,13 @@ Add a flow - Output to physical port# [Tags] Push ${body} OperatingSystem.Get File ${FILE} Set Suite Variable ${body} - ${resp} RequestsLibrary.Put session ${REST_CON}/node/openflow:1/table/${TABLE}/flow/${FLOW} headers=${HEADERS_XML} data=${body} + ${resp} RequestsLibrary.Put Request 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} RequestsLibrary.Get session ${REST_CON}/node/openflow:1/table/${TABLE}/flow/${FLOW} headers=${ACCEPT_XML} + ${resp} RequestsLibrary.Get Request 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} @@ -46,13 +46,13 @@ Verify flows after adding flow config on OVS Remove a flow - Output to physical port# [Documentation] Remove a flow [Tags] remove - ${resp} RequestsLibrary.Delete session ${REST_CON}/node/openflow:1/table/${TABLE}/flow/${FLOW} + ${resp} RequestsLibrary.Delete Request 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} RequestsLibrary.Get session ${REST_CON}/node/openflow:1/table/${TABLE} + ${resp} RequestsLibrary.Get Request session ${REST_CON}/node/openflow:1/table/${TABLE} Should Not Contain ${resp.content} ${FLOW} Verify flows after deleting flow config on OVS diff --git a/csit/suites/openflowplugin/Flows_OF13/321__ipv6_meta_qos_tcp.robot b/csit/suites/openflowplugin/Flows_OF13/321__ipv6_meta_qos_tcp.robot index d4d69de0b1..196607331b 100644 --- a/csit/suites/openflowplugin/Flows_OF13/321__ipv6_meta_qos_tcp.robot +++ b/csit/suites/openflowplugin/Flows_OF13/321__ipv6_meta_qos_tcp.robot @@ -23,13 +23,13 @@ Add a flow - Output to physical port# [Tags] Push ${body} OperatingSystem.Get File ${FILE} Set Suite Variable ${body} - ${resp} RequestsLibrary.Put session ${REST_CON}/node/openflow:1/table/${TABLE}/flow/${FLOW} headers=${HEADERS_XML} data=${body} + ${resp} RequestsLibrary.Put Request 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} RequestsLibrary.Get session ${REST_CON}/node/openflow:1/table/${TABLE}/flow/${FLOW} headers=${ACCEPT_XML} + ${resp} RequestsLibrary.Get Request 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} @@ -46,13 +46,13 @@ Verify flows after adding flow config on OVS Remove a flow - Output to physical port# [Documentation] Remove a flow [Tags] remove - ${resp} RequestsLibrary.Delete session ${REST_CON}/node/openflow:1/table/${TABLE}/flow/${FLOW} + ${resp} RequestsLibrary.Delete Request 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} RequestsLibrary.Get session ${REST_CON}/node/openflow:1/table/${TABLE} + ${resp} RequestsLibrary.Get Request session ${REST_CON}/node/openflow:1/table/${TABLE} Should Not Contain ${resp.content} ${FLOW} Verify flows after deleting flow config on OVS diff --git a/csit/suites/openflowplugin/Flows_OF13/322__ipv6_flow.robot b/csit/suites/openflowplugin/Flows_OF13/322__ipv6_flow.robot index 8249383be1..d8e3a16bbe 100644 --- a/csit/suites/openflowplugin/Flows_OF13/322__ipv6_flow.robot +++ b/csit/suites/openflowplugin/Flows_OF13/322__ipv6_flow.robot @@ -23,13 +23,13 @@ Add a flow - Output to physical port# [Tags] Push ${body} OperatingSystem.Get File ${FILE} Set Suite Variable ${body} - ${resp} RequestsLibrary.Put session ${REST_CON}/node/openflow:1/table/${TABLE}/flow/${FLOW} headers=${HEADERS_XML} data=${body} + ${resp} RequestsLibrary.Put Request 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} RequestsLibrary.Get session ${REST_CON}/node/openflow:1/table/${TABLE}/flow/${FLOW} headers=${ACCEPT_XML} + ${resp} RequestsLibrary.Get Request 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} @@ -46,13 +46,13 @@ Verify flows after adding flow config on OVS Remove a flow - Output to physical port# [Documentation] Remove a flow [Tags] remove - ${resp} RequestsLibrary.Delete session ${REST_CON}/node/openflow:1/table/${TABLE}/flow/${FLOW} + ${resp} RequestsLibrary.Delete Request 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} RequestsLibrary.Get session ${REST_CON}/node/openflow:1/table/${TABLE} + ${resp} RequestsLibrary.Get Request session ${REST_CON}/node/openflow:1/table/${TABLE} Should Not Contain ${resp.content} ${FLOW} Verify flows after deleting flow config on OVS diff --git a/csit/suites/openflowplugin/Flows_OF13/323__tunnel.robot b/csit/suites/openflowplugin/Flows_OF13/323__tunnel.robot index 4a57cd2054..e38f53f255 100644 --- a/csit/suites/openflowplugin/Flows_OF13/323__tunnel.robot +++ b/csit/suites/openflowplugin/Flows_OF13/323__tunnel.robot @@ -22,13 +22,13 @@ Add a flow - Output to physical port# [Tags] Push ${body} OperatingSystem.Get File ${FILE} Set Suite Variable ${body} - ${resp} RequestsLibrary.Put session ${REST_CON}/node/openflow:1/table/${TABLE}/flow/${FLOW} headers=${HEADERS_XML} data=${body} + ${resp} RequestsLibrary.Put Request 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} RequestsLibrary.Get session ${REST_CON}/node/openflow:1/table/${TABLE}/flow/${FLOW} headers=${ACCEPT_XML} + ${resp} RequestsLibrary.Get Request 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} RequestsLibrary.Delete session ${REST_CON}/node/openflow:1/table/${TABLE}/flow/${FLOW} + ${resp} RequestsLibrary.Delete Request 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} RequestsLibrary.Get session ${REST_CON}/node/openflow:1/table/${TABLE} + ${resp} RequestsLibrary.Get Request session ${REST_CON}/node/openflow:1/table/${TABLE} Should Not Contain ${resp.content} ${FLOW} Verify flows after deleting flow config on OVS diff --git a/csit/suites/openflowplugin/Flows_OF13/324__ipv6_flow_label.robot b/csit/suites/openflowplugin/Flows_OF13/324__ipv6_flow_label.robot index 89dee31fd7..7d98031c04 100644 --- a/csit/suites/openflowplugin/Flows_OF13/324__ipv6_flow_label.robot +++ b/csit/suites/openflowplugin/Flows_OF13/324__ipv6_flow_label.robot @@ -23,13 +23,13 @@ Add a flow - Output to physical port# [Tags] Push ${body} OperatingSystem.Get File ${FILE} Set Suite Variable ${body} - ${resp} RequestsLibrary.Put session ${REST_CON}/node/openflow:1/table/${TABLE}/flow/${FLOW} headers=${HEADERS_XML} data=${body} + ${resp} RequestsLibrary.Put Request 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} RequestsLibrary.Get session ${REST_CON}/node/openflow:1/table/${TABLE}/flow/${FLOW} headers=${ACCEPT_XML} + ${resp} RequestsLibrary.Get Request 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} @@ -46,13 +46,13 @@ Verify flows after adding flow config on OVS Remove a flow - Output to physical port# [Documentation] Remove a flow [Tags] remove - ${resp} RequestsLibrary.Delete session ${REST_CON}/node/openflow:1/table/${TABLE}/flow/${FLOW} + ${resp} RequestsLibrary.Delete Request 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} RequestsLibrary.Get session ${REST_CON}/node/openflow:1/table/${TABLE} + ${resp} RequestsLibrary.Get Request session ${REST_CON}/node/openflow:1/table/${TABLE} Should Not Contain ${resp.content} ${FLOW} Verify flows after deleting flow config on OVS diff --git a/csit/suites/openflowplugin/Flows_Stats_OF13/010__SM_add_upd_del_flows.robot b/csit/suites/openflowplugin/Flows_Stats_OF13/010__SM_add_upd_del_flows.robot index ea715903e1..80acc8af96 100644 --- a/csit/suites/openflowplugin/Flows_Stats_OF13/010__SM_add_upd_del_flows.robot +++ b/csit/suites/openflowplugin/Flows_Stats_OF13/010__SM_add_upd_del_flows.robot @@ -239,7 +239,7 @@ Check Config Flow Presence Flow Presence Config Flow ${headers}= Create Dictionary Accept=application/xml - ${resp}= RequestsLibrary.Get session /restconf/config/opendaylight-inventory:nodes/node/openflow:${switch_idx}/table/${table_id}/flow/${flow_id} headers=${headers} + ${resp}= RequestsLibrary.Get Request session /restconf/config/opendaylight-inventory:nodes/node/openflow:${switch_idx}/table/${table_id}/flow/${flow_id} headers=${headers} Log ${resp} Log ${resp.content} Return From Keyword If ${resp.status_code}!=200 ${False} ${EMPTY} @@ -259,7 +259,7 @@ Check Operational Table Presence Flow Presence Operational Table ${headers}= Create Dictionary Accept=application/xml - ${resp}= RequestsLibrary.Get session /restconf/operational/opendaylight-inventory:nodes/node/openflow:${switch_idx}/table/${table_id} headers=${headers} + ${resp}= RequestsLibrary.Get Request session /restconf/operational/opendaylight-inventory:nodes/node/openflow:${switch_idx}/table/${table_id} headers=${headers} Log ${resp} Log ${resp.content} Return From Keyword If ${resp.status_code}!=200 ${False} ${EMPTY} @@ -269,12 +269,12 @@ Flow Presence Operational Table Add Flow Log ${data} - ${resp}= RequestsLibrary.Put session /restconf/config/opendaylight-inventory:nodes/node/openflow:${switch_idx}/table/${table_id}/flow/${flow_id} headers=${HEADERS_XML} data=${data} + ${resp}= RequestsLibrary.Put Request session /restconf/config/opendaylight-inventory:nodes/node/openflow:${switch_idx}/table/${table_id}/flow/${flow_id} headers=${HEADERS_XML} data=${data} ${msg}= Set Variable Adding flow for /restconf/config/opendaylight-inventory:nodes/node/openflow:${switch_idx}/table/${table_id}/flow/${flow_id} failed, http response ${resp.status_code} received. Should Be Equal As Strings ${resp.status_code} 200 msg=${msg} Delete Flow - ${resp}= RequestsLibrary.Delete session /restconf/config/opendaylight-inventory:nodes/node/openflow:${switch_idx}/table/${table_id}/flow/${flow_id} + ${resp}= RequestsLibrary.Delete Request session /restconf/config/opendaylight-inventory:nodes/node/openflow:${switch_idx}/table/${table_id}/flow/${flow_id} ${msg}= Set Variable Delete flow for /restconf/config/opendaylight-inventory:nodes/node/openflow:${switch_idx}/table/${table_id}/flow/${flow_id} failed, http response ${resp.status_code} received. Should Be Equal As Strings ${resp.status_code} 200 msg=${msg} diff --git a/csit/suites/openflowplugin/Groups_Meters_OF13/005__openflow_group.robot b/csit/suites/openflowplugin/Groups_Meters_OF13/005__openflow_group.robot index afe4f7fd25..ca767746c0 100644 --- a/csit/suites/openflowplugin/Groups_Meters_OF13/005__openflow_group.robot +++ b/csit/suites/openflowplugin/Groups_Meters_OF13/005__openflow_group.robot @@ -30,13 +30,13 @@ Add a group [Tags] Push ${body} OperatingSystem.Get File ${GROUP} Set Suite Variable ${body} - ${resp} RequestsLibrary.Put session ${REST_CONTEXT_CF}/group/1 headers=${HEADERS_XML} data=${body} + ${resp} RequestsLibrary.Put Request session ${REST_CONTEXT_CF}/group/1 headers=${HEADERS_XML} data=${body} Log ${resp.content} Should Be Equal As Strings ${resp.status_code} 200 Verify after adding group config [Documentation] Get the group stat in config - ${resp} RequestsLibrary.Get session ${REST_CONTEXT_CF}/group/1 + ${resp} RequestsLibrary.Get Request session ${REST_CONTEXT_CF}/group/1 Log ${resp.content} Should Be Equal As Strings ${resp.status_code} 200 Should Contain ${resp.content} ${GROUP_NAME} @@ -52,14 +52,14 @@ Add a flow that includes a group [Tags] Push ${body} OperatingSystem.Get File ${FLOW} Set Suite Variable ${body} - ${resp} RequestsLibrary.Put session ${REST_CONTEXT_CF}/table/0/flow/1 headers=${HEADERS_XML} data=${body} + ${resp} RequestsLibrary.Put Request session ${REST_CONTEXT_CF}/table/0/flow/1 headers=${HEADERS_XML} data=${body} Log ${resp.content} Should Be Equal As Strings ${resp.status_code} 200 Verify after adding flow config [Documentation] Verify the flow [Tags] Get - ${resp} RequestsLibrary.Get session ${REST_CONTEXT_CF}/table/0/flow/1 + ${resp} RequestsLibrary.Get Request session ${REST_CONTEXT_CF}/table/0/flow/1 Log ${resp.content} Should Be Equal As Strings ${resp.status_code} 200 Should Contain ${resp.content} ${FLOW_NAME} @@ -71,24 +71,24 @@ Verify after adding flow operational Remove the flow [Documentation] Remove the flow - ${resp} RequestsLibrary.Delete session ${REST_CONTEXT_CF}/table/0/flow/1 + ${resp} RequestsLibrary.Delete Request session ${REST_CONTEXT_CF}/table/0/flow/1 Should Be Equal As Strings ${resp.status_code} 200 Verify after deleting flow [Documentation] Verify the flow removal [Tags] Get - ${resp} RequestsLibrary.Get session ${REST_CONTEXT_CF}/table/0/flow/1 + ${resp} RequestsLibrary.Get Request session ${REST_CONTEXT_CF}/table/0/flow/1 Should Not Contain ${resp.content} ${FLOW_NAME} Delete the group [Documentation] Remove the group [Tags] Delete - ${resp} RequestsLibrary.Delete session ${REST_CONTEXT_CF}/group/1 + ${resp} RequestsLibrary.Delete Request session ${REST_CONTEXT_CF}/group/1 Log ${resp.content} Should Be Equal As Strings ${resp.status_code} 200 Verify after deleting group [Documentation] Verify the flow removal [Tags] Get - ${resp} RequestsLibrary.Get session ${REST_CONTEXT_CF}/group/1 + ${resp} RequestsLibrary.Get Request session ${REST_CONTEXT_CF}/group/1 Should Not Contain ${resp.content} ${GROUP_NAME} diff --git a/csit/suites/openflowplugin/Groups_Meters_OF13/010__openflow_meter.robot b/csit/suites/openflowplugin/Groups_Meters_OF13/010__openflow_meter.robot index 9f3dd32386..bbb6bfe530 100644 --- a/csit/suites/openflowplugin/Groups_Meters_OF13/010__openflow_meter.robot +++ b/csit/suites/openflowplugin/Groups_Meters_OF13/010__openflow_meter.robot @@ -30,13 +30,13 @@ Add a meter [Tags] Push ${body} OperatingSystem.Get File ${METER} Set Suite Variable ${body} - ${resp} RequestsLibrary.Put session ${REST_CONTEXT_CF}/meter/1 headers=${HEADERS_XML} data=${body} + ${resp} RequestsLibrary.Put Request session ${REST_CONTEXT_CF}/meter/1 headers=${HEADERS_XML} data=${body} Log ${resp.content} Should Be Equal As Strings ${resp.status_code} 200 Verify after adding meter config [Documentation] Get the meter stat in config - ${resp} RequestsLibrary.Get session ${REST_CONTEXT_CF}/meter/1 + ${resp} RequestsLibrary.Get Request session ${REST_CONTEXT_CF}/meter/1 Log ${resp.content} Should Be Equal As Strings ${resp.status_code} 200 Should Contain ${resp.content} ${METER_NAME} @@ -52,14 +52,14 @@ Add a flow that includes a meter [Tags] Push ${body} OperatingSystem.Get File ${FLOW} Set Suite Variable ${body} - ${resp} RequestsLibrary.Put session ${REST_CONTEXT_CF}/table/0/flow/2 headers=${HEADERS_XML} data=${body} + ${resp} RequestsLibrary.Put Request session ${REST_CONTEXT_CF}/table/0/flow/2 headers=${HEADERS_XML} data=${body} Log ${resp.content} Should Be Equal As Strings ${resp.status_code} 200 Verify after adding flow config [Documentation] Verify the flow [Tags] Get - ${resp} RequestsLibrary.Get session ${REST_CONTEXT_CF}/table/0/flow/2 + ${resp} RequestsLibrary.Get Request session ${REST_CONTEXT_CF}/table/0/flow/2 Log ${resp.content} Should Be Equal As Strings ${resp.status_code} 200 Should Contain ${resp.content} ${FLOW_NAME} @@ -71,24 +71,24 @@ Verify after adding flow operational Remove the flow [Documentation] Remove the flow - ${resp} RequestsLibrary.Delete session ${REST_CONTEXT_CF}/table/0/flow/2 + ${resp} RequestsLibrary.Delete Request session ${REST_CONTEXT_CF}/table/0/flow/2 Should Be Equal As Strings ${resp.status_code} 200 Verify after deleting flow [Documentation] Verify the flow removal [Tags] Get - ${resp} RequestsLibrary.Get session ${REST_CONTEXT_CF}/table/0/flow/2 + ${resp} RequestsLibrary.Get Request session ${REST_CONTEXT_CF}/table/0/flow/2 Should Not Contain ${resp.content} ${FLOW_NAME} Delete the meter [Documentation] Remove the meter [Tags] Delete - ${resp} RequestsLibrary.Delete session ${REST_CONTEXT_CF}/meter/1 + ${resp} RequestsLibrary.Delete Request session ${REST_CONTEXT_CF}/meter/1 Log ${resp.content} Should Be Equal As Strings ${resp.status_code} 200 Verify after deleting meter [Documentation] Verify the flow removal [Tags] Get - ${resp} RequestsLibrary.Get session ${REST_CONTEXT_CF}/meter/1 + ${resp} RequestsLibrary.Get Request session ${REST_CONTEXT_CF}/meter/1 Should Not Contain ${resp.content} ${METER_NAME} diff --git a/csit/suites/openflowplugin/Inventory_Scalability_OF10/010__restconf_inventory.robot b/csit/suites/openflowplugin/Inventory_Scalability_OF10/010__restconf_inventory.robot index 7c449abfef..391af75233 100644 --- a/csit/suites/openflowplugin/Inventory_Scalability_OF10/010__restconf_inventory.robot +++ b/csit/suites/openflowplugin/Inventory_Scalability_OF10/010__restconf_inventory.robot @@ -21,7 +21,7 @@ Get list of nodes Get nodeconnector for the root node [Documentation] Get the inventory for the root node ${TOPO_TREE_FANOUT} Convert To Integer ${TOPO_TREE_FANOUT} - ${resp} RequestsLibrary.Get session ${REST_CONTEXT}/node/openflow:1 + ${resp} RequestsLibrary.Get Request session ${REST_CONTEXT}/node/openflow:1 Log ${resp.content} Should Be Equal As Strings ${resp.status_code} 200 Wait Until Keyword Succeeds 30s 2s Check conn loop ${TOPO_TREE_FANOUT} 1 ${resp.content} @@ -43,7 +43,7 @@ Get Stats for a node *** Keywords *** Check Every Nodes [Arguments] ${numnodes} - ${resp} RequestsLibrary.Get session ${REST_CONTEXT} + ${resp} RequestsLibrary.Get Request session ${REST_CONTEXT} Should Be Equal As Strings ${resp.status_code} 200 : FOR ${IND} IN RANGE 1 ${numnodes+1} \ Should Contain ${resp.content} openflow:${IND} @@ -51,7 +51,7 @@ Check Every Nodes Check Every Nodes Stats [Arguments] ${numnodes} : FOR ${IND} IN RANGE 1 ${numnodes+1} - \ ${resp} RequestsLibrary.Get session ${REST_CONTEXT}/node/openflow:${IND} + \ ${resp} RequestsLibrary.Get Request session ${REST_CONTEXT}/node/openflow:${IND} \ Log ${resp.content} \ Should Be Equal As Strings ${resp.status_code} 200 \ Should Contain ${resp.content} flow-capable-node-connector-statistics @@ -60,7 +60,7 @@ Check Every Nodes Stats Check Every Nodes Nodeconnector [Arguments] ${numnodes} : FOR ${IND} IN RANGE 2 ${numnodes+1} - \ ${resp} RequestsLibrary.Get session ${REST_CONTEXT}/node/openflow:${IND} + \ ${resp} RequestsLibrary.Get Request session ${REST_CONTEXT}/node/openflow:${IND} \ Log ${resp.content} \ Should Be Equal As Strings ${resp.status_code} 200 \ Check conn loop ${TOPO_TREE_FANOUT+1} ${IND} ${resp.content} diff --git a/csit/suites/openflowplugin/Inventory_Scalability_OF10/020__restconf_topology.robot b/csit/suites/openflowplugin/Inventory_Scalability_OF10/020__restconf_topology.robot index dab8c7db40..be620b659b 100644 --- a/csit/suites/openflowplugin/Inventory_Scalability_OF10/020__restconf_topology.robot +++ b/csit/suites/openflowplugin/Inventory_Scalability_OF10/020__restconf_topology.robot @@ -30,7 +30,7 @@ Get Links Count *** Keywords *** Verify Element Count [Arguments] ${URI} ${xpath_location} ${expected_count} - ${resp} RequestsLibrary.Get session ${REST_CONTEXT} headers=${ACCEPT_XML} + ${resp} RequestsLibrary.Get Request session ${REST_CONTEXT} headers=${ACCEPT_XML} Log ${resp.content} Should Be Equal As Strings ${resp.status_code} 200 ${count}= Get Element Count ${resp.content} xpath=${xpath_location} diff --git a/csit/suites/openflowplugin/Inventory_Scalability_OF10/030__switch_manager.robot b/csit/suites/openflowplugin/Inventory_Scalability_OF10/030__switch_manager.robot index 8c18402e47..e3859159d7 100644 --- a/csit/suites/openflowplugin/Inventory_Scalability_OF10/030__switch_manager.robot +++ b/csit/suites/openflowplugin/Inventory_Scalability_OF10/030__switch_manager.robot @@ -18,7 +18,7 @@ List all nodes [Tags] adsal Log ${TOPO_TREE_LEVEL} ${topo_nodes} Get Nodes From Tree Topo (${TOPO_TREE_DEPTH},${TOPO_TREE_FANOUT}) - ${resp} RequestsLibrary.Get ${ODL_CONTROLLER_SESSION} ${REST_CONTEXT}/default/nodes + ${resp} RequestsLibrary.Get Request ${ODL_CONTROLLER_SESSION} ${REST_CONTEXT}/default/nodes Log ${resp.content} Should Be Equal As Strings ${resp.status_code} 200 Response status code error ${jsondata}= To JSON ${resp.content} @@ -28,7 +28,7 @@ List all nodes Check root node connectors [Documentation] List node connectors and verify all connectors are there [Tags] adsal - ${resp} RequestsLibrary.Get ${ODL_CONTROLLER_SESSION} ${REST_CONTEXT}/default/node/OF/00:00:00:00:00:00:00:01 + ${resp} RequestsLibrary.Get Request ${ODL_CONTROLLER_SESSION} ${REST_CONTEXT}/default/node/OF/00:00:00:00:00:00:00:01 Log ${resp.content} Should Be Equal As Strings ${resp.status_code} 200 Response status code error ${TOPO_TREE_FANOUT} Convert To Integer ${TOPO_TREE_FANOUT} @@ -45,7 +45,7 @@ Check Every Nodes Connectors [Arguments] ${topo_nodes} : FOR ${ITEM} IN @{topo_nodes} \ ${IND} Get From Dictionary ${ITEM} id - \ ${resp} RequestsLibrary.Get ${ODL_CONTROLLER_SESSION} ${REST_CONTEXT}/default/node/OF/${IND} + \ ${resp} RequestsLibrary.Get Request ${ODL_CONTROLLER_SESSION} ${REST_CONTEXT}/default/node/OF/${IND} \ Log ${resp.content} \ Should Be Equal As Strings ${resp.status_code} 200 \ Check conn loop ${TOPO_TREE_FANOUT+1} ${IND} ${resp.content} diff --git a/csit/suites/openflowplugin/Inventory_Scalability_OF10/040__statistics_manager.robot b/csit/suites/openflowplugin/Inventory_Scalability_OF10/040__statistics_manager.robot index 315502d21f..f0d2a39fb2 100644 --- a/csit/suites/openflowplugin/Inventory_Scalability_OF10/040__statistics_manager.robot +++ b/csit/suites/openflowplugin/Inventory_Scalability_OF10/040__statistics_manager.robot @@ -39,7 +39,7 @@ get table stats *** Keywords *** Check For Correct Number Of Nodes At URI [Arguments] ${uri} ${topo_nodes} - ${resp} RequestsLibrary.Get session ${REST_CONTEXT}/${CONTAINER}/${uri} + ${resp} RequestsLibrary.Get Request session ${REST_CONTEXT}/${CONTAINER}/${uri} Log ${resp.content} Should Be Equal As Strings ${resp.status_code} 200 Should Contain X Times ${resp.content} "00:00:00:00:00:00:00:01" ${TOPO_TREE_FANOUT+2} @@ -49,7 +49,7 @@ Check For Correct Number Of Nodes At URI Check For All Nodes At URI [Arguments] ${uri} ${topo_nodes} - ${resp} RequestsLibrary.Get session ${REST_CONTEXT}/${CONTAINER}/${uri} + ${resp} RequestsLibrary.Get Request session ${REST_CONTEXT}/${CONTAINER}/${uri} Log ${resp.content} Should Be Equal As Strings ${resp.status_code} 200 : FOR ${ITEM} IN @{topo_nodes} diff --git a/csit/suites/openflowplugin/Inventory_Scalability_OF10/050__topology_manager.robot b/csit/suites/openflowplugin/Inventory_Scalability_OF10/050__topology_manager.robot index e5749fdaa0..280b818a9b 100644 --- a/csit/suites/openflowplugin/Inventory_Scalability_OF10/050__topology_manager.robot +++ b/csit/suites/openflowplugin/Inventory_Scalability_OF10/050__topology_manager.robot @@ -25,7 +25,7 @@ Get Topology *** Keywords *** Check Link Counts For Each Node [Arguments] ${topo_nodes} ${leaflist} - ${resp} RequestsLibrary.Get session ${REST_CONTEXT}/${CONTAINER} + ${resp} RequestsLibrary.Get Request session ${REST_CONTEXT}/${CONTAINER} Log ${resp.content} Should Be Equal As Strings ${resp.status_code} 200 Should Contain X Times ${resp.content} "00:00:00:00:00:00:00:01" ${TOPO_TREE_FANOUT*2} diff --git a/csit/suites/openflowplugin/Inventory_Scalability_OF13/010__restconf_inventory.robot b/csit/suites/openflowplugin/Inventory_Scalability_OF13/010__restconf_inventory.robot index 7c449abfef..391af75233 100644 --- a/csit/suites/openflowplugin/Inventory_Scalability_OF13/010__restconf_inventory.robot +++ b/csit/suites/openflowplugin/Inventory_Scalability_OF13/010__restconf_inventory.robot @@ -21,7 +21,7 @@ Get list of nodes Get nodeconnector for the root node [Documentation] Get the inventory for the root node ${TOPO_TREE_FANOUT} Convert To Integer ${TOPO_TREE_FANOUT} - ${resp} RequestsLibrary.Get session ${REST_CONTEXT}/node/openflow:1 + ${resp} RequestsLibrary.Get Request session ${REST_CONTEXT}/node/openflow:1 Log ${resp.content} Should Be Equal As Strings ${resp.status_code} 200 Wait Until Keyword Succeeds 30s 2s Check conn loop ${TOPO_TREE_FANOUT} 1 ${resp.content} @@ -43,7 +43,7 @@ Get Stats for a node *** Keywords *** Check Every Nodes [Arguments] ${numnodes} - ${resp} RequestsLibrary.Get session ${REST_CONTEXT} + ${resp} RequestsLibrary.Get Request session ${REST_CONTEXT} Should Be Equal As Strings ${resp.status_code} 200 : FOR ${IND} IN RANGE 1 ${numnodes+1} \ Should Contain ${resp.content} openflow:${IND} @@ -51,7 +51,7 @@ Check Every Nodes Check Every Nodes Stats [Arguments] ${numnodes} : FOR ${IND} IN RANGE 1 ${numnodes+1} - \ ${resp} RequestsLibrary.Get session ${REST_CONTEXT}/node/openflow:${IND} + \ ${resp} RequestsLibrary.Get Request session ${REST_CONTEXT}/node/openflow:${IND} \ Log ${resp.content} \ Should Be Equal As Strings ${resp.status_code} 200 \ Should Contain ${resp.content} flow-capable-node-connector-statistics @@ -60,7 +60,7 @@ Check Every Nodes Stats Check Every Nodes Nodeconnector [Arguments] ${numnodes} : FOR ${IND} IN RANGE 2 ${numnodes+1} - \ ${resp} RequestsLibrary.Get session ${REST_CONTEXT}/node/openflow:${IND} + \ ${resp} RequestsLibrary.Get Request session ${REST_CONTEXT}/node/openflow:${IND} \ Log ${resp.content} \ Should Be Equal As Strings ${resp.status_code} 200 \ Check conn loop ${TOPO_TREE_FANOUT+1} ${IND} ${resp.content} diff --git a/csit/suites/openflowplugin/Inventory_Scalability_OF13/020__restconf_topology.robot b/csit/suites/openflowplugin/Inventory_Scalability_OF13/020__restconf_topology.robot index dab8c7db40..be620b659b 100644 --- a/csit/suites/openflowplugin/Inventory_Scalability_OF13/020__restconf_topology.robot +++ b/csit/suites/openflowplugin/Inventory_Scalability_OF13/020__restconf_topology.robot @@ -30,7 +30,7 @@ Get Links Count *** Keywords *** Verify Element Count [Arguments] ${URI} ${xpath_location} ${expected_count} - ${resp} RequestsLibrary.Get session ${REST_CONTEXT} headers=${ACCEPT_XML} + ${resp} RequestsLibrary.Get Request session ${REST_CONTEXT} headers=${ACCEPT_XML} Log ${resp.content} Should Be Equal As Strings ${resp.status_code} 200 ${count}= Get Element Count ${resp.content} xpath=${xpath_location} diff --git a/csit/suites/openflowplugin/Inventory_Scalability_OF13/030__switch_manager.robot b/csit/suites/openflowplugin/Inventory_Scalability_OF13/030__switch_manager.robot index 8c18402e47..e3859159d7 100644 --- a/csit/suites/openflowplugin/Inventory_Scalability_OF13/030__switch_manager.robot +++ b/csit/suites/openflowplugin/Inventory_Scalability_OF13/030__switch_manager.robot @@ -18,7 +18,7 @@ List all nodes [Tags] adsal Log ${TOPO_TREE_LEVEL} ${topo_nodes} Get Nodes From Tree Topo (${TOPO_TREE_DEPTH},${TOPO_TREE_FANOUT}) - ${resp} RequestsLibrary.Get ${ODL_CONTROLLER_SESSION} ${REST_CONTEXT}/default/nodes + ${resp} RequestsLibrary.Get Request ${ODL_CONTROLLER_SESSION} ${REST_CONTEXT}/default/nodes Log ${resp.content} Should Be Equal As Strings ${resp.status_code} 200 Response status code error ${jsondata}= To JSON ${resp.content} @@ -28,7 +28,7 @@ List all nodes Check root node connectors [Documentation] List node connectors and verify all connectors are there [Tags] adsal - ${resp} RequestsLibrary.Get ${ODL_CONTROLLER_SESSION} ${REST_CONTEXT}/default/node/OF/00:00:00:00:00:00:00:01 + ${resp} RequestsLibrary.Get Request ${ODL_CONTROLLER_SESSION} ${REST_CONTEXT}/default/node/OF/00:00:00:00:00:00:00:01 Log ${resp.content} Should Be Equal As Strings ${resp.status_code} 200 Response status code error ${TOPO_TREE_FANOUT} Convert To Integer ${TOPO_TREE_FANOUT} @@ -45,7 +45,7 @@ Check Every Nodes Connectors [Arguments] ${topo_nodes} : FOR ${ITEM} IN @{topo_nodes} \ ${IND} Get From Dictionary ${ITEM} id - \ ${resp} RequestsLibrary.Get ${ODL_CONTROLLER_SESSION} ${REST_CONTEXT}/default/node/OF/${IND} + \ ${resp} RequestsLibrary.Get Request ${ODL_CONTROLLER_SESSION} ${REST_CONTEXT}/default/node/OF/${IND} \ Log ${resp.content} \ Should Be Equal As Strings ${resp.status_code} 200 \ Check conn loop ${TOPO_TREE_FANOUT+1} ${IND} ${resp.content} diff --git a/csit/suites/openflowplugin/Inventory_Scalability_OF13/040__statistics_manager.robot b/csit/suites/openflowplugin/Inventory_Scalability_OF13/040__statistics_manager.robot index 315502d21f..f0d2a39fb2 100644 --- a/csit/suites/openflowplugin/Inventory_Scalability_OF13/040__statistics_manager.robot +++ b/csit/suites/openflowplugin/Inventory_Scalability_OF13/040__statistics_manager.robot @@ -39,7 +39,7 @@ get table stats *** Keywords *** Check For Correct Number Of Nodes At URI [Arguments] ${uri} ${topo_nodes} - ${resp} RequestsLibrary.Get session ${REST_CONTEXT}/${CONTAINER}/${uri} + ${resp} RequestsLibrary.Get Request session ${REST_CONTEXT}/${CONTAINER}/${uri} Log ${resp.content} Should Be Equal As Strings ${resp.status_code} 200 Should Contain X Times ${resp.content} "00:00:00:00:00:00:00:01" ${TOPO_TREE_FANOUT+2} @@ -49,7 +49,7 @@ Check For Correct Number Of Nodes At URI Check For All Nodes At URI [Arguments] ${uri} ${topo_nodes} - ${resp} RequestsLibrary.Get session ${REST_CONTEXT}/${CONTAINER}/${uri} + ${resp} RequestsLibrary.Get Request session ${REST_CONTEXT}/${CONTAINER}/${uri} Log ${resp.content} Should Be Equal As Strings ${resp.status_code} 200 : FOR ${ITEM} IN @{topo_nodes} diff --git a/csit/suites/openflowplugin/Inventory_Scalability_OF13/050__topology_manager.robot b/csit/suites/openflowplugin/Inventory_Scalability_OF13/050__topology_manager.robot index e5749fdaa0..280b818a9b 100644 --- a/csit/suites/openflowplugin/Inventory_Scalability_OF13/050__topology_manager.robot +++ b/csit/suites/openflowplugin/Inventory_Scalability_OF13/050__topology_manager.robot @@ -25,7 +25,7 @@ Get Topology *** Keywords *** Check Link Counts For Each Node [Arguments] ${topo_nodes} ${leaflist} - ${resp} RequestsLibrary.Get session ${REST_CONTEXT}/${CONTAINER} + ${resp} RequestsLibrary.Get Request session ${REST_CONTEXT}/${CONTAINER} Log ${resp.content} Should Be Equal As Strings ${resp.status_code} 200 Should Contain X Times ${resp.content} "00:00:00:00:00:00:00:01" ${TOPO_TREE_FANOUT*2} diff --git a/csit/suites/openflowplugin/MD_SAL_NSF_OF10/010__restconf_inventory.robot b/csit/suites/openflowplugin/MD_SAL_NSF_OF10/010__restconf_inventory.robot index bf51a57164..ffabd291d6 100644 --- a/csit/suites/openflowplugin/MD_SAL_NSF_OF10/010__restconf_inventory.robot +++ b/csit/suites/openflowplugin/MD_SAL_NSF_OF10/010__restconf_inventory.robot @@ -22,7 +22,7 @@ Get list of nodes Set Suite Variable ${SW_HARDWARE} "flow-node-inventory:manufacturer":"${HARDWARE}" Set Suite Variable @{SW_CAPABILITIES} "flow-node-inventory:flow-feature-capability-flow-stats" "flow-node-inventory:flow-feature-capability-table-stats" "flow-node-inventory:flow-feature-capability-port-stats" "flow-node-inventory:flow-feature-capability-queue-stats" Wait Until Keyword Succeeds 30s 2s Ensure All Nodes Are In Response ${REST_CONTEXT} ${node_list} - ${resp} RequestsLibrary.Get session ${REST_CONTEXT} + ${resp} RequestsLibrary.Get Request session ${REST_CONTEXT} Log ${resp.content} Get node 1 inventory diff --git a/csit/suites/openflowplugin/MD_SAL_NSF_OF10/020__restconf_topology.robot b/csit/suites/openflowplugin/MD_SAL_NSF_OF10/020__restconf_topology.robot index 3cd5b63d43..3616d7256d 100644 --- a/csit/suites/openflowplugin/MD_SAL_NSF_OF10/020__restconf_topology.robot +++ b/csit/suites/openflowplugin/MD_SAL_NSF_OF10/020__restconf_topology.robot @@ -16,7 +16,7 @@ ${REST_CONTEXT} /restconf/operational/network-topology:network-topology Get RESTCONF Topology [Documentation] Get RESTCONF Topology and validate the result. Wait Until Keyword Succeeds 30s 2s Ensure All Nodes Are In Response ${REST_CONTEXT} ${node_list} - ${resp} RequestsLibrary.Get session ${REST_CONTEXT} + ${resp} RequestsLibrary.Get Request session ${REST_CONTEXT} Log ${resp.content} List all the links @@ -81,7 +81,7 @@ Add Port *** Keywords *** Verify Links [Arguments] ${expected_links} - ${resp} RequestsLibrary.Get session ${REST_CONTEXT}/topology/flow:1 + ${resp} RequestsLibrary.Get Request session ${REST_CONTEXT}/topology/flow:1 Log ${resp.content} Should Be Equal As Strings ${resp.status_code} 200 ${result} To JSON ${resp.content} diff --git a/csit/suites/openflowplugin/MD_SAL_NSF_OF10/040__restconf_frm.robot b/csit/suites/openflowplugin/MD_SAL_NSF_OF10/040__restconf_frm.robot index 10b5db3d5d..b8e206c622 100644 --- a/csit/suites/openflowplugin/MD_SAL_NSF_OF10/040__restconf_frm.robot +++ b/csit/suites/openflowplugin/MD_SAL_NSF_OF10/040__restconf_frm.robot @@ -15,12 +15,12 @@ ${BODY2} 22