From ef95b27ed57e5e66d804735345ac3d6658b139b4 Mon Sep 17 00:00:00 2001 From: Chaudhry Muhammad Usama Date: Mon, 17 Aug 2015 09:24:54 -0700 Subject: [PATCH] Updated Test references to "Library RequestsLibrary" This will move references libraries/RequestsLibrary.py to "RequestsLibrary" of suites/openflowplugin libraries/AAAKeywords.robot libraries/FlowLib.robot libraries/PcepOperations.robot except ADSAL Testsuites. Change-Id: Ibe0b823d13c679b057503c2d0cb7cc207bdca9fa Signed-off-by: Chaudhry Muhammad Usama --- test/csit/libraries/AAAKeywords.robot | 2 +- test/csit/libraries/FlowLib.robot | 3 ++- test/csit/libraries/PcepOperations.robot | 2 +- .../suites/openflowplugin/Flows_OF13/300__dst_ip.robot | 4 ++-- .../suites/openflowplugin/Flows_OF13/301__src_ip.robot | 10 +++++----- .../openflowplugin/Flows_OF13/302__dst_mac.robot | 10 +++++----- .../openflowplugin/Flows_OF13/304__eth_ip_port.robot | 10 +++++----- .../openflowplugin/Flows_OF13/306__eth_ip_qos.robot | 10 +++++----- .../Flows_OF13/307__eth_ip_qos_port_tcpport.robot | 8 ++++---- .../Flows_OF13/308__eth_ip_qos_port_tcpport_mpls.robot | 10 +++++----- .../Flows_OF13/309__eth_ip_qos_sctp.robot | 10 +++++----- .../Flows_OF13/310__eth_ip_qos_icmp.robot | 10 +++++----- .../openflowplugin/Flows_OF13/311__eth_arp.robot | 10 +++++----- .../Flows_OF13/312__eth_arp_transport.robot | 10 +++++----- .../Flows_OF13/313__eth_arp_transport_hardware.robot | 10 +++++----- .../openflowplugin/Flows_OF13/314__eth_vlan.robot | 10 +++++----- .../Flows_OF13/315__timeout_vlan_pcp_vlan.robot | 10 +++++----- .../Flows_OF13/316__eth_mpls_tc_bos.robot | 10 +++++----- .../openflowplugin/Flows_OF13/317__eth_ipv6.robot | 10 +++++----- .../openflowplugin/Flows_OF13/318__metadata.robot | 10 +++++----- .../openflowplugin/Flows_OF13/319__metadata_mask.robot | 10 +++++----- .../Flows_OF13/320__ipv6_meta_qos_udp.robot | 10 +++++----- .../Flows_OF13/321__ipv6_meta_qos_tcp.robot | 10 +++++----- .../openflowplugin/Flows_OF13/322__ipv6_flow.robot | 10 +++++----- .../suites/openflowplugin/Flows_OF13/323__tunnel.robot | 10 +++++----- .../Flows_OF13/324__ipv6_flow_label.robot | 10 +++++----- .../Flows_Stats_OF13/010__SM_add_upd_del_flows.robot | 6 +++--- .../Groups_Meters_OF13/005__openflow_group.robot | 6 +++--- .../Groups_Meters_OF13/010__openflow_meter.robot | 6 +++--- .../010__restconf_inventory.robot | 2 +- .../020__restconf_topology.robot | 2 +- .../040__statistics_manager.robot | 2 +- .../050__topology_manager.robot | 2 +- .../010__restconf_inventory.robot | 2 +- .../020__restconf_topology.robot | 2 +- .../040__statistics_manager.robot | 2 +- .../050__topology_manager.robot | 2 +- .../MD_SAL_NSF_OF10/010__restconf_inventory.robot | 2 +- .../MD_SAL_NSF_OF10/020__restconf_topology.robot | 2 +- .../MD_SAL_NSF_OF10/030__restconf_statistics.robot | 2 +- .../MD_SAL_NSF_OF10/040__restconf_frm.robot | 4 ++-- .../MD_SAL_NSF_OF13/010__restconf_inventory.robot | 2 +- .../MD_SAL_NSF_OF13/020__restconf_topology.robot | 2 +- .../MD_SAL_NSF_OF13/030__restconf_statistics.robot | 2 +- .../MD_SAL_NSF_OF13/040__restconf_frm.robot | 6 +++--- .../010_Rest_Config_Flows.robot | 2 +- .../020_Stats_Collection_Gauss.robot | 2 +- .../030_Stats_Collection_Linear.robot | 2 +- .../040_Stats_Collection_One.robot | 2 +- .../050_Stats_Collection_FirstTable.robot | 2 +- .../Switch_Qualification/010_OpenFlow_Connection.robot | 2 +- .../Switch_Qualification/020_OpenFlow_Actions.robot | 2 +- .../010__Connect_256_Switches.txt | 4 ++-- 53 files changed, 152 insertions(+), 151 deletions(-) diff --git a/test/csit/libraries/AAAKeywords.robot b/test/csit/libraries/AAAKeywords.robot index 29ea1f5b..04ad225b 100644 --- a/test/csit/libraries/AAAKeywords.robot +++ b/test/csit/libraries/AAAKeywords.robot @@ -1,5 +1,5 @@ *** Settings *** -Library ./RequestsLibrary.py +Library RequestsLibrary Variables ../variables/Variables.py *** Variables *** diff --git a/test/csit/libraries/FlowLib.robot b/test/csit/libraries/FlowLib.robot index 9f4c421a..ffccd72a 100644 --- a/test/csit/libraries/FlowLib.robot +++ b/test/csit/libraries/FlowLib.robot @@ -5,6 +5,7 @@ Documentation Keywords used to create/modify flow objects. The object is def ... controller) Library ./FlowLib.py Library XML +Library RequestsLibrary Variables ../variables/Variables.py *** Variables *** @@ -141,7 +142,7 @@ Remove Flow XML Element Add Flow To Controller And Verify [Arguments] ${flow_body} ${node_id} ${table_id} ${flow_id} [Documentation] Push flow through REST-API and verify in data-store - ${resp} Put Xml session ${REST_CON}/node/${node_id}/table/${table_id}/flow/${flow_id} data=${flow_body} + ${resp} RequestsLibrary.Put session ${REST_CON}/node/${node_id}/table/${table_id}/flow/${flow_id} headers=${HEADERS_XML} data=${flow_body} Log ${resp.content} Should Be Equal As Strings ${resp.status_code} 200 ${resp} RequestsLibrary.Get session ${REST_CON}/node/${node_id}/table/${table_id}/flow/${flow_id} headers=${ACCEPT_XML} diff --git a/test/csit/libraries/PcepOperations.robot b/test/csit/libraries/PcepOperations.robot index 15226b6a..fb000686 100644 --- a/test/csit/libraries/PcepOperations.robot +++ b/test/csit/libraries/PcepOperations.robot @@ -6,7 +6,7 @@ Documentation Robot keyword library (Resource) for performing PCEP operation ... This program and the accompanying materials are made available under the ... terms of the Eclipse Public License v1.0 which accompanies this distribution, ... and is available at http://www.eclipse.org/legal/epl-v10.html -Library ${CURDIR}/RequestsLibrary.py +Library RequestsLibrary Variables ${CURDIR}/../variables/Variables.py *** Keywords *** diff --git a/test/csit/suites/openflowplugin/Flows_OF13/300__dst_ip.robot b/test/csit/suites/openflowplugin/Flows_OF13/300__dst_ip.robot index 020ed0ff..2a0347e5 100644 --- a/test/csit/suites/openflowplugin/Flows_OF13/300__dst_ip.robot +++ b/test/csit/suites/openflowplugin/Flows_OF13/300__dst_ip.robot @@ -5,7 +5,7 @@ Suite Teardown Delete All Sessions Library SSHLibrary Library Collections Library OperatingSystem -Library ../../../libraries/RequestsLibrary.py +Library RequestsLibrary Library ../../../libraries/Common.py Variables ../../../variables/Variables.py @@ -22,7 +22,7 @@ Add a flow - Output to physical port# [Tags] Push ${body} OperatingSystem.Get File ${FILE} Set Suite Variable ${body} - ${resp} Putxml session ${REST_CON}/node/openflow:1/table/${TABLE}/flow/${FLOW} data=${body} + ${resp} RequestsLibrary.Put session ${REST_CON}/node/openflow:1/table/${TABLE}/flow/${FLOW} headers=${HEADERS_XML} data=${body} Should Be Equal As Strings ${resp.status_code} 200 Verify after adding flow config - Output to physical port# diff --git a/test/csit/suites/openflowplugin/Flows_OF13/301__src_ip.robot b/test/csit/suites/openflowplugin/Flows_OF13/301__src_ip.robot index 46b1dfe7..c8f16900 100644 --- a/test/csit/suites/openflowplugin/Flows_OF13/301__src_ip.robot +++ b/test/csit/suites/openflowplugin/Flows_OF13/301__src_ip.robot @@ -5,7 +5,7 @@ Suite Teardown Delete All Sessions Library SSHLibrary Library Collections Library OperatingSystem -Library ../../../libraries/RequestsLibrary.py +Library RequestsLibrary Library ../../../libraries/Common.py Variables ../../../variables/Variables.py @@ -22,13 +22,13 @@ Add a flow - Output to physical port# [Tags] Push ${body} OperatingSystem.Get File ${FILE} Set Suite Variable ${body} - ${resp} Putxml session ${REST_CON}/node/openflow:1/table/${TABLE}/flow/${FLOW} data=${body} + ${resp} RequestsLibrary.Put session ${REST_CON}/node/openflow:1/table/${TABLE}/flow/${FLOW} headers=${HEADERS_XML} data=${body} Should Be Equal As Strings ${resp.status_code} 200 Verify after adding flow config - Output to physical port# [Documentation] Verify the flow [Tags] Get - ${resp} get session ${REST_CON}/node/openflow:1/table/${TABLE}/flow/${FLOW} headers=${ACCEPT_XML} + ${resp} RequestsLibrary.Get session ${REST_CON}/node/openflow:1/table/${TABLE}/flow/${FLOW} headers=${ACCEPT_XML} Should Be Equal As Strings ${resp.status_code} 200 compare xml ${body} ${resp.content} @@ -45,13 +45,13 @@ Verify flows after adding flow config on OVS Remove a flow - Output to physical port# [Documentation] Remove a flow [Tags] remove - ${resp} Delete session ${REST_CON}/node/openflow:1/table/${TABLE}/flow/${FLOW} + ${resp} RequestsLibrary.Delete session ${REST_CON}/node/openflow:1/table/${TABLE}/flow/${FLOW} Should Be Equal As Strings ${resp.status_code} 200 Verify after deleting flow config - Output to physical port# [Documentation] Verify the flow [Tags] Get - ${resp} Get session ${REST_CON}/node/openflow:1/table/${TABLE} + ${resp} RequestsLibrary.Get session ${REST_CON}/node/openflow:1/table/${TABLE} Should Not Contain ${resp.content} ${FLOW} Verify flows after deleting flow config on OVS diff --git a/test/csit/suites/openflowplugin/Flows_OF13/302__dst_mac.robot b/test/csit/suites/openflowplugin/Flows_OF13/302__dst_mac.robot index 4377c511..f4906c40 100644 --- a/test/csit/suites/openflowplugin/Flows_OF13/302__dst_mac.robot +++ b/test/csit/suites/openflowplugin/Flows_OF13/302__dst_mac.robot @@ -5,7 +5,7 @@ Suite Teardown Delete All Sessions Library SSHLibrary Library Collections Library OperatingSystem -Library ../../../libraries/RequestsLibrary.py +Library RequestsLibrary Library ../../../libraries/Common.py Variables ../../../variables/Variables.py @@ -22,13 +22,13 @@ Add a flow - Output to physical port# [Tags] Push ${body} OperatingSystem.Get File ${FILE} Set Suite Variable ${body} - ${resp} Putxml session ${REST_CON}/node/openflow:1/table/${TABLE}/flow/${FLOW} data=${body} + ${resp} RequestsLibrary.Put session ${REST_CON}/node/openflow:1/table/${TABLE}/flow/${FLOW} headers=${HEADERS_XML} data=${body} Should Be Equal As Strings ${resp.status_code} 200 Verify after adding flow config - Output to physical port# [Documentation] Verify the flow [Tags] Get - ${resp} get session ${REST_CON}/node/openflow:1/table/${TABLE}/flow/${FLOW} headers=${ACCEPT_XML} + ${resp} RequestsLibrary.Get session ${REST_CON}/node/openflow:1/table/${TABLE}/flow/${FLOW} headers=${ACCEPT_XML} Should Be Equal As Strings ${resp.status_code} 200 compare xml ${body} ${resp.content} @@ -45,13 +45,13 @@ Verify flows after adding flow config on OVS Remove a flow - Output to physical port# [Documentation] Remove a flow [Tags] remove - ${resp} Delete session ${REST_CON}/node/openflow:1/table/${TABLE}/flow/${FLOW} + ${resp} RequestsLibrary.Delete session ${REST_CON}/node/openflow:1/table/${TABLE}/flow/${FLOW} Should Be Equal As Strings ${resp.status_code} 200 Verify after deleting flow config - Output to physical port# [Documentation] Verify the flow [Tags] Get - ${resp} Get session ${REST_CON}/node/openflow:1/table/${TABLE} + ${resp} RequestsLibrary.Get session ${REST_CON}/node/openflow:1/table/${TABLE} Should Not Contain ${resp.content} ${FLOW} Verify flows after deleting flow config on OVS diff --git a/test/csit/suites/openflowplugin/Flows_OF13/304__eth_ip_port.robot b/test/csit/suites/openflowplugin/Flows_OF13/304__eth_ip_port.robot index 2897b472..ea6e39cf 100644 --- a/test/csit/suites/openflowplugin/Flows_OF13/304__eth_ip_port.robot +++ b/test/csit/suites/openflowplugin/Flows_OF13/304__eth_ip_port.robot @@ -5,7 +5,7 @@ Suite Teardown Delete All Sessions Library SSHLibrary Library Collections Library OperatingSystem -Library ../../../libraries/RequestsLibrary.py +Library RequestsLibrary Library ../../../libraries/Common.py Variables ../../../variables/Variables.py @@ -22,13 +22,13 @@ Add a flow - Output to physical port# [Tags] Push ${body} OperatingSystem.Get File ${FILE} Set Suite Variable ${body} - ${resp} Putxml session ${REST_CON}/node/openflow:1/table/${TABLE}/flow/${FLOW} data=${body} + ${resp} RequestsLibrary.Put session ${REST_CON}/node/openflow:1/table/${TABLE}/flow/${FLOW} headers=${HEADERS_XML} data=${body} Should Be Equal As Strings ${resp.status_code} 200 Verify after adding flow config - Output to physical port# [Documentation] Verify the flow [Tags] Get - ${resp} get session ${REST_CON}/node/openflow:1/table/${TABLE}/flow/${FLOW} headers=${ACCEPT_XML} + ${resp} RequestsLibrary.Get session ${REST_CON}/node/openflow:1/table/${TABLE}/flow/${FLOW} headers=${ACCEPT_XML} Should Be Equal As Strings ${resp.status_code} 200 compare xml ${body} ${resp.content} @@ -45,13 +45,13 @@ Verify flows after adding flow config on OVS Remove a flow - Output to physical port# [Documentation] Remove a flow [Tags] remove - ${resp} Delete session ${REST_CON}/node/openflow:1/table/${TABLE}/flow/${FLOW} + ${resp} RequestsLibrary.Delete session ${REST_CON}/node/openflow:1/table/${TABLE}/flow/${FLOW} Should Be Equal As Strings ${resp.status_code} 200 Verify after deleting flow config - Output to physical port# [Documentation] Verify the flow [Tags] Get - ${resp} Get session ${REST_CON}/node/openflow:1/table/${TABLE} + ${resp} RequestsLibrary.Get session ${REST_CON}/node/openflow:1/table/${TABLE} Should Not Contain ${resp.content} ${FLOW} Verify flows after deleting flow config on OVS diff --git a/test/csit/suites/openflowplugin/Flows_OF13/306__eth_ip_qos.robot b/test/csit/suites/openflowplugin/Flows_OF13/306__eth_ip_qos.robot index f9fddced..620b6dfb 100644 --- a/test/csit/suites/openflowplugin/Flows_OF13/306__eth_ip_qos.robot +++ b/test/csit/suites/openflowplugin/Flows_OF13/306__eth_ip_qos.robot @@ -5,7 +5,7 @@ Suite Teardown Delete All Sessions Library SSHLibrary Library Collections Library OperatingSystem -Library ../../../libraries/RequestsLibrary.py +Library RequestsLibrary Library ../../../libraries/Common.py Variables ../../../variables/Variables.py @@ -23,13 +23,13 @@ Add a flow - Output to physical port# [Tags] Push ${body} OperatingSystem.Get File ${FILE} Set Suite Variable ${body} - ${resp} Putxml session ${REST_CON}/node/openflow:1/table/${TABLE}/flow/${FLOW} data=${body} + ${resp} RequestsLibrary.Put session ${REST_CON}/node/openflow:1/table/${TABLE}/flow/${FLOW} headers=${HEADERS_XML} data=${body} Should Be Equal As Strings ${resp.status_code} 200 Verify after adding flow config - Output to physical port# [Documentation] Verify the flow [Tags] Get - ${resp} get session ${REST_CON}/node/openflow:1/table/${TABLE}/flow/${FLOW} headers=${ACCEPT_XML} + ${resp} RequestsLibrary.Get session ${REST_CON}/node/openflow:1/table/${TABLE}/flow/${FLOW} headers=${ACCEPT_XML} Should Be Equal As Strings ${resp.status_code} 200 compare xml ${body} ${resp.content} @@ -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} Delete session ${REST_CON}/node/openflow:1/table/${TABLE}/flow/${FLOW} + ${resp} RequestsLibrary.Delete session ${REST_CON}/node/openflow:1/table/${TABLE}/flow/${FLOW} Should Be Equal As Strings ${resp.status_code} 200 Verify after deleting flow config - Output to physical port# [Documentation] Verify the flow [Tags] Get - ${resp} Get session ${REST_CON}/node/openflow:1/table/${TABLE} + ${resp} RequestsLibrary.Get session ${REST_CON}/node/openflow:1/table/${TABLE} Should Not Contain ${resp.content} ${FLOW} Verify flows after deleting flow config on OVS diff --git a/test/csit/suites/openflowplugin/Flows_OF13/307__eth_ip_qos_port_tcpport.robot b/test/csit/suites/openflowplugin/Flows_OF13/307__eth_ip_qos_port_tcpport.robot index 00b972d8..a91c7c42 100644 --- a/test/csit/suites/openflowplugin/Flows_OF13/307__eth_ip_qos_port_tcpport.robot +++ b/test/csit/suites/openflowplugin/Flows_OF13/307__eth_ip_qos_port_tcpport.robot @@ -5,7 +5,7 @@ Suite Teardown Delete All Sessions Library SSHLibrary Library Collections Library OperatingSystem -Library ../../../libraries/RequestsLibrary.py +Library RequestsLibrary Library ../../../libraries/Common.py Variables ../../../variables/Variables.py @@ -23,13 +23,13 @@ Add a flow - Output to physical port# [Tags] Push ${body} OperatingSystem.Get File ${FILE} Set Suite Variable ${body} - ${resp} Putxml session ${REST_CON}/node/openflow:1/table/${TABLE}/flow/${FLOW} data=${body} + ${resp} RequestsLibrary.Put session ${REST_CON}/node/openflow:1/table/${TABLE}/flow/${FLOW} headers=${HEADERS_XML} data=${body} Should Be Equal As Strings ${resp.status_code} 200 Verify after adding flow config - Output to physical port# [Documentation] Verify the flow [Tags] Get - ${resp} get session ${REST_CON}/node/openflow:1/table/${TABLE}/flow/${FLOW} headers=${ACCEPT_XML} + ${resp} RequestsLibrary.Get session ${REST_CON}/node/openflow:1/table/${TABLE}/flow/${FLOW} headers=${ACCEPT_XML} Should Be Equal As Strings ${resp.status_code} 200 compare xml ${body} ${resp.content} @@ -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} Get session ${REST_CON}/node/openflow:1/table/${TABLE} + ${resp} RequestsLibrary.Get session ${REST_CON}/node/openflow:1/table/${TABLE} Should Not Contain ${resp.content} ${FLOW} Verify flows after deleting flow config on OVS diff --git a/test/csit/suites/openflowplugin/Flows_OF13/308__eth_ip_qos_port_tcpport_mpls.robot b/test/csit/suites/openflowplugin/Flows_OF13/308__eth_ip_qos_port_tcpport_mpls.robot index 50df24d5..a9fa00f8 100644 --- a/test/csit/suites/openflowplugin/Flows_OF13/308__eth_ip_qos_port_tcpport_mpls.robot +++ b/test/csit/suites/openflowplugin/Flows_OF13/308__eth_ip_qos_port_tcpport_mpls.robot @@ -5,7 +5,7 @@ Suite Teardown Delete All Sessions Library SSHLibrary Library Collections Library OperatingSystem -Library ../../../libraries/RequestsLibrary.py +Library RequestsLibrary Library ../../../libraries/Common.py Variables ../../../variables/Variables.py @@ -23,13 +23,13 @@ Add a flow - Output to physical port# [Tags] Push ${body} OperatingSystem.Get File ${FILE} Set Suite Variable ${body} - ${resp} Putxml session ${REST_CON}/node/openflow:1/table/${TABLE}/flow/${FLOW} data=${body} + ${resp} RequestsLibrary.Put session ${REST_CON}/node/openflow:1/table/${TABLE}/flow/${FLOW} headers=${HEADERS_XML} data=${body} Should Be Equal As Strings ${resp.status_code} 200 Verify after adding flow config - Output to physical port# [Documentation] Verify the flow [Tags] Get - ${resp} get session ${REST_CON}/node/openflow:1/table/${TABLE}/flow/${FLOW} headers=${ACCEPT_XML} + ${resp} RequestsLibrary.Get session ${REST_CON}/node/openflow:1/table/${TABLE}/flow/${FLOW} headers=${ACCEPT_XML} Should Be Equal As Strings ${resp.status_code} 200 compare xml ${body} ${resp.content} @@ -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} Delete session ${REST_CON}/node/openflow:1/table/${TABLE}/flow/${FLOW} + ${resp} RequestsLibrary.Delete session ${REST_CON}/node/openflow:1/table/${TABLE}/flow/${FLOW} Should Be Equal As Strings ${resp.status_code} 200 Verify after deleting flow config - Output to physical port# [Documentation] Verify the flow [Tags] Get - ${resp} Get session ${REST_CON}/node/openflow:1/table/${TABLE} + ${resp} RequestsLibrary.Get session ${REST_CON}/node/openflow:1/table/${TABLE} Should Not Contain ${resp.content} ${FLOW} Verify flows after deleting flow config on OVS diff --git a/test/csit/suites/openflowplugin/Flows_OF13/309__eth_ip_qos_sctp.robot b/test/csit/suites/openflowplugin/Flows_OF13/309__eth_ip_qos_sctp.robot index 4e0d8266..f2bc364b 100644 --- a/test/csit/suites/openflowplugin/Flows_OF13/309__eth_ip_qos_sctp.robot +++ b/test/csit/suites/openflowplugin/Flows_OF13/309__eth_ip_qos_sctp.robot @@ -5,7 +5,7 @@ Suite Teardown Delete All Sessions Library SSHLibrary Library Collections Library OperatingSystem -Library ../../../libraries/RequestsLibrary.py +Library RequestsLibrary Library ../../../libraries/Common.py Variables ../../../variables/Variables.py @@ -23,13 +23,13 @@ Add a flow - Output to physical port# [Tags] Push ${body} OperatingSystem.Get File ${FILE} Set Suite Variable ${body} - ${resp} Putxml session ${REST_CON}/node/openflow:1/table/${TABLE}/flow/${FLOW} data=${body} + ${resp} RequestsLibrary.Put session ${REST_CON}/node/openflow:1/table/${TABLE}/flow/${FLOW} data=${body} Should Be Equal As Strings ${resp.status_code} 200 Verify after adding flow config - Output to physical port# [Documentation] Verify the flow [Tags] Get - ${resp} get session ${REST_CON}/node/openflow:1/table/${TABLE}/flow/${FLOW} headers=${ACCEPT_XML} + ${resp} RequestsLibrary.Get session ${REST_CON}/node/openflow:1/table/${TABLE}/flow/${FLOW} headers=${ACCEPT_XML} Should Be Equal As Strings ${resp.status_code} 200 compare xml ${body} ${resp.content} @@ -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} Delete session ${REST_CON}/node/openflow:1/table/${TABLE}/flow/${FLOW} + ${resp} RequestsLibrary.Delete session ${REST_CON}/node/openflow:1/table/${TABLE}/flow/${FLOW} Should Be Equal As Strings ${resp.status_code} 200 Verify after deleting flow config - Output to physical port# [Documentation] Verify the flow [Tags] Get - ${resp} Get session ${REST_CON}/node/openflow:1/table/${TABLE} + ${resp} RequestsLibrary.Get session ${REST_CON}/node/openflow:1/table/${TABLE} Should Not Contain ${resp.content} ${FLOW} Verify flows after deleting flow config on OVS diff --git a/test/csit/suites/openflowplugin/Flows_OF13/310__eth_ip_qos_icmp.robot b/test/csit/suites/openflowplugin/Flows_OF13/310__eth_ip_qos_icmp.robot index 84b40331..a577323c 100644 --- a/test/csit/suites/openflowplugin/Flows_OF13/310__eth_ip_qos_icmp.robot +++ b/test/csit/suites/openflowplugin/Flows_OF13/310__eth_ip_qos_icmp.robot @@ -5,7 +5,7 @@ Suite Teardown Delete All Sessions Library SSHLibrary Library Collections Library OperatingSystem -Library ../../../libraries/RequestsLibrary.py +Library RequestsLibrary Library ../../../libraries/Common.py Variables ../../../variables/Variables.py @@ -23,13 +23,13 @@ Add a flow - Output to physical port# [Tags] Push ${body} OperatingSystem.Get File ${FILE} Set Suite Variable ${body} - ${resp} Putxml session ${REST_CON}/node/openflow:1/table/${TABLE}/flow/${FLOW} data=${body} + ${resp} RequestsLibrary.Put session ${REST_CON}/node/openflow:1/table/${TABLE}/flow/${FLOW} headers=${HEADERS_XML} data=${body} Should Be Equal As Strings ${resp.status_code} 200 Verify after adding flow config - Output to physical port# [Documentation] Verify the flow [Tags] Get - ${resp} get session ${REST_CON}/node/openflow:1/table/${TABLE}/flow/${FLOW} headers=${ACCEPT_XML} + ${resp} RequestsLibrary.Get session ${REST_CON}/node/openflow:1/table/${TABLE}/flow/${FLOW} headers=${ACCEPT_XML} Should Be Equal As Strings ${resp.status_code} 200 compare xml ${body} ${resp.content} @@ -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} Delete session ${REST_CON}/node/openflow:1/table/${TABLE}/flow/${FLOW} + ${resp} RequestsLibrary.Delete session ${REST_CON}/node/openflow:1/table/${TABLE}/flow/${FLOW} Should Be Equal As Strings ${resp.status_code} 200 Verify after deleting flow config - Output to physical port# [Documentation] Verify the flow [Tags] Get - ${resp} Get session ${REST_CON}/node/openflow:1/table/${TABLE} + ${resp} RequestsLibrary.Get session ${REST_CON}/node/openflow:1/table/${TABLE} Should Not Contain ${resp.content} ${FLOW} Verify flows after deleting flow config on OVS diff --git a/test/csit/suites/openflowplugin/Flows_OF13/311__eth_arp.robot b/test/csit/suites/openflowplugin/Flows_OF13/311__eth_arp.robot index f74268d9..f39737a2 100644 --- a/test/csit/suites/openflowplugin/Flows_OF13/311__eth_arp.robot +++ b/test/csit/suites/openflowplugin/Flows_OF13/311__eth_arp.robot @@ -5,7 +5,7 @@ Suite Teardown Delete All Sessions Library SSHLibrary Library Collections Library OperatingSystem -Library ../../../libraries/RequestsLibrary.py +Library RequestsLibrary Library ../../../libraries/Common.py Variables ../../../variables/Variables.py @@ -22,13 +22,13 @@ Add a flow - Output to physical port# [Tags] Push ${body} OperatingSystem.Get File ${FILE} Set Suite Variable ${body} - ${resp} Putxml session ${REST_CON}/node/openflow:1/table/${TABLE}/flow/${FLOW} data=${body} + ${resp} RequestsLibrary.Put session ${REST_CON}/node/openflow:1/table/${TABLE}/flow/${FLOW} headers=${HEADERS_XML} data=${body} Should Be Equal As Strings ${resp.status_code} 200 Verify after adding flow config - Output to physical port# [Documentation] Verify the flow [Tags] Get - ${resp} get session ${REST_CON}/node/openflow:1/table/${TABLE}/flow/${FLOW} headers=${ACCEPT_XML} + ${resp} RequestsLibrary.Get session ${REST_CON}/node/openflow:1/table/${TABLE}/flow/${FLOW} headers=${ACCEPT_XML} Should Be Equal As Strings ${resp.status_code} 200 compare xml ${body} ${resp.content} @@ -45,13 +45,13 @@ Verify flows after adding flow config on OVS Remove a flow - Output to physical port# [Documentation] Remove a flow [Tags] remove - ${resp} Delete session ${REST_CON}/node/openflow:1/table/${TABLE}/flow/${FLOW} + ${resp} RequestsLibrary.Delete session ${REST_CON}/node/openflow:1/table/${TABLE}/flow/${FLOW} Should Be Equal As Strings ${resp.status_code} 200 Verify after deleting flow config - Output to physical port# [Documentation] Verify the flow [Tags] Get - ${resp} Get session ${REST_CON}/node/openflow:1/table/${TABLE} + ${resp} RequestsLibrary.Get session ${REST_CON}/node/openflow:1/table/${TABLE} Should Not Contain ${resp.content} ${FLOW} Verify flows after deleting flow config on OVS diff --git a/test/csit/suites/openflowplugin/Flows_OF13/312__eth_arp_transport.robot b/test/csit/suites/openflowplugin/Flows_OF13/312__eth_arp_transport.robot index 1ccff6a1..f0fc4fd9 100644 --- a/test/csit/suites/openflowplugin/Flows_OF13/312__eth_arp_transport.robot +++ b/test/csit/suites/openflowplugin/Flows_OF13/312__eth_arp_transport.robot @@ -5,7 +5,7 @@ Suite Teardown Delete All Sessions Library SSHLibrary Library Collections Library OperatingSystem -Library ../../../libraries/RequestsLibrary.py +Library RequestsLibrary Library ../../../libraries/Common.py Variables ../../../variables/Variables.py @@ -23,13 +23,13 @@ Add a flow - Output to physical port# [Tags] Push ${body} OperatingSystem.Get File ${FILE} Set Suite Variable ${body} - ${resp} Putxml session ${REST_CON}/node/openflow:1/table/${TABLE}/flow/${FLOW} data=${body} + ${resp} RequestsLibrary.Put session ${REST_CON}/node/openflow:1/table/${TABLE}/flow/${FLOW} headers=${HEADERS_XML} data=${body} Should Be Equal As Strings ${resp.status_code} 200 Verify after adding flow config - Output to physical port# [Documentation] Verify the flow [Tags] Get - ${resp} get session ${REST_CON}/node/openflow:1/table/${TABLE}/flow/${FLOW} headers=${ACCEPT_XML} + ${resp} RequestsLibrary.Get session ${REST_CON}/node/openflow:1/table/${TABLE}/flow/${FLOW} headers=${ACCEPT_XML} Should Be Equal As Strings ${resp.status_code} 200 compare xml ${body} ${resp.content} @@ -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} Delete session ${REST_CON}/node/openflow:1/table/${TABLE}/flow/${FLOW} + ${resp} RequestsLibrary.Delete session ${REST_CON}/node/openflow:1/table/${TABLE}/flow/${FLOW} Should Be Equal As Strings ${resp.status_code} 200 Verify after deleting flow config - Output to physical port# [Documentation] Verify the flow [Tags] Get - ${resp} Get session ${REST_CON}/node/openflow:1/table/${TABLE} + ${resp} RequestsLibrary.Get session ${REST_CON}/node/openflow:1/table/${TABLE} Should Not Contain ${resp.content} ${FLOW} Verify flows after deleting flow config on OVS diff --git a/test/csit/suites/openflowplugin/Flows_OF13/313__eth_arp_transport_hardware.robot b/test/csit/suites/openflowplugin/Flows_OF13/313__eth_arp_transport_hardware.robot index 288ec5ae..335c048f 100644 --- a/test/csit/suites/openflowplugin/Flows_OF13/313__eth_arp_transport_hardware.robot +++ b/test/csit/suites/openflowplugin/Flows_OF13/313__eth_arp_transport_hardware.robot @@ -5,7 +5,7 @@ Suite Teardown Delete All Sessions Library SSHLibrary Library Collections Library OperatingSystem -Library ../../../libraries/RequestsLibrary.py +Library RequestsLibrary Library ../../../libraries/Common.py Variables ../../../variables/Variables.py @@ -23,13 +23,13 @@ Add a flow - Output to physical port# [Tags] Push ${body} OperatingSystem.Get File ${FILE} Set Suite Variable ${body} - ${resp} Putxml session ${REST_CON}/node/openflow:1/table/${TABLE}/flow/${FLOW} data=${body} + ${resp} RequestsLibrary.Put session ${REST_CON}/node/openflow:1/table/${TABLE}/flow/${FLOW} headers=${HEADERS_XML} data=${body} Should Be Equal As Strings ${resp.status_code} 200 Verify after adding flow config - Output to physical port# [Documentation] Verify the flow [Tags] Get - ${resp} get session ${REST_CON}/node/openflow:1/table/${TABLE}/flow/${FLOW} headers=${ACCEPT_XML} + ${resp} RequestsLibrary.Get session ${REST_CON}/node/openflow:1/table/${TABLE}/flow/${FLOW} headers=${ACCEPT_XML} Should Be Equal As Strings ${resp.status_code} 200 compare xml ${body} ${resp.content} @@ -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} Delete session ${REST_CON}/node/openflow:1/table/${TABLE}/flow/${FLOW} + ${resp} RequestsLibrary.Delete session ${REST_CON}/node/openflow:1/table/${TABLE}/flow/${FLOW} Should Be Equal As Strings ${resp.status_code} 200 Verify after deleting flow config - Output to physical port# [Documentation] Verify the flow [Tags] Get - ${resp} Get session ${REST_CON}/node/openflow:1/table/${TABLE} + ${resp} RequestsLibrary.Get session ${REST_CON}/node/openflow:1/table/${TABLE} Should Not Contain ${resp.content} ${FLOW} Verify flows after deleting flow config on OVS diff --git a/test/csit/suites/openflowplugin/Flows_OF13/314__eth_vlan.robot b/test/csit/suites/openflowplugin/Flows_OF13/314__eth_vlan.robot index 098325bc..61755be5 100644 --- a/test/csit/suites/openflowplugin/Flows_OF13/314__eth_vlan.robot +++ b/test/csit/suites/openflowplugin/Flows_OF13/314__eth_vlan.robot @@ -5,7 +5,7 @@ Suite Teardown Delete All Sessions Library SSHLibrary Library Collections Library OperatingSystem -Library ../../../libraries/RequestsLibrary.py +Library RequestsLibrary Library ../../../libraries/Common.py Variables ../../../variables/Variables.py @@ -22,13 +22,13 @@ Add a flow - Output to physical port# [Tags] Push ${body} OperatingSystem.Get File ${FILE} Set Suite Variable ${body} - ${resp} Putxml session ${REST_CON}/node/openflow:1/table/${TABLE}/flow/${FLOW} data=${body} + ${resp} RequestsLibrary.Put session ${REST_CON}/node/openflow:1/table/${TABLE}/flow/${FLOW} headers=${HEADERS_XML} data=${body} Should Be Equal As Strings ${resp.status_code} 200 Verify after adding flow config - Output to physical port# [Documentation] Verify the flow [Tags] Get - ${resp} get session ${REST_CON}/node/openflow:1/table/${TABLE}/flow/${FLOW} headers=${ACCEPT_XML} + ${resp} RequestsLibrary.Get session ${REST_CON}/node/openflow:1/table/${TABLE}/flow/${FLOW} headers=${ACCEPT_XML} Should Be Equal As Strings ${resp.status_code} 200 compare xml ${body} ${resp.content} @@ -45,13 +45,13 @@ Verify flows after adding flow config on OVS Remove a flow - Output to physical port# [Documentation] Remove a flow [Tags] remove - ${resp} Delete session ${REST_CON}/node/openflow:1/table/${TABLE}/flow/${FLOW} + ${resp} RequestsLibrary.Delete session ${REST_CON}/node/openflow:1/table/${TABLE}/flow/${FLOW} Should Be Equal As Strings ${resp.status_code} 200 Verify after deleting flow config - Output to physical port# [Documentation] Verify the flow [Tags] Get - ${resp} Get session ${REST_CON}/node/openflow:1/table/${TABLE} + ${resp} RequestsLibrary.Get session ${REST_CON}/node/openflow:1/table/${TABLE} Should Not Contain ${resp.content} ${FLOW} Verify flows after deleting flow config on OVS diff --git a/test/csit/suites/openflowplugin/Flows_OF13/315__timeout_vlan_pcp_vlan.robot b/test/csit/suites/openflowplugin/Flows_OF13/315__timeout_vlan_pcp_vlan.robot index 769db927..c8563eb0 100644 --- a/test/csit/suites/openflowplugin/Flows_OF13/315__timeout_vlan_pcp_vlan.robot +++ b/test/csit/suites/openflowplugin/Flows_OF13/315__timeout_vlan_pcp_vlan.robot @@ -5,7 +5,7 @@ Suite Teardown Delete All Sessions Library SSHLibrary Library Collections Library OperatingSystem -Library ../../../libraries/RequestsLibrary.py +Library RequestsLibrary Library ../../../libraries/Common.py Variables ../../../variables/Variables.py @@ -23,13 +23,13 @@ Add a flow - Output to physical port# [Tags] Push ${body} OperatingSystem.Get File ${FILE} Set Suite Variable ${body} - ${resp} Putxml session ${REST_CON}/node/openflow:1/table/${TABLE}/flow/${FLOW} data=${body} + ${resp} RequestsLibrary.Put session ${REST_CON}/node/openflow:1/table/${TABLE}/flow/${FLOW} headers=${HEADERS_XML} data=${body} Should Be Equal As Strings ${resp.status_code} 200 Verify after adding flow config - Output to physical port# [Documentation] Verify the flow [Tags] Get - ${resp} get session ${REST_CON}/node/openflow:1/table/${TABLE}/flow/${FLOW} headers=${ACCEPT_XML} + ${resp} RequestsLibrary.Get session ${REST_CON}/node/openflow:1/table/${TABLE}/flow/${FLOW} headers=${ACCEPT_XML} Should Be Equal As Strings ${resp.status_code} 200 compare xml ${body} ${resp.content} @@ -45,13 +45,13 @@ Verify flows after adding flow config on OVS Remove a flow - Output to physical port# [Documentation] Remove a flow [Tags] remove - ${resp} Delete session ${REST_CON}/node/openflow:1/table/${TABLE}/flow/${FLOW} + ${resp} RequestsLibrary.Delete session ${REST_CON}/node/openflow:1/table/${TABLE}/flow/${FLOW} Should Be Equal As Strings ${resp.status_code} 200 Verify after deleting flow config - Output to physical port# [Documentation] Verify the flow [Tags] Get - ${resp} Get session ${REST_CON}/node/openflow:1/table/${TABLE} + ${resp} RequestsLibrary.Get session ${REST_CON}/node/openflow:1/table/${TABLE} Should Not Contain ${resp.content} ${FLOW} Verify flows after deleting flow config on OVS diff --git a/test/csit/suites/openflowplugin/Flows_OF13/316__eth_mpls_tc_bos.robot b/test/csit/suites/openflowplugin/Flows_OF13/316__eth_mpls_tc_bos.robot index 3ecb6c01..e0448c7a 100644 --- a/test/csit/suites/openflowplugin/Flows_OF13/316__eth_mpls_tc_bos.robot +++ b/test/csit/suites/openflowplugin/Flows_OF13/316__eth_mpls_tc_bos.robot @@ -5,7 +5,7 @@ Suite Teardown Delete All Sessions Library SSHLibrary Library Collections Library OperatingSystem -Library ../../../libraries/RequestsLibrary.py +Library RequestsLibrary Library ../../../libraries/Common.py Variables ../../../variables/Variables.py @@ -23,13 +23,13 @@ Add a flow - Output to physical port# [Tags] Push ${body} OperatingSystem.Get File ${FILE} Set Suite Variable ${body} - ${resp} Putxml session ${REST_CON}/node/openflow:1/table/${TABLE}/flow/${FLOW} data=${body} + ${resp} RequestsLibrary.Put session ${REST_CON}/node/openflow:1/table/${TABLE}/flow/${FLOW} headers=${HEADERS_XML} data=${body} Should Be Equal As Strings ${resp.status_code} 200 Verify after adding flow config - Output to physical port# [Documentation] Verify the flow [Tags] Get - ${resp} get session ${REST_CON}/node/openflow:1/table/${TABLE}/flow/${FLOW} headers=${ACCEPT_XML} + ${resp} RequestsLibrary.Get session ${REST_CON}/node/openflow:1/table/${TABLE}/flow/${FLOW} headers=${ACCEPT_XML} Should Be Equal As Strings ${resp.status_code} 200 compare xml ${body} ${resp.content} @@ -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} Delete session ${REST_CON}/node/openflow:1/table/${TABLE}/flow/${FLOW} + ${resp} RequestsLibrary.Delete session ${REST_CON}/node/openflow:1/table/${TABLE}/flow/${FLOW} Should Be Equal As Strings ${resp.status_code} 200 Verify after deleting flow config - Output to physical port# [Documentation] Verify the flow [Tags] Get - ${resp} Get session ${REST_CON}/node/openflow:1/table/${TABLE} + ${resp} RequestsLibrary.Get session ${REST_CON}/node/openflow:1/table/${TABLE} Should Not Contain ${resp.content} ${FLOW} Verify flows after deleting flow config on OVS diff --git a/test/csit/suites/openflowplugin/Flows_OF13/317__eth_ipv6.robot b/test/csit/suites/openflowplugin/Flows_OF13/317__eth_ipv6.robot index 1972a5a5..57e302d5 100644 --- a/test/csit/suites/openflowplugin/Flows_OF13/317__eth_ipv6.robot +++ b/test/csit/suites/openflowplugin/Flows_OF13/317__eth_ipv6.robot @@ -5,7 +5,7 @@ Suite Teardown Delete All Sessions Library SSHLibrary Library Collections Library OperatingSystem -Library ../../../libraries/RequestsLibrary.py +Library RequestsLibrary Library ../../../libraries/Common.py Variables ../../../variables/Variables.py @@ -22,13 +22,13 @@ Add a flow - Output to physical port# [Tags] Push ${body} OperatingSystem.Get File ${FILE} Set Suite Variable ${body} - ${resp} Putxml session ${REST_CON}/node/openflow:1/table/${TABLE}/flow/${FLOW} data=${body} + ${resp} RequestsLibrary.Put session ${REST_CON}/node/openflow:1/table/${TABLE}/flow/${FLOW} headers=${HEADERS_XML} data=${body} Should Be Equal As Strings ${resp.status_code} 200 Verify after adding flow config - Output to physical port# [Documentation] Verify the flow [Tags] Get - ${resp} get session ${REST_CON}/node/openflow:1/table/${TABLE}/flow/${FLOW} headers=${ACCEPT_XML} + ${resp} RequestsLibrary.Get session ${REST_CON}/node/openflow:1/table/${TABLE}/flow/${FLOW} headers=${ACCEPT_XML} Should Be Equal As Strings ${resp.status_code} 200 compare xml ${body} ${resp.content} @@ -45,13 +45,13 @@ Verify flows after adding flow config on OVS Remove a flow - Output to physical port# [Documentation] Remove a flow [Tags] remove - ${resp} Delete session ${REST_CON}/node/openflow:1/table/${TABLE}/flow/${FLOW} + ${resp} RequestsLibrary.Delete session ${REST_CON}/node/openflow:1/table/${TABLE}/flow/${FLOW} Should Be Equal As Strings ${resp.status_code} 200 Verify after deleting flow config - Output to physical port# [Documentation] Verify the flow [Tags] Get - ${resp} Get session ${REST_CON}/node/openflow:1/table/${TABLE} + ${resp} RequestsLibrary.Get session ${REST_CON}/node/openflow:1/table/${TABLE} Should Not Contain ${resp.content} ${FLOW} Verify flows after deleting flow config on OVS diff --git a/test/csit/suites/openflowplugin/Flows_OF13/318__metadata.robot b/test/csit/suites/openflowplugin/Flows_OF13/318__metadata.robot index 286d845d..2c193d35 100644 --- a/test/csit/suites/openflowplugin/Flows_OF13/318__metadata.robot +++ b/test/csit/suites/openflowplugin/Flows_OF13/318__metadata.robot @@ -5,7 +5,7 @@ Suite Teardown Delete All Sessions Library SSHLibrary Library Collections Library OperatingSystem -Library ../../../libraries/RequestsLibrary.py +Library RequestsLibrary Library ../../../libraries/Common.py Variables ../../../variables/Variables.py @@ -22,13 +22,13 @@ Add a flow - Output to physical port# [Tags] Push ${body} OperatingSystem.Get File ${FILE} Set Suite Variable ${body} - ${resp} Putxml session ${REST_CON}/node/openflow:1/table/${TABLE}/flow/${FLOW} data=${body} + ${resp} RequestsLibrary.Put session ${REST_CON}/node/openflow:1/table/${TABLE}/flow/${FLOW} headers=${HEADERS_XML} data=${body} Should Be Equal As Strings ${resp.status_code} 200 Verify after adding flow config - Output to physical port# [Documentation] Verify the flow [Tags] Get - ${resp} get session ${REST_CON}/node/openflow:1/table/${TABLE}/flow/${FLOW} headers=${ACCEPT_XML} + ${resp} RequestsLibrary.Get session ${REST_CON}/node/openflow:1/table/${TABLE}/flow/${FLOW} headers=${ACCEPT_XML} Should Be Equal As Strings ${resp.status_code} 200 compare xml ${body} ${resp.content} @@ -45,13 +45,13 @@ Verify flows after adding flow config on OVS Remove a flow - Output to physical port# [Documentation] Remove a flow [Tags] remove - ${resp} Delete session ${REST_CON}/node/openflow:1/table/${TABLE}/flow/${FLOW} + ${resp} RequestsLibrary.Delete session ${REST_CON}/node/openflow:1/table/${TABLE}/flow/${FLOW} Should Be Equal As Strings ${resp.status_code} 200 Verify after deleting flow config - Output to physical port# [Documentation] Verify the flow [Tags] Get - ${resp} Get session ${REST_CON}/node/openflow:1/table/${TABLE} + ${resp} RequestsLibrary.Get session ${REST_CON}/node/openflow:1/table/${TABLE} Should Not Contain ${resp.content} ${FLOW} Verify flows after deleting flow config on OVS diff --git a/test/csit/suites/openflowplugin/Flows_OF13/319__metadata_mask.robot b/test/csit/suites/openflowplugin/Flows_OF13/319__metadata_mask.robot index 21c331e1..4af6e46b 100644 --- a/test/csit/suites/openflowplugin/Flows_OF13/319__metadata_mask.robot +++ b/test/csit/suites/openflowplugin/Flows_OF13/319__metadata_mask.robot @@ -5,7 +5,7 @@ Suite Teardown Delete All Sessions Library SSHLibrary Library Collections Library OperatingSystem -Library ../../../libraries/RequestsLibrary.py +Library RequestsLibrary Library ../../../libraries/Common.py Variables ../../../variables/Variables.py @@ -22,13 +22,13 @@ Add a flow - Output to physical port# [Tags] Push ${body} OperatingSystem.Get File ${FILE} Set Suite Variable ${body} - ${resp} Putxml session ${REST_CON}/node/openflow:1/table/${TABLE}/flow/${FLOW} data=${body} + ${resp} RequestsLibrary.Put session ${REST_CON}/node/openflow:1/table/${TABLE}/flow/${FLOW} headers=${HEADERS_XML} data=${body} Should Be Equal As Strings ${resp.status_code} 200 Verify after adding flow config - Output to physical port# [Documentation] Verify the flow [Tags] Get - ${resp} get session ${REST_CON}/node/openflow:1/table/${TABLE}/flow/${FLOW} headers=${ACCEPT_XML} + ${resp} RequestsLibrary.Get session ${REST_CON}/node/openflow:1/table/${TABLE}/flow/${FLOW} headers=${ACCEPT_XML} Should Be Equal As Strings ${resp.status_code} 200 compare xml ${body} ${resp.content} @@ -45,13 +45,13 @@ Verify flows after adding flow config on OVS Remove a flow - Output to physical port# [Documentation] Remove a flow [Tags] remove - ${resp} Delete session ${REST_CON}/node/openflow:1/table/${TABLE}/flow/${FLOW} + ${resp} RequestsLibrary.Delete session ${REST_CON}/node/openflow:1/table/${TABLE}/flow/${FLOW} Should Be Equal As Strings ${resp.status_code} 200 Verify after deleting flow config - Output to physical port# [Documentation] Verify the flow [Tags] Get - ${resp} Get session ${REST_CON}/node/openflow:1/table/${TABLE} + ${resp} RequestsLibrary.Get session ${REST_CON}/node/openflow:1/table/${TABLE} Should Not Contain ${resp.content} ${FLOW} Verify flows after deleting flow config on OVS diff --git a/test/csit/suites/openflowplugin/Flows_OF13/320__ipv6_meta_qos_udp.robot b/test/csit/suites/openflowplugin/Flows_OF13/320__ipv6_meta_qos_udp.robot index e81b84b6..bc0dea8e 100644 --- a/test/csit/suites/openflowplugin/Flows_OF13/320__ipv6_meta_qos_udp.robot +++ b/test/csit/suites/openflowplugin/Flows_OF13/320__ipv6_meta_qos_udp.robot @@ -5,7 +5,7 @@ Suite Teardown Delete All Sessions Library SSHLibrary Library Collections Library OperatingSystem -Library ../../../libraries/RequestsLibrary.py +Library RequestsLibrary Library ../../../libraries/Common.py Variables ../../../variables/Variables.py @@ -23,13 +23,13 @@ Add a flow - Output to physical port# [Tags] Push ${body} OperatingSystem.Get File ${FILE} Set Suite Variable ${body} - ${resp} Putxml session ${REST_CON}/node/openflow:1/table/${TABLE}/flow/${FLOW} data=${body} + ${resp} RequestsLibrary.Put session ${REST_CON}/node/openflow:1/table/${TABLE}/flow/${FLOW} headers=${HEADERS_XML} data=${body} Should Be Equal As Strings ${resp.status_code} 200 Verify after adding flow config - Output to physical port# [Documentation] Verify the flow [Tags] Get - ${resp} get session ${REST_CON}/node/openflow:1/table/${TABLE}/flow/${FLOW} headers=${ACCEPT_XML} + ${resp} RequestsLibrary.Get session ${REST_CON}/node/openflow:1/table/${TABLE}/flow/${FLOW} headers=${ACCEPT_XML} Should Be Equal As Strings ${resp.status_code} 200 compare xml ${body} ${resp.content} @@ -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} Delete session ${REST_CON}/node/openflow:1/table/${TABLE}/flow/${FLOW} + ${resp} RequestsLibrary.Delete session ${REST_CON}/node/openflow:1/table/${TABLE}/flow/${FLOW} Should Be Equal As Strings ${resp.status_code} 200 Verify after deleting flow config - Output to physical port# [Documentation] Verify the flow [Tags] Get - ${resp} Get session ${REST_CON}/node/openflow:1/table/${TABLE} + ${resp} RequestsLibrary.Get session ${REST_CON}/node/openflow:1/table/${TABLE} Should Not Contain ${resp.content} ${FLOW} Verify flows after deleting flow config on OVS diff --git a/test/csit/suites/openflowplugin/Flows_OF13/321__ipv6_meta_qos_tcp.robot b/test/csit/suites/openflowplugin/Flows_OF13/321__ipv6_meta_qos_tcp.robot index 2193fa9a..20e45053 100644 --- a/test/csit/suites/openflowplugin/Flows_OF13/321__ipv6_meta_qos_tcp.robot +++ b/test/csit/suites/openflowplugin/Flows_OF13/321__ipv6_meta_qos_tcp.robot @@ -5,7 +5,7 @@ Suite Teardown Delete All Sessions Library SSHLibrary Library Collections Library OperatingSystem -Library ../../../libraries/RequestsLibrary.py +Library RequestsLibrary Library ../../../libraries/Common.py Variables ../../../variables/Variables.py @@ -23,13 +23,13 @@ Add a flow - Output to physical port# [Tags] Push ${body} OperatingSystem.Get File ${FILE} Set Suite Variable ${body} - ${resp} Putxml session ${REST_CON}/node/openflow:1/table/${TABLE}/flow/${FLOW} data=${body} + ${resp} RequestsLibrary.Put session ${REST_CON}/node/openflow:1/table/${TABLE}/flow/${FLOW} headers=${HEADERS_XML} data=${body} Should Be Equal As Strings ${resp.status_code} 200 Verify after adding flow config - Output to physical port# [Documentation] Verify the flow [Tags] Get - ${resp} get session ${REST_CON}/node/openflow:1/table/${TABLE}/flow/${FLOW} headers=${ACCEPT_XML} + ${resp} RequestsLibrary.Get session ${REST_CON}/node/openflow:1/table/${TABLE}/flow/${FLOW} headers=${ACCEPT_XML} Should Be Equal As Strings ${resp.status_code} 200 compare xml ${body} ${resp.content} @@ -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} Delete session ${REST_CON}/node/openflow:1/table/${TABLE}/flow/${FLOW} + ${resp} RequestsLibrary.Delete session ${REST_CON}/node/openflow:1/table/${TABLE}/flow/${FLOW} Should Be Equal As Strings ${resp.status_code} 200 Verify after deleting flow config - Output to physical port# [Documentation] Verify the flow [Tags] Get - ${resp} Get session ${REST_CON}/node/openflow:1/table/${TABLE} + ${resp} RequestsLibrary.Get session ${REST_CON}/node/openflow:1/table/${TABLE} Should Not Contain ${resp.content} ${FLOW} Verify flows after deleting flow config on OVS diff --git a/test/csit/suites/openflowplugin/Flows_OF13/322__ipv6_flow.robot b/test/csit/suites/openflowplugin/Flows_OF13/322__ipv6_flow.robot index fc81a555..50504020 100644 --- a/test/csit/suites/openflowplugin/Flows_OF13/322__ipv6_flow.robot +++ b/test/csit/suites/openflowplugin/Flows_OF13/322__ipv6_flow.robot @@ -5,7 +5,7 @@ Suite Teardown Delete All Sessions Library SSHLibrary Library Collections Library OperatingSystem -Library ../../../libraries/RequestsLibrary.py +Library RequestsLibrary Library ../../../libraries/Common.py Variables ../../../variables/Variables.py @@ -23,13 +23,13 @@ Add a flow - Output to physical port# [Tags] Push ${body} OperatingSystem.Get File ${FILE} Set Suite Variable ${body} - ${resp} Putxml session ${REST_CON}/node/openflow:1/table/${TABLE}/flow/${FLOW} data=${body} + ${resp} RequestsLibrary.Put session ${REST_CON}/node/openflow:1/table/${TABLE}/flow/${FLOW} headers=${HEADERS_XML} data=${body} Should Be Equal As Strings ${resp.status_code} 200 Verify after adding flow config - Output to physical port# [Documentation] Verify the flow [Tags] Get - ${resp} get session ${REST_CON}/node/openflow:1/table/${TABLE}/flow/${FLOW} headers=${ACCEPT_XML} + ${resp} RequestsLibrary.Get session ${REST_CON}/node/openflow:1/table/${TABLE}/flow/${FLOW} headers=${ACCEPT_XML} Should Be Equal As Strings ${resp.status_code} 200 compare xml ${body} ${resp.content} @@ -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} Delete session ${REST_CON}/node/openflow:1/table/${TABLE}/flow/${FLOW} + ${resp} RequestsLibrary.Delete session ${REST_CON}/node/openflow:1/table/${TABLE}/flow/${FLOW} Should Be Equal As Strings ${resp.status_code} 200 Verify after deleting flow config - Output to physical port# [Documentation] Verify the flow [Tags] Get - ${resp} Get session ${REST_CON}/node/openflow:1/table/${TABLE} + ${resp} RequestsLibrary.Get session ${REST_CON}/node/openflow:1/table/${TABLE} Should Not Contain ${resp.content} ${FLOW} Verify flows after deleting flow config on OVS diff --git a/test/csit/suites/openflowplugin/Flows_OF13/323__tunnel.robot b/test/csit/suites/openflowplugin/Flows_OF13/323__tunnel.robot index 7c384c54..aaa4ea23 100644 --- a/test/csit/suites/openflowplugin/Flows_OF13/323__tunnel.robot +++ b/test/csit/suites/openflowplugin/Flows_OF13/323__tunnel.robot @@ -5,7 +5,7 @@ Suite Teardown Delete All Sessions Library SSHLibrary Library Collections Library OperatingSystem -Library ../../../libraries/RequestsLibrary.py +Library RequestsLibrary Library ../../../libraries/Common.py Variables ../../../variables/Variables.py @@ -22,13 +22,13 @@ Add a flow - Output to physical port# [Tags] Push ${body} OperatingSystem.Get File ${FILE} Set Suite Variable ${body} - ${resp} Putxml session ${REST_CON}/node/openflow:1/table/${TABLE}/flow/${FLOW} data=${body} + ${resp} RequestsLibrary.Put session ${REST_CON}/node/openflow:1/table/${TABLE}/flow/${FLOW} headers=${HEADERS_XML} data=${body} Should Be Equal As Strings ${resp.status_code} 200 Verify after adding flow config - Output to physical port# [Documentation] Verify the flow [Tags] Get - ${resp} get session ${REST_CON}/node/openflow:1/table/${TABLE}/flow/${FLOW} headers=${ACCEPT_XML} + ${resp} RequestsLibrary.Get session ${REST_CON}/node/openflow:1/table/${TABLE}/flow/${FLOW} headers=${ACCEPT_XML} Should Be Equal As Strings ${resp.status_code} 200 compare xml ${body} ${resp.content} @@ -45,13 +45,13 @@ Verify flows after adding flow config on OVS Remove a flow - Output to physical port# [Documentation] Remove a flow [Tags] remove - ${resp} Delete session ${REST_CON}/node/openflow:1/table/${TABLE}/flow/${FLOW} + ${resp} RequestsLibrary.Delete session ${REST_CON}/node/openflow:1/table/${TABLE}/flow/${FLOW} Should Be Equal As Strings ${resp.status_code} 200 Verify after deleting flow config - Output to physical port# [Documentation] Verify the flow [Tags] Get - ${resp} Get session ${REST_CON}/node/openflow:1/table/${TABLE} + ${resp} RequestsLibrary.Get session ${REST_CON}/node/openflow:1/table/${TABLE} Should Not Contain ${resp.content} ${FLOW} Verify flows after deleting flow config on OVS diff --git a/test/csit/suites/openflowplugin/Flows_OF13/324__ipv6_flow_label.robot b/test/csit/suites/openflowplugin/Flows_OF13/324__ipv6_flow_label.robot index c0653a27..743635eb 100644 --- a/test/csit/suites/openflowplugin/Flows_OF13/324__ipv6_flow_label.robot +++ b/test/csit/suites/openflowplugin/Flows_OF13/324__ipv6_flow_label.robot @@ -5,7 +5,7 @@ Suite Teardown Delete All Sessions Library SSHLibrary Library Collections Library OperatingSystem -Library ../../../libraries/RequestsLibrary.py +Library RequestsLibrary Library ../../../libraries/Common.py Variables ../../../variables/Variables.py @@ -23,13 +23,13 @@ Add a flow - Output to physical port# [Tags] Push ${body} OperatingSystem.Get File ${FILE} Set Suite Variable ${body} - ${resp} Putxml session ${REST_CON}/node/openflow:1/table/${TABLE}/flow/${FLOW} data=${body} + ${resp} RequestsLibrary.Put session ${REST_CON}/node/openflow:1/table/${TABLE}/flow/${FLOW} headers=${HEADERS_XML} data=${body} Should Be Equal As Strings ${resp.status_code} 200 Verify after adding flow config - Output to physical port# [Documentation] Verify the flow [Tags] Get - ${resp} get session ${REST_CON}/node/openflow:1/table/${TABLE}/flow/${FLOW} headers=${ACCEPT_XML} + ${resp} RequestsLibrary.Get session ${REST_CON}/node/openflow:1/table/${TABLE}/flow/${FLOW} headers=${ACCEPT_XML} Should Be Equal As Strings ${resp.status_code} 200 compare xml ${body} ${resp.content} @@ -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} Delete session ${REST_CON}/node/openflow:1/table/${TABLE}/flow/${FLOW} + ${resp} RequestsLibrary.Delete session ${REST_CON}/node/openflow:1/table/${TABLE}/flow/${FLOW} Should Be Equal As Strings ${resp.status_code} 200 Verify after deleting flow config - Output to physical port# [Documentation] Verify the flow [Tags] Get - ${resp} Get session ${REST_CON}/node/openflow:1/table/${TABLE} + ${resp} RequestsLibrary.Get session ${REST_CON}/node/openflow:1/table/${TABLE} Should Not Contain ${resp.content} ${FLOW} Verify flows after deleting flow config on OVS diff --git a/test/csit/suites/openflowplugin/Flows_Stats_OF13/010__SM_add_upd_del_flows.robot b/test/csit/suites/openflowplugin/Flows_Stats_OF13/010__SM_add_upd_del_flows.robot index 0f2096ee..8ce8cb33 100644 --- a/test/csit/suites/openflowplugin/Flows_Stats_OF13/010__SM_add_upd_del_flows.robot +++ b/test/csit/suites/openflowplugin/Flows_Stats_OF13/010__SM_add_upd_del_flows.robot @@ -7,7 +7,7 @@ Library Collections Library XML Library ../../../libraries/XmlComparator.py Variables ../../../variables/Variables.py -Library ../../../libraries/RequestsLibrary.py +Library RequestsLibrary Library ../../../libraries/Common.py *** Variables *** @@ -269,12 +269,12 @@ Flow Presence Operational Table Add Flow Log ${data} - ${resp}= Putxml session /restconf/config/opendaylight-inventory:nodes/node/openflow:${switch_idx}/table/${table_id}/flow/${flow_id} data=${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} ${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}= Delete session /restconf/config/opendaylight-inventory:nodes/node/openflow:${switch_idx}/table/${table_id}/flow/${flow_id} + ${resp}= RequestsLibrary.Delete 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/test/csit/suites/openflowplugin/Groups_Meters_OF13/005__openflow_group.robot b/test/csit/suites/openflowplugin/Groups_Meters_OF13/005__openflow_group.robot index 8e390ff2..4798b89e 100644 --- a/test/csit/suites/openflowplugin/Groups_Meters_OF13/005__openflow_group.robot +++ b/test/csit/suites/openflowplugin/Groups_Meters_OF13/005__openflow_group.robot @@ -5,7 +5,7 @@ Suite Teardown Delete All Sessions Library SSHLibrary Library Collections Library OperatingSystem -Library ../../../libraries/RequestsLibrary.py +Library RequestsLibrary Library ../../../libraries/Common.py Variables ../../../variables/Variables.py Resource ../../../libraries/Utils.robot @@ -30,7 +30,7 @@ Add a group [Tags] Push ${body} OperatingSystem.Get File ${GROUP} Set Suite Variable ${body} - ${resp} Putxml session ${REST_CONTEXT_CF}/group/1 data=${body} + ${resp} RequestsLibrary.Put session ${REST_CONTEXT_CF}/group/1 headers=${HEADERS_XML} data=${body} Log ${resp.content} Should Be Equal As Strings ${resp.status_code} 200 @@ -51,7 +51,7 @@ Add a flow that includes a group [Tags] Push ${body} OperatingSystem.Get File ${FLOW} Set Suite Variable ${body} - ${resp} Putxml session ${REST_CONTEXT_CF}/table/0/flow/1 data=${body} + ${resp} RequestsLibrary.Put 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 diff --git a/test/csit/suites/openflowplugin/Groups_Meters_OF13/010__openflow_meter.robot b/test/csit/suites/openflowplugin/Groups_Meters_OF13/010__openflow_meter.robot index 46f33be2..f7d00c75 100644 --- a/test/csit/suites/openflowplugin/Groups_Meters_OF13/010__openflow_meter.robot +++ b/test/csit/suites/openflowplugin/Groups_Meters_OF13/010__openflow_meter.robot @@ -5,7 +5,7 @@ Suite Teardown Delete All Sessions Library SSHLibrary Library Collections Library OperatingSystem -Library ../../../libraries/RequestsLibrary.py +Library RequestsLibrary Library ../../../libraries/Common.py Variables ../../../variables/Variables.py Resource ../../../libraries/Utils.robot @@ -30,7 +30,7 @@ Add a meter [Tags] Push ${body} OperatingSystem.Get File ${METER} Set Suite Variable ${body} - ${resp} Putxml session ${REST_CONTEXT_CF}/meter/1 data=${body} + ${resp} RequestsLibrary.Put session ${REST_CONTEXT_CF}/meter/1 headers=${HEADERS_XML} data=${body} Log ${resp.content} Should Be Equal As Strings ${resp.status_code} 200 @@ -51,7 +51,7 @@ Add a flow that includes a meter [Tags] Push ${body} OperatingSystem.Get File ${FLOW} Set Suite Variable ${body} - ${resp} Putxml session ${REST_CONTEXT_CF}/table/0/flow/2 data=${body} + ${resp} RequestsLibrary.Put 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 diff --git a/test/csit/suites/openflowplugin/Inventory_Scalability_OF10/010__restconf_inventory.robot b/test/csit/suites/openflowplugin/Inventory_Scalability_OF10/010__restconf_inventory.robot index 797334a4..85a205ab 100644 --- a/test/csit/suites/openflowplugin/Inventory_Scalability_OF10/010__restconf_inventory.robot +++ b/test/csit/suites/openflowplugin/Inventory_Scalability_OF10/010__restconf_inventory.robot @@ -3,7 +3,7 @@ Documentation Test suite for RESTCONF inventory Suite Setup Create Session session http://${CONTROLLER}:${RESTCONFPORT} auth=${AUTH} headers=${HEADERS_XML} Suite Teardown Delete All Sessions Library Collections -Library ../../../libraries/RequestsLibrary.py +Library RequestsLibrary Library ../../../libraries/Common.py Variables ../../../variables/Variables.py diff --git a/test/csit/suites/openflowplugin/Inventory_Scalability_OF10/020__restconf_topology.robot b/test/csit/suites/openflowplugin/Inventory_Scalability_OF10/020__restconf_topology.robot index 8ad05ed7..5d8c9b20 100644 --- a/test/csit/suites/openflowplugin/Inventory_Scalability_OF10/020__restconf_topology.robot +++ b/test/csit/suites/openflowplugin/Inventory_Scalability_OF10/020__restconf_topology.robot @@ -4,7 +4,7 @@ Suite Setup Create Session session http://${CONTROLLER}:${RESTCONFPO Suite Teardown Delete All Sessions Library Collections Library XML -Library ../../../libraries/RequestsLibrary.py +Library RequestsLibrary Library ../../../libraries/Common.py Variables ../../../variables/Variables.py diff --git a/test/csit/suites/openflowplugin/Inventory_Scalability_OF10/040__statistics_manager.robot b/test/csit/suites/openflowplugin/Inventory_Scalability_OF10/040__statistics_manager.robot index 46834a5f..083408ff 100644 --- a/test/csit/suites/openflowplugin/Inventory_Scalability_OF10/040__statistics_manager.robot +++ b/test/csit/suites/openflowplugin/Inventory_Scalability_OF10/040__statistics_manager.robot @@ -3,7 +3,7 @@ Documentation Test suite for Statistics Manager Suite Setup Create Session session http://${CONTROLLER}:${RESTPORT} auth=${AUTH} headers=${HEADERS} Suite Teardown Delete All Sessions Library Collections -Library ../../../libraries/RequestsLibrary.py +Library RequestsLibrary Library ../../../libraries/Common.py Library ../../../libraries/Topologynew.py Variables ../../../variables/Variables.py diff --git a/test/csit/suites/openflowplugin/Inventory_Scalability_OF10/050__topology_manager.robot b/test/csit/suites/openflowplugin/Inventory_Scalability_OF10/050__topology_manager.robot index ac9b1ebd..f5093cb3 100644 --- a/test/csit/suites/openflowplugin/Inventory_Scalability_OF10/050__topology_manager.robot +++ b/test/csit/suites/openflowplugin/Inventory_Scalability_OF10/050__topology_manager.robot @@ -3,7 +3,7 @@ Documentation Test suite for Topology Manager Suite Setup Create Session session http://${CONTROLLER}:${RESTPORT} auth=${AUTH} headers=${HEADERS} Suite Teardown Delete All Sessions Library Collections -Library ../../../libraries/RequestsLibrary.py +Library RequestsLibrary Library ../../../libraries/Common.py Library ../../../libraries/Topologynew.py Variables ../../../variables/Variables.py diff --git a/test/csit/suites/openflowplugin/Inventory_Scalability_OF13/010__restconf_inventory.robot b/test/csit/suites/openflowplugin/Inventory_Scalability_OF13/010__restconf_inventory.robot index 797334a4..85a205ab 100644 --- a/test/csit/suites/openflowplugin/Inventory_Scalability_OF13/010__restconf_inventory.robot +++ b/test/csit/suites/openflowplugin/Inventory_Scalability_OF13/010__restconf_inventory.robot @@ -3,7 +3,7 @@ Documentation Test suite for RESTCONF inventory Suite Setup Create Session session http://${CONTROLLER}:${RESTCONFPORT} auth=${AUTH} headers=${HEADERS_XML} Suite Teardown Delete All Sessions Library Collections -Library ../../../libraries/RequestsLibrary.py +Library RequestsLibrary Library ../../../libraries/Common.py Variables ../../../variables/Variables.py diff --git a/test/csit/suites/openflowplugin/Inventory_Scalability_OF13/020__restconf_topology.robot b/test/csit/suites/openflowplugin/Inventory_Scalability_OF13/020__restconf_topology.robot index 8ad05ed7..5d8c9b20 100644 --- a/test/csit/suites/openflowplugin/Inventory_Scalability_OF13/020__restconf_topology.robot +++ b/test/csit/suites/openflowplugin/Inventory_Scalability_OF13/020__restconf_topology.robot @@ -4,7 +4,7 @@ Suite Setup Create Session session http://${CONTROLLER}:${RESTCONFPO Suite Teardown Delete All Sessions Library Collections Library XML -Library ../../../libraries/RequestsLibrary.py +Library RequestsLibrary Library ../../../libraries/Common.py Variables ../../../variables/Variables.py diff --git a/test/csit/suites/openflowplugin/Inventory_Scalability_OF13/040__statistics_manager.robot b/test/csit/suites/openflowplugin/Inventory_Scalability_OF13/040__statistics_manager.robot index 46834a5f..083408ff 100644 --- a/test/csit/suites/openflowplugin/Inventory_Scalability_OF13/040__statistics_manager.robot +++ b/test/csit/suites/openflowplugin/Inventory_Scalability_OF13/040__statistics_manager.robot @@ -3,7 +3,7 @@ Documentation Test suite for Statistics Manager Suite Setup Create Session session http://${CONTROLLER}:${RESTPORT} auth=${AUTH} headers=${HEADERS} Suite Teardown Delete All Sessions Library Collections -Library ../../../libraries/RequestsLibrary.py +Library RequestsLibrary Library ../../../libraries/Common.py Library ../../../libraries/Topologynew.py Variables ../../../variables/Variables.py diff --git a/test/csit/suites/openflowplugin/Inventory_Scalability_OF13/050__topology_manager.robot b/test/csit/suites/openflowplugin/Inventory_Scalability_OF13/050__topology_manager.robot index ac9b1ebd..f5093cb3 100644 --- a/test/csit/suites/openflowplugin/Inventory_Scalability_OF13/050__topology_manager.robot +++ b/test/csit/suites/openflowplugin/Inventory_Scalability_OF13/050__topology_manager.robot @@ -3,7 +3,7 @@ Documentation Test suite for Topology Manager Suite Setup Create Session session http://${CONTROLLER}:${RESTPORT} auth=${AUTH} headers=${HEADERS} Suite Teardown Delete All Sessions Library Collections -Library ../../../libraries/RequestsLibrary.py +Library RequestsLibrary Library ../../../libraries/Common.py Library ../../../libraries/Topologynew.py Variables ../../../variables/Variables.py diff --git a/test/csit/suites/openflowplugin/MD_SAL_NSF_OF10/010__restconf_inventory.robot b/test/csit/suites/openflowplugin/MD_SAL_NSF_OF10/010__restconf_inventory.robot index 790932d0..dd557013 100644 --- a/test/csit/suites/openflowplugin/MD_SAL_NSF_OF10/010__restconf_inventory.robot +++ b/test/csit/suites/openflowplugin/MD_SAL_NSF_OF10/010__restconf_inventory.robot @@ -3,7 +3,7 @@ Documentation Test suite for RESTCONF inventory Suite Setup Create Session session http://${CONTROLLER}:${RESTCONFPORT} auth=${AUTH} headers=${HEADERS_XML} Suite Teardown Delete All Sessions Library Collections -Library ../../../libraries/RequestsLibrary.py +Library RequestsLibrary Library ../../../libraries/Common.py Variables ../../../variables/Variables.py Resource ../../../libraries/Utils.robot diff --git a/test/csit/suites/openflowplugin/MD_SAL_NSF_OF10/020__restconf_topology.robot b/test/csit/suites/openflowplugin/MD_SAL_NSF_OF10/020__restconf_topology.robot index c13f09a2..f765f3c6 100644 --- a/test/csit/suites/openflowplugin/MD_SAL_NSF_OF10/020__restconf_topology.robot +++ b/test/csit/suites/openflowplugin/MD_SAL_NSF_OF10/020__restconf_topology.robot @@ -3,7 +3,7 @@ Documentation Test suite for RESTCONF Topology Suite Setup Create Session session http://${CONTROLLER}:${RESTCONFPORT} auth=${AUTH} headers=${HEADERS} Suite Teardown Delete All Sessions Library Collections -Library ../../../libraries/RequestsLibrary.py +Library RequestsLibrary Library ../../../libraries/Common.py Variables ../../../variables/Variables.py Resource ../../../libraries/Utils.robot diff --git a/test/csit/suites/openflowplugin/MD_SAL_NSF_OF10/030__restconf_statistics.robot b/test/csit/suites/openflowplugin/MD_SAL_NSF_OF10/030__restconf_statistics.robot index f529dfaa..7ba14932 100644 --- a/test/csit/suites/openflowplugin/MD_SAL_NSF_OF10/030__restconf_statistics.robot +++ b/test/csit/suites/openflowplugin/MD_SAL_NSF_OF10/030__restconf_statistics.robot @@ -3,7 +3,7 @@ Documentation Test suite for RESTCONF statistics Suite Setup Create Session session http://${CONTROLLER}:${RESTCONFPORT} auth=${AUTH} headers=${HEADERS_XML} Suite Teardown Delete All Sessions Library Collections -Library ../../../libraries/RequestsLibrary.py +Library RequestsLibrary Library ../../../libraries/Common.py Variables ../../../variables/Variables.py Resource ../../../libraries/Utils.robot diff --git a/test/csit/suites/openflowplugin/MD_SAL_NSF_OF10/040__restconf_frm.robot b/test/csit/suites/openflowplugin/MD_SAL_NSF_OF10/040__restconf_frm.robot index d9bfff77..3f8a7ab2 100644 --- a/test/csit/suites/openflowplugin/MD_SAL_NSF_OF10/040__restconf_frm.robot +++ b/test/csit/suites/openflowplugin/MD_SAL_NSF_OF10/040__restconf_frm.robot @@ -3,7 +3,7 @@ Documentation Test suite for RESTCONF FRM Suite Setup Create Session session http://${CONTROLLER}:${RESTCONFPORT} auth=${AUTH} headers=${HEADERS_XML} Suite Teardown Delete All Sessions Library Collections -Library ../../../libraries/RequestsLibrary.py +Library RequestsLibrary Library ../../../libraries/Common.py Variables ../../../variables/Variables.py Resource ../../../libraries/Utils.robot @@ -15,7 +15,7 @@ ${BODY2} 22