From: Deepak Date: Thu, 28 Jan 2016 22:59:32 +0000 (+0530) Subject: Replace deprecated variables in suites/openflowplugin (1). X-Git-Tag: release/beryllium-sr1~160 X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?p=integration%2Ftest.git;a=commitdiff_plain;h=e6f155d7494588cede1382d4c075b2b0658a9a2f Replace deprecated variables in suites/openflowplugin (1). + CONTROLLER -> ODL_SYSTEM_IP + CONTROLLER1 -> ODL_SYSTEM_2_IP + CONTROLLER2 -> ODL_SYSTEM_3_IP Change-Id: I93689ae884be29fb37173ddc90fea45f40171a34 Signed-off-by: Deepak --- 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 23d86cbc64..a5bf5162fe 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 @@ -1,6 +1,6 @@ *** Settings *** Documentation Test suite for Switch Manager -Suite Setup Create Session ${ODL_CONTROLLER_SESSION} http://${CONTROLLER}:${RESTPORT} auth=${AUTH} headers=${HEADERS} +Suite Setup Create Session ${ODL_CONTROLLER_SESSION} http://${ODL_SYSTEM_IP}:${RESTPORT} auth=${AUTH} headers=${HEADERS} Suite Teardown Delete All Sessions Library Collections Library RequestsLibrary 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 3fb8747dc6..2f2ed81956 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 @@ -1,6 +1,6 @@ *** Settings *** Documentation Test suite for Topology Manager -Suite Setup Create Session session http://${CONTROLLER}:${RESTPORT} auth=${AUTH} headers=${HEADERS} +Suite Setup Create Session session http://${ODL_SYSTEM_IP}:${RESTPORT} auth=${AUTH} headers=${HEADERS} Suite Teardown Delete All Sessions Library Collections Library RequestsLibrary diff --git a/csit/suites/openflowplugin/AD_SAL_NSF_OF10/030__statistics_manager.robot b/csit/suites/openflowplugin/AD_SAL_NSF_OF10/030__statistics_manager.robot index b7a14fc270..4f0b1567dc 100644 --- a/csit/suites/openflowplugin/AD_SAL_NSF_OF10/030__statistics_manager.robot +++ b/csit/suites/openflowplugin/AD_SAL_NSF_OF10/030__statistics_manager.robot @@ -1,6 +1,6 @@ *** Settings *** Documentation Test suite for Statistics Manager -Suite Setup Create Session session http://${CONTROLLER}:${RESTPORT} auth=${AUTH} headers=${HEADERS} +Suite Setup Create Session session http://${ODL_SYSTEM_IP}:${RESTPORT} auth=${AUTH} headers=${HEADERS} Suite Teardown Delete All Sessions Library Collections Library RequestsLibrary 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 9d0bc242f1..44826dbd1f 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 @@ -1,6 +1,6 @@ *** Settings *** Documentation Test suite for Flow Programmer -Suite Setup Create Session session http://${CONTROLLER}:${RESTPORT} auth=${AUTH} headers=${HEADERS} +Suite Setup Create Session session http://${ODL_SYSTEM_IP}:${RESTPORT} auth=${AUTH} headers=${HEADERS} Suite Teardown Delete All Sessions Library Collections Library RequestsLibrary diff --git a/csit/suites/openflowplugin/AD_SAL_NSF_OF10/__init__.robot b/csit/suites/openflowplugin/AD_SAL_NSF_OF10/__init__.robot index 5ca22a0f23..ea076a814b 100644 --- a/csit/suites/openflowplugin/AD_SAL_NSF_OF10/__init__.robot +++ b/csit/suites/openflowplugin/AD_SAL_NSF_OF10/__init__.robot @@ -6,6 +6,6 @@ Library SSHLibrary Resource ../../../libraries/Utils.robot *** Variables *** -${start} sudo mn --controller=remote,ip=${CONTROLLER} --topo tree,2 +${start} sudo mn --controller=remote,ip=${ODL_SYSTEM_IP} --topo tree,2 *** Keywords *** 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 23d86cbc64..a5bf5162fe 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 @@ -1,6 +1,6 @@ *** Settings *** Documentation Test suite for Switch Manager -Suite Setup Create Session ${ODL_CONTROLLER_SESSION} http://${CONTROLLER}:${RESTPORT} auth=${AUTH} headers=${HEADERS} +Suite Setup Create Session ${ODL_CONTROLLER_SESSION} http://${ODL_SYSTEM_IP}:${RESTPORT} auth=${AUTH} headers=${HEADERS} Suite Teardown Delete All Sessions Library Collections Library RequestsLibrary 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 3fb8747dc6..2f2ed81956 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 @@ -1,6 +1,6 @@ *** Settings *** Documentation Test suite for Topology Manager -Suite Setup Create Session session http://${CONTROLLER}:${RESTPORT} auth=${AUTH} headers=${HEADERS} +Suite Setup Create Session session http://${ODL_SYSTEM_IP}:${RESTPORT} auth=${AUTH} headers=${HEADERS} Suite Teardown Delete All Sessions Library Collections Library RequestsLibrary diff --git a/csit/suites/openflowplugin/AD_SAL_NSF_OF13/030__statistics_manager.robot b/csit/suites/openflowplugin/AD_SAL_NSF_OF13/030__statistics_manager.robot index b7a14fc270..4f0b1567dc 100644 --- a/csit/suites/openflowplugin/AD_SAL_NSF_OF13/030__statistics_manager.robot +++ b/csit/suites/openflowplugin/AD_SAL_NSF_OF13/030__statistics_manager.robot @@ -1,6 +1,6 @@ *** Settings *** Documentation Test suite for Statistics Manager -Suite Setup Create Session session http://${CONTROLLER}:${RESTPORT} auth=${AUTH} headers=${HEADERS} +Suite Setup Create Session session http://${ODL_SYSTEM_IP}:${RESTPORT} auth=${AUTH} headers=${HEADERS} Suite Teardown Delete All Sessions Library Collections Library RequestsLibrary 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 9d0bc242f1..44826dbd1f 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 @@ -1,6 +1,6 @@ *** Settings *** Documentation Test suite for Flow Programmer -Suite Setup Create Session session http://${CONTROLLER}:${RESTPORT} auth=${AUTH} headers=${HEADERS} +Suite Setup Create Session session http://${ODL_SYSTEM_IP}:${RESTPORT} auth=${AUTH} headers=${HEADERS} Suite Teardown Delete All Sessions Library Collections Library RequestsLibrary diff --git a/csit/suites/openflowplugin/AD_SAL_NSF_OF13/__init__.robot b/csit/suites/openflowplugin/AD_SAL_NSF_OF13/__init__.robot index f912197597..9ec60fc5ff 100644 --- a/csit/suites/openflowplugin/AD_SAL_NSF_OF13/__init__.robot +++ b/csit/suites/openflowplugin/AD_SAL_NSF_OF13/__init__.robot @@ -6,6 +6,6 @@ Library SSHLibrary Resource ../../../libraries/Utils.robot *** Variables *** -${start} sudo mn --controller=remote,ip=${CONTROLLER} --topo tree,2 --switch ovsk,protocols=OpenFlow13 +${start} sudo mn --controller=remote,ip=${ODL_SYSTEM_IP} --topo tree,2 --switch ovsk,protocols=OpenFlow13 *** Keywords *** diff --git a/csit/suites/openflowplugin/Bug_Validation/2429.robot b/csit/suites/openflowplugin/Bug_Validation/2429.robot index 52f0c91b2b..4fc89666cb 100644 --- a/csit/suites/openflowplugin/Bug_Validation/2429.robot +++ b/csit/suites/openflowplugin/Bug_Validation/2429.robot @@ -24,14 +24,14 @@ Bug_2429 ... a larger number of failed connections will be used and a small margin of error will ... determine if the test is a PASS or FAIL Log Environment Details - ${controller_pid}= Get Process ID Based On Regex On Remote System ${CONTROLLER} java.*distribution.*karaf ${CONTROLLER_USER} + ${controller_pid}= Get Process ID Based On Regex On Remote System ${ODL_SYSTEM_IP} java.*distribution.*karaf ${CONTROLLER_USER} Should Match Regexp ${controller_pid} [0-9]+ PID was not discovered - ${starting_thread_count}= Get Process Thread Count On Remote System ${CONTROLLER} ${controller_pid} ${CONTROLLER_USER} - Repeat Keyword ${number_ofconnections_to_fail} Start Process nc -w 1 ${CONTROLLER} + ${starting_thread_count}= Get Process Thread Count On Remote System ${ODL_SYSTEM_IP} ${controller_pid} ${CONTROLLER_USER} + Repeat Keyword ${number_ofconnections_to_fail} Start Process nc -w 1 ${ODL_SYSTEM_IP} ... ${openflow_port} Run pkill -f 'nc -w' Log Environment Details - ${ending_thread_count}= Get Process Thread Count On Remote System ${CONTROLLER} ${controller_pid} ${CONTROLLER_USER} + ${ending_thread_count}= Get Process Thread Count On Remote System ${ODL_SYSTEM_IP} ${controller_pid} ${CONTROLLER_USER} Log Environment Details Log starting count: ${starting_thread_count}\nending count: ${ending_thread_count} ${acceptable_thread_count}= Evaluate ${starting_thread_count} + (${number_of_connections_to_fail} * ${margin_of_error}) @@ -42,7 +42,7 @@ Bug_2429 Log Environment Details [Documentation] Will display relevant details of the test environement to help aid debugging efforts if ... needed in the future. - ${output}= Get Process ID Based On Regex On Remote System ${CONTROLLER} java.*distribution.*karaf ${CONTROLLER_USER} + ${output}= Get Process ID Based On Regex On Remote System ${ODL_SYSTEM_IP} java.*distribution.*karaf ${CONTROLLER_USER} Log ${output} - ${output}= Run Command On Remote System ${CONTROLLER} netstat -na | grep 6633 ${CONTROLLER_USER} + ${output}= Run Command On Remote System ${ODL_SYSTEM_IP} netstat -na | grep 6633 ${CONTROLLER_USER} Log ${output} 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 dbb1ff27e0..232b230391 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 @@ -29,7 +29,7 @@ Sending Echo Initialization Phase [Documentation] Starts mininet and verify if topology is in operational ds Start Suite - Create Session session http://${CONTROLLER}:${RESTCONFPORT} auth=${AUTH} headers=${HEADERS_XML} + Create Session session http://${ODL_SYSTEM_IP}:${RESTCONFPORT} auth=${AUTH} headers=${HEADERS_XML} Wait Until Keyword Succeeds 10s 1s Are Switches Connected Topo Final Phase 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 b2ac64fc71..e433485caf 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 @@ -10,7 +10,7 @@ Variables ../../../variables/ofplugin/RpcVariables.py *** Variables *** ${send_update_table_url} /restconf/operations/sal-table:update-table -${start} sudo mn --controller=remote,ip=${CONTROLLER} --topo tree,1 --switch user +${start} sudo mn --controller=remote,ip=${ODL_SYSTEM_IP} --topo tree,1 --switch user *** Test Cases *** Sending Update Table @@ -23,7 +23,7 @@ Sending Update Table Initialization Phase [Documentation] Starts mininet and verify if topology is in operational ds Start Suite - Create Session session http://${CONTROLLER}:${RESTCONFPORT} auth=${AUTH} headers=${HEADERS_XML} + Create Session session http://${ODL_SYSTEM_IP}:${RESTCONFPORT} auth=${AUTH} headers=${HEADERS_XML} Wait Until Keyword Succeeds 10s 1s Are Switches Connected Topo Final Phase 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 a9a568e0b2..405314740b 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 @@ -43,7 +43,7 @@ Log Switch Flows Initialization Phase [Documentation] Starts mininet and verify if topology is in operational ds Start Suite - Create Session session http://${CONTROLLER}:${RESTCONFPORT} auth=${AUTH} headers=${HEADERS_XML} + Create Session session http://${ODL_SYSTEM_IP}:${RESTCONFPORT} auth=${AUTH} headers=${HEADERS_XML} Wait Until Keyword Succeeds 10s 1s Are Switches Connected Topo Final Phase diff --git a/csit/suites/openflowplugin/Flows_Additional_TCs/Stat_Manager_extended/010_SM_add_upd_del_flows.robot b/csit/suites/openflowplugin/Flows_Additional_TCs/Stat_Manager_extended/010_SM_add_upd_del_flows.robot index cddc28be45..2231af4f2a 100644 --- a/csit/suites/openflowplugin/Flows_Additional_TCs/Stat_Manager_extended/010_SM_add_upd_del_flows.robot +++ b/csit/suites/openflowplugin/Flows_Additional_TCs/Stat_Manager_extended/010_SM_add_upd_del_flows.robot @@ -555,6 +555,6 @@ Test Is Flow 220 Deleted *** Keywords *** Initialization Phase [Documentation] Initiate tcp connection with controller - Create Session session http://${CONTROLLER}:${RESTCONFPORT} auth=${AUTH} headers=${HEADERS_XML} + Create Session session http://${ODL_SYSTEM_IP}:${RESTCONFPORT} auth=${AUTH} headers=${HEADERS_XML} Write dpctl dump-flows -O OpenFlow13 Read Until mininet> diff --git a/csit/suites/openflowplugin/Flows_Additional_TCs/Stat_Manager_extended/020_SM_sal_add_upd_del_flows.robot b/csit/suites/openflowplugin/Flows_Additional_TCs/Stat_Manager_extended/020_SM_sal_add_upd_del_flows.robot index 94c4eadf07..5b3fedc14c 100644 --- a/csit/suites/openflowplugin/Flows_Additional_TCs/Stat_Manager_extended/020_SM_sal_add_upd_del_flows.robot +++ b/csit/suites/openflowplugin/Flows_Additional_TCs/Stat_Manager_extended/020_SM_sal_add_upd_del_flows.robot @@ -546,6 +546,6 @@ Test Is Flow 220 Deleted *** Keywords *** Initialization Phase [Documentation] Initiate tcp connection with controller - Create Session session http://${CONTROLLER}:${RESTCONFPORT} auth=${AUTH} headers=${HEADERS_XML} + Create Session session http://${ODL_SYSTEM_IP}:${RESTCONFPORT} auth=${AUTH} headers=${HEADERS_XML} Write dpctl dump-flows -O OpenFlow13 Read Until mininet> diff --git a/csit/suites/openflowplugin/Flows_Additional_TCs/Stat_Manager_extended/__init__.robot b/csit/suites/openflowplugin/Flows_Additional_TCs/Stat_Manager_extended/__init__.robot index d85087adba..6e1e576129 100644 --- a/csit/suites/openflowplugin/Flows_Additional_TCs/Stat_Manager_extended/__init__.robot +++ b/csit/suites/openflowplugin/Flows_Additional_TCs/Stat_Manager_extended/__init__.robot @@ -6,4 +6,4 @@ Library SSHLibrary Resource ../../../../libraries/Utils.robot *** Variables *** -${start} sudo mn --controller=remote,ip=${CONTROLLER} --topo tree,1 --switch ovsk,protocols=OpenFlow13 +${start} sudo mn --controller=remote,ip=${ODL_SYSTEM_IP} --topo tree,1 --switch ovsk,protocols=OpenFlow13 diff --git a/csit/suites/openflowplugin/Flows_OF13/300__dst_ip.robot b/csit/suites/openflowplugin/Flows_OF13/300__dst_ip.robot index 2a0347e5ec..7bab1e98b1 100644 --- a/csit/suites/openflowplugin/Flows_OF13/300__dst_ip.robot +++ b/csit/suites/openflowplugin/Flows_OF13/300__dst_ip.robot @@ -1,6 +1,6 @@ *** Settings *** Documentation Test suite for pushing/verify/remove a flow through RESTCONF -Suite Setup Create Session session http://${CONTROLLER}:${RESTCONFPORT} auth=${AUTH} headers=${HEADERS_XML} +Suite Setup Create Session session http://${ODL_SYSTEM_IP}:${RESTCONFPORT} auth=${AUTH} headers=${HEADERS_XML} Suite Teardown Delete All Sessions Library SSHLibrary Library Collections diff --git a/csit/suites/openflowplugin/Flows_OF13/301__src_ip.robot b/csit/suites/openflowplugin/Flows_OF13/301__src_ip.robot index c8f16900ec..d6b3c099fe 100644 --- a/csit/suites/openflowplugin/Flows_OF13/301__src_ip.robot +++ b/csit/suites/openflowplugin/Flows_OF13/301__src_ip.robot @@ -1,6 +1,6 @@ *** Settings *** Documentation Test suite for pushing/verify/remove a flow through RESTCONF -Suite Setup Create Session session http://${CONTROLLER}:${RESTCONFPORT} auth=${AUTH} headers=${HEADERS_XML} +Suite Setup Create Session session http://${ODL_SYSTEM_IP}:${RESTCONFPORT} auth=${AUTH} headers=${HEADERS_XML} Suite Teardown Delete All Sessions Library SSHLibrary Library Collections diff --git a/csit/suites/openflowplugin/Flows_OF13/302__dst_mac.robot b/csit/suites/openflowplugin/Flows_OF13/302__dst_mac.robot index f4906c4038..e435c97b20 100644 --- a/csit/suites/openflowplugin/Flows_OF13/302__dst_mac.robot +++ b/csit/suites/openflowplugin/Flows_OF13/302__dst_mac.robot @@ -1,6 +1,6 @@ *** Settings *** Documentation Test suite for pushing/verify/remove a flow through RESTCONF -Suite Setup Create Session session http://${CONTROLLER}:${RESTCONFPORT} auth=${AUTH} headers=${HEADERS_XML} +Suite Setup Create Session session http://${ODL_SYSTEM_IP}:${RESTCONFPORT} auth=${AUTH} headers=${HEADERS_XML} Suite Teardown Delete All Sessions Library SSHLibrary Library Collections 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 ea6e39cf0c..02e75a544d 100644 --- a/csit/suites/openflowplugin/Flows_OF13/304__eth_ip_port.robot +++ b/csit/suites/openflowplugin/Flows_OF13/304__eth_ip_port.robot @@ -1,6 +1,6 @@ *** Settings *** Documentation Test suite for IP,Ethernet and port -Suite Setup Create Session session http://${CONTROLLER}:${RESTCONFPORT} auth=${AUTH} headers=${HEADERS_XML} +Suite Setup Create Session session http://${ODL_SYSTEM_IP}:${RESTCONFPORT} auth=${AUTH} headers=${HEADERS_XML} Suite Teardown Delete All Sessions Library SSHLibrary Library Collections diff --git a/csit/suites/openflowplugin/Flows_OF13/305__ttl.robot b/csit/suites/openflowplugin/Flows_OF13/305__ttl.robot index acdd41914b..f8f6c2988c 100644 --- a/csit/suites/openflowplugin/Flows_OF13/305__ttl.robot +++ b/csit/suites/openflowplugin/Flows_OF13/305__ttl.robot @@ -8,7 +8,7 @@ Documentation OF1.3 Suite to cover TTL Actions ... - Decrement MPLS TTL ... ... NOTE: for OVS, it appears that set_ttl, and both copy in/out are not supported, so need to skip those checks for now. -Suite Setup Create Session session http://${CONTROLLER}:${RESTCONFPORT} auth=${AUTH} headers=${HEADERS_XML} +Suite Setup Create Session session http://${ODL_SYSTEM_IP}:${RESTCONFPORT} auth=${AUTH} headers=${HEADERS_XML} Suite Teardown Delete All Sessions Test Template Create And Remove Flow Library SSHLibrary 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 620b6dfbab..e8452e7c88 100644 --- a/csit/suites/openflowplugin/Flows_OF13/306__eth_ip_qos.robot +++ b/csit/suites/openflowplugin/Flows_OF13/306__eth_ip_qos.robot @@ -1,6 +1,6 @@ *** Settings *** Documentation Test suite for IP,Ethernet,DSCP and Action dec TTL -Suite Setup Create Session session http://${CONTROLLER}:${RESTCONFPORT} auth=${AUTH} headers=${HEADERS_XML} +Suite Setup Create Session session http://${ODL_SYSTEM_IP}:${RESTCONFPORT} auth=${AUTH} headers=${HEADERS_XML} Suite Teardown Delete All Sessions Library SSHLibrary Library Collections 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 a91c7c42e5..29b690bf61 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 @@ -1,6 +1,6 @@ *** Settings *** Documentation Test suite for IP,Ethernet,QoS, TCP dst/src port and Action dec MPLS TTL -Suite Setup Create Session session http://${CONTROLLER}:${RESTCONFPORT} auth=${AUTH} headers=${HEADERS_XML} +Suite Setup Create Session session http://${ODL_SYSTEM_IP}:${RESTCONFPORT} auth=${AUTH} headers=${HEADERS_XML} Suite Teardown Delete All Sessions Library SSHLibrary Library Collections 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 a9fa00f8bf..812d3e1489 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 @@ -1,6 +1,6 @@ *** Settings *** Documentation Test suite for IP,Ethernet,QoS, TCP dst/src port and Action dec MPLS TTL -Suite Setup Create Session session http://${CONTROLLER}:${RESTCONFPORT} auth=${AUTH} headers=${HEADERS_XML} +Suite Setup Create Session session http://${ODL_SYSTEM_IP}:${RESTCONFPORT} auth=${AUTH} headers=${HEADERS_XML} Suite Teardown Delete All Sessions Library SSHLibrary Library Collections 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 f2bc364be5..92b253e188 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 @@ -1,6 +1,6 @@ *** Settings *** Documentation Test suite for IP,Ethernet,QoS, SCTP dst/src port and Action dec TTL -Suite Setup Create Session session http://${CONTROLLER}:${RESTCONFPORT} auth=${AUTH} headers=${HEADERS_XML} +Suite Setup Create Session session http://${ODL_SYSTEM_IP}:${RESTCONFPORT} auth=${AUTH} headers=${HEADERS_XML} Suite Teardown Delete All Sessions Library SSHLibrary Library Collections 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 a577323c8f..d81c1f5311 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 @@ -1,6 +1,6 @@ *** Settings *** Documentation Test suite for IP,Ethernet,QoS, SCTP dst/src port and Action dec TTL -Suite Setup Create Session session http://${CONTROLLER}:${RESTCONFPORT} auth=${AUTH} headers=${HEADERS_XML} +Suite Setup Create Session session http://${ODL_SYSTEM_IP}:${RESTCONFPORT} auth=${AUTH} headers=${HEADERS_XML} Suite Teardown Delete All Sessions Library SSHLibrary Library Collections diff --git a/csit/suites/openflowplugin/Flows_OF13/311__eth_arp.robot b/csit/suites/openflowplugin/Flows_OF13/311__eth_arp.robot index f39737a230..01c5b58907 100644 --- a/csit/suites/openflowplugin/Flows_OF13/311__eth_arp.robot +++ b/csit/suites/openflowplugin/Flows_OF13/311__eth_arp.robot @@ -1,6 +1,6 @@ *** Settings *** Documentation Test suite for Ethernet,QoS, ARP and Action drop -Suite Setup Create Session session http://${CONTROLLER}:${RESTCONFPORT} auth=${AUTH} headers=${HEADERS_XML} +Suite Setup Create Session session http://${ODL_SYSTEM_IP}:${RESTCONFPORT} auth=${AUTH} headers=${HEADERS_XML} Suite Teardown Delete All Sessions Library SSHLibrary Library Collections 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 f0fc4fd9c6..22d1c35292 100644 --- a/csit/suites/openflowplugin/Flows_OF13/312__eth_arp_transport.robot +++ b/csit/suites/openflowplugin/Flows_OF13/312__eth_arp_transport.robot @@ -1,6 +1,6 @@ *** Settings *** Documentation Test suite for Ethernet,QoS, ARP and Action drop -Suite Setup Create Session session http://${CONTROLLER}:${RESTCONFPORT} auth=${AUTH} headers=${HEADERS_XML} +Suite Setup Create Session session http://${ODL_SYSTEM_IP}:${RESTCONFPORT} auth=${AUTH} headers=${HEADERS_XML} Suite Teardown Delete All Sessions Library SSHLibrary Library Collections 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 335c048f1f..3d7f732e73 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 @@ -1,6 +1,6 @@ *** Settings *** Documentation Test suite for Ethernet,QoS, ARP and Action drop -Suite Setup Create Session session http://${CONTROLLER}:${RESTCONFPORT} auth=${AUTH} headers=${HEADERS_XML} +Suite Setup Create Session session http://${ODL_SYSTEM_IP}:${RESTCONFPORT} auth=${AUTH} headers=${HEADERS_XML} Suite Teardown Delete All Sessions Library SSHLibrary Library Collections diff --git a/csit/suites/openflowplugin/Flows_OF13/314__eth_vlan.robot b/csit/suites/openflowplugin/Flows_OF13/314__eth_vlan.robot index 61755be5e6..6d27a9e55a 100644 --- a/csit/suites/openflowplugin/Flows_OF13/314__eth_vlan.robot +++ b/csit/suites/openflowplugin/Flows_OF13/314__eth_vlan.robot @@ -1,6 +1,6 @@ *** Settings *** Documentation Test suite for Ethernet,QoS, ARP and Action drop -Suite Setup Create Session session http://${CONTROLLER}:${RESTCONFPORT} auth=${AUTH} headers=${HEADERS_XML} +Suite Setup Create Session session http://${ODL_SYSTEM_IP}:${RESTCONFPORT} auth=${AUTH} headers=${HEADERS_XML} Suite Teardown Delete All Sessions Library SSHLibrary Library Collections 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 6200317beb..b99efd2d8e 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 @@ -1,6 +1,6 @@ *** Settings *** Documentation Test suite for Time our values and Vlan and PCP Vlan -Suite Setup Create Session session http://${CONTROLLER}:${RESTCONFPORT} auth=${AUTH} headers=${HEADERS_XML} +Suite Setup Create Session session http://${ODL_SYSTEM_IP}:${RESTCONFPORT} auth=${AUTH} headers=${HEADERS_XML} Suite Teardown Delete All Sessions Library SSHLibrary Library Collections 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 e0448c7acf..b5c4572b95 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 @@ -1,6 +1,6 @@ *** Settings *** Documentation Test suite for Ethernet,QoS, ARP and Action drop -Suite Setup Create Session session http://${CONTROLLER}:${RESTCONFPORT} auth=${AUTH} headers=${HEADERS_XML} +Suite Setup Create Session session http://${ODL_SYSTEM_IP}:${RESTCONFPORT} auth=${AUTH} headers=${HEADERS_XML} Suite Teardown Delete All Sessions Library SSHLibrary Library Collections diff --git a/csit/suites/openflowplugin/Flows_OF13/317__eth_ipv6.robot b/csit/suites/openflowplugin/Flows_OF13/317__eth_ipv6.robot index 57e302d5f3..d973672995 100644 --- a/csit/suites/openflowplugin/Flows_OF13/317__eth_ipv6.robot +++ b/csit/suites/openflowplugin/Flows_OF13/317__eth_ipv6.robot @@ -1,6 +1,6 @@ *** Settings *** Documentation Test suite for IPv6 -Suite Setup Create Session session http://${CONTROLLER}:${RESTCONFPORT} auth=${AUTH} headers=${HEADERS_XML} +Suite Setup Create Session session http://${ODL_SYSTEM_IP}:${RESTCONFPORT} auth=${AUTH} headers=${HEADERS_XML} Suite Teardown Delete All Sessions Library SSHLibrary Library Collections diff --git a/csit/suites/openflowplugin/Flows_OF13/318__metadata.robot b/csit/suites/openflowplugin/Flows_OF13/318__metadata.robot index 2c193d3594..2d95024aff 100644 --- a/csit/suites/openflowplugin/Flows_OF13/318__metadata.robot +++ b/csit/suites/openflowplugin/Flows_OF13/318__metadata.robot @@ -1,6 +1,6 @@ *** Settings *** Documentation Test suite for metadata -Suite Setup Create Session session http://${CONTROLLER}:${RESTCONFPORT} auth=${AUTH} headers=${HEADERS_XML} +Suite Setup Create Session session http://${ODL_SYSTEM_IP}:${RESTCONFPORT} auth=${AUTH} headers=${HEADERS_XML} Suite Teardown Delete All Sessions Library SSHLibrary Library Collections diff --git a/csit/suites/openflowplugin/Flows_OF13/319__metadata_mask.robot b/csit/suites/openflowplugin/Flows_OF13/319__metadata_mask.robot index 4af6e46b4e..6c4223eb93 100644 --- a/csit/suites/openflowplugin/Flows_OF13/319__metadata_mask.robot +++ b/csit/suites/openflowplugin/Flows_OF13/319__metadata_mask.robot @@ -1,6 +1,6 @@ *** Settings *** Documentation Test suite for metadata and mask -Suite Setup Create Session session http://${CONTROLLER}:${RESTCONFPORT} auth=${AUTH} headers=${HEADERS_XML} +Suite Setup Create Session session http://${ODL_SYSTEM_IP}:${RESTCONFPORT} auth=${AUTH} headers=${HEADERS_XML} Suite Teardown Delete All Sessions Library SSHLibrary Library Collections 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 bc0dea8efe..a35eb4cd6f 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 @@ -1,6 +1,6 @@ *** Settings *** Documentation Test suite for metadata and mask -Suite Setup Create Session session http://${CONTROLLER}:${RESTCONFPORT} auth=${AUTH} headers=${HEADERS_XML} +Suite Setup Create Session session http://${ODL_SYSTEM_IP}:${RESTCONFPORT} auth=${AUTH} headers=${HEADERS_XML} Suite Teardown Delete All Sessions Library SSHLibrary Library Collections 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 20e4505353..d4d69de0b1 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 @@ -1,6 +1,6 @@ *** Settings *** Documentation Test suite for metadata and mask -Suite Setup Create Session session http://${CONTROLLER}:${RESTCONFPORT} auth=${AUTH} headers=${HEADERS_XML} +Suite Setup Create Session session http://${ODL_SYSTEM_IP}:${RESTCONFPORT} auth=${AUTH} headers=${HEADERS_XML} Suite Teardown Delete All Sessions Library SSHLibrary Library Collections diff --git a/csit/suites/openflowplugin/Flows_OF13/322__ipv6_flow.robot b/csit/suites/openflowplugin/Flows_OF13/322__ipv6_flow.robot index 5050402084..8249383be1 100644 --- a/csit/suites/openflowplugin/Flows_OF13/322__ipv6_flow.robot +++ b/csit/suites/openflowplugin/Flows_OF13/322__ipv6_flow.robot @@ -1,6 +1,6 @@ *** Settings *** Documentation Test suite for IPv6 flow labelk -Suite Setup Create Session session http://${CONTROLLER}:${RESTCONFPORT} auth=${AUTH} headers=${HEADERS_XML} +Suite Setup Create Session session http://${ODL_SYSTEM_IP}:${RESTCONFPORT} auth=${AUTH} headers=${HEADERS_XML} Suite Teardown Delete All Sessions Library SSHLibrary Library Collections diff --git a/csit/suites/openflowplugin/Flows_OF13/323__tunnel.robot b/csit/suites/openflowplugin/Flows_OF13/323__tunnel.robot index aaa4ea23c9..4a57cd2054 100644 --- a/csit/suites/openflowplugin/Flows_OF13/323__tunnel.robot +++ b/csit/suites/openflowplugin/Flows_OF13/323__tunnel.robot @@ -1,6 +1,6 @@ *** Settings *** Documentation Test suite for Tunnel ID -Suite Setup Create Session session http://${CONTROLLER}:${RESTCONFPORT} auth=${AUTH} headers=${HEADERS_XML} +Suite Setup Create Session session http://${ODL_SYSTEM_IP}:${RESTCONFPORT} auth=${AUTH} headers=${HEADERS_XML} Suite Teardown Delete All Sessions Library SSHLibrary Library Collections 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 743635eb2b..89dee31fd7 100644 --- a/csit/suites/openflowplugin/Flows_OF13/324__ipv6_flow_label.robot +++ b/csit/suites/openflowplugin/Flows_OF13/324__ipv6_flow_label.robot @@ -1,6 +1,6 @@ *** Settings *** Documentation Test suite for IPv6 Flow label and ICMP type -Suite Setup Create Session session http://${CONTROLLER}:${RESTCONFPORT} auth=${AUTH} headers=${HEADERS_XML} +Suite Setup Create Session session http://${ODL_SYSTEM_IP}:${RESTCONFPORT} auth=${AUTH} headers=${HEADERS_XML} Suite Teardown Delete All Sessions Library SSHLibrary Library Collections 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 5ef483eae2..ea715903e1 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 @@ -287,7 +287,7 @@ Delete All Flows Initialization Phase [Documentation] Initiate tcp connection with controller - Create Session session http://${CONTROLLER}:${RESTCONFPORT} auth=${AUTH} headers=${HEADERS_XML} + Create Session session http://${ODL_SYSTEM_IP}:${RESTCONFPORT} auth=${AUTH} headers=${HEADERS_XML} Teardown Phase [Documentation] Closes tcp connection with controller and removes flows 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 b274e8d0c3..afe4f7fd25 100644 --- a/csit/suites/openflowplugin/Groups_Meters_OF13/005__openflow_group.robot +++ b/csit/suites/openflowplugin/Groups_Meters_OF13/005__openflow_group.robot @@ -1,6 +1,6 @@ *** Settings *** Documentation Test suite for OpenFlow group -Suite Setup Create Session session http://${CONTROLLER}:${RESTCONFPORT} auth=${AUTH} headers=${HEADERS_XML} +Suite Setup Create Session session http://${ODL_SYSTEM_IP}:${RESTCONFPORT} auth=${AUTH} headers=${HEADERS_XML} Suite Teardown Delete All Sessions Library SSHLibrary Library Collections 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 66fc48545c..9f3dd32386 100644 --- a/csit/suites/openflowplugin/Groups_Meters_OF13/010__openflow_meter.robot +++ b/csit/suites/openflowplugin/Groups_Meters_OF13/010__openflow_meter.robot @@ -1,6 +1,6 @@ *** Settings *** Documentation Test suite for OpenFlow meter -Suite Setup Create Session session http://${CONTROLLER}:${RESTCONFPORT} auth=${AUTH} headers=${HEADERS_XML} +Suite Setup Create Session session http://${ODL_SYSTEM_IP}:${RESTCONFPORT} auth=${AUTH} headers=${HEADERS_XML} Suite Teardown Delete All Sessions Library SSHLibrary Library Collections diff --git a/csit/suites/openflowplugin/Groups_Meters_OF13/__init__.robot b/csit/suites/openflowplugin/Groups_Meters_OF13/__init__.robot index 8405e4134e..867e24b499 100644 --- a/csit/suites/openflowplugin/Groups_Meters_OF13/__init__.robot +++ b/csit/suites/openflowplugin/Groups_Meters_OF13/__init__.robot @@ -7,6 +7,6 @@ Resource ../../../libraries/Utils.robot Variables ../../../variables/Variables.py *** Variables *** -${start} sudo mn --controller=remote,ip=${CONTROLLER} --topo tree,1 --switch user +${start} sudo mn --controller=remote,ip=${ODL_SYSTEM_IP} --topo tree,1 --switch user *** Keywords *** 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 85a205abcd..7c449abfef 100644 --- a/csit/suites/openflowplugin/Inventory_Scalability_OF10/010__restconf_inventory.robot +++ b/csit/suites/openflowplugin/Inventory_Scalability_OF10/010__restconf_inventory.robot @@ -1,6 +1,6 @@ *** Settings *** Documentation Test suite for RESTCONF inventory -Suite Setup Create Session session http://${CONTROLLER}:${RESTCONFPORT} auth=${AUTH} headers=${HEADERS_XML} +Suite Setup Create Session session http://${ODL_SYSTEM_IP}:${RESTCONFPORT} auth=${AUTH} headers=${HEADERS_XML} Suite Teardown Delete All Sessions Library Collections Library RequestsLibrary 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 5d8c9b2058..dab8c7db40 100644 --- a/csit/suites/openflowplugin/Inventory_Scalability_OF10/020__restconf_topology.robot +++ b/csit/suites/openflowplugin/Inventory_Scalability_OF10/020__restconf_topology.robot @@ -1,6 +1,6 @@ *** Settings *** Documentation Test suite for RESTCONF topology -Suite Setup Create Session session http://${CONTROLLER}:${RESTCONFPORT} auth=${AUTH} headers=${HEADERS_XML} +Suite Setup Create Session session http://${ODL_SYSTEM_IP}:${RESTCONFPORT} auth=${AUTH} headers=${HEADERS_XML} Suite Teardown Delete All Sessions Library Collections Library XML 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 f3c0ff76f2..8c18402e47 100644 --- a/csit/suites/openflowplugin/Inventory_Scalability_OF10/030__switch_manager.robot +++ b/csit/suites/openflowplugin/Inventory_Scalability_OF10/030__switch_manager.robot @@ -1,6 +1,6 @@ *** Settings *** Documentation Test suite for Switch Manager -Suite Setup Create Session ${ODL_CONTROLLER_SESSION} http://${CONTROLLER}:${RESTPORT} auth=${AUTH} headers=${HEADERS} +Suite Setup Create Session ${ODL_CONTROLLER_SESSION} http://${ODL_SYSTEM_IP}:${RESTPORT} auth=${AUTH} headers=${HEADERS} Suite Teardown Delete All Sessions Library Collections Library RequestsLibrary 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 083408ff38..315502d21f 100644 --- a/csit/suites/openflowplugin/Inventory_Scalability_OF10/040__statistics_manager.robot +++ b/csit/suites/openflowplugin/Inventory_Scalability_OF10/040__statistics_manager.robot @@ -1,6 +1,6 @@ *** Settings *** Documentation Test suite for Statistics Manager -Suite Setup Create Session session http://${CONTROLLER}:${RESTPORT} auth=${AUTH} headers=${HEADERS} +Suite Setup Create Session session http://${ODL_SYSTEM_IP}:${RESTPORT} auth=${AUTH} headers=${HEADERS} Suite Teardown Delete All Sessions Library Collections Library RequestsLibrary 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 f5093cb3ee..e5749fdaa0 100644 --- a/csit/suites/openflowplugin/Inventory_Scalability_OF10/050__topology_manager.robot +++ b/csit/suites/openflowplugin/Inventory_Scalability_OF10/050__topology_manager.robot @@ -1,6 +1,6 @@ *** Settings *** Documentation Test suite for Topology Manager -Suite Setup Create Session session http://${CONTROLLER}:${RESTPORT} auth=${AUTH} headers=${HEADERS} +Suite Setup Create Session session http://${ODL_SYSTEM_IP}:${RESTPORT} auth=${AUTH} headers=${HEADERS} Suite Teardown Delete All Sessions Library Collections Library RequestsLibrary diff --git a/csit/suites/openflowplugin/Inventory_Scalability_OF10/__init__.robot b/csit/suites/openflowplugin/Inventory_Scalability_OF10/__init__.robot index 478b7a2108..160cd556c1 100644 --- a/csit/suites/openflowplugin/Inventory_Scalability_OF10/__init__.robot +++ b/csit/suites/openflowplugin/Inventory_Scalability_OF10/__init__.robot @@ -7,7 +7,7 @@ Library ../../../libraries/Common.py Variables ../../../variables/Variables.py *** Variables *** -${start} sudo mn --controller=remote,ip=${CONTROLLER} --topo tree,${TOPO_TREE_DEPTH},${TOPO_TREE_FANOUT} +${start} sudo mn --controller=remote,ip=${ODL_SYSTEM_IP} --topo tree,${TOPO_TREE_DEPTH},${TOPO_TREE_FANOUT} *** Keywords *** Start Suite 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 85a205abcd..7c449abfef 100644 --- a/csit/suites/openflowplugin/Inventory_Scalability_OF13/010__restconf_inventory.robot +++ b/csit/suites/openflowplugin/Inventory_Scalability_OF13/010__restconf_inventory.robot @@ -1,6 +1,6 @@ *** Settings *** Documentation Test suite for RESTCONF inventory -Suite Setup Create Session session http://${CONTROLLER}:${RESTCONFPORT} auth=${AUTH} headers=${HEADERS_XML} +Suite Setup Create Session session http://${ODL_SYSTEM_IP}:${RESTCONFPORT} auth=${AUTH} headers=${HEADERS_XML} Suite Teardown Delete All Sessions Library Collections Library RequestsLibrary 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 5d8c9b2058..dab8c7db40 100644 --- a/csit/suites/openflowplugin/Inventory_Scalability_OF13/020__restconf_topology.robot +++ b/csit/suites/openflowplugin/Inventory_Scalability_OF13/020__restconf_topology.robot @@ -1,6 +1,6 @@ *** Settings *** Documentation Test suite for RESTCONF topology -Suite Setup Create Session session http://${CONTROLLER}:${RESTCONFPORT} auth=${AUTH} headers=${HEADERS_XML} +Suite Setup Create Session session http://${ODL_SYSTEM_IP}:${RESTCONFPORT} auth=${AUTH} headers=${HEADERS_XML} Suite Teardown Delete All Sessions Library Collections Library XML 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 f3c0ff76f2..8c18402e47 100644 --- a/csit/suites/openflowplugin/Inventory_Scalability_OF13/030__switch_manager.robot +++ b/csit/suites/openflowplugin/Inventory_Scalability_OF13/030__switch_manager.robot @@ -1,6 +1,6 @@ *** Settings *** Documentation Test suite for Switch Manager -Suite Setup Create Session ${ODL_CONTROLLER_SESSION} http://${CONTROLLER}:${RESTPORT} auth=${AUTH} headers=${HEADERS} +Suite Setup Create Session ${ODL_CONTROLLER_SESSION} http://${ODL_SYSTEM_IP}:${RESTPORT} auth=${AUTH} headers=${HEADERS} Suite Teardown Delete All Sessions Library Collections Library RequestsLibrary 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 083408ff38..315502d21f 100644 --- a/csit/suites/openflowplugin/Inventory_Scalability_OF13/040__statistics_manager.robot +++ b/csit/suites/openflowplugin/Inventory_Scalability_OF13/040__statistics_manager.robot @@ -1,6 +1,6 @@ *** Settings *** Documentation Test suite for Statistics Manager -Suite Setup Create Session session http://${CONTROLLER}:${RESTPORT} auth=${AUTH} headers=${HEADERS} +Suite Setup Create Session session http://${ODL_SYSTEM_IP}:${RESTPORT} auth=${AUTH} headers=${HEADERS} Suite Teardown Delete All Sessions Library Collections Library RequestsLibrary 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 f5093cb3ee..e5749fdaa0 100644 --- a/csit/suites/openflowplugin/Inventory_Scalability_OF13/050__topology_manager.robot +++ b/csit/suites/openflowplugin/Inventory_Scalability_OF13/050__topology_manager.robot @@ -1,6 +1,6 @@ *** Settings *** Documentation Test suite for Topology Manager -Suite Setup Create Session session http://${CONTROLLER}:${RESTPORT} auth=${AUTH} headers=${HEADERS} +Suite Setup Create Session session http://${ODL_SYSTEM_IP}:${RESTPORT} auth=${AUTH} headers=${HEADERS} Suite Teardown Delete All Sessions Library Collections Library RequestsLibrary diff --git a/csit/suites/openflowplugin/Inventory_Scalability_OF13/__init__.robot b/csit/suites/openflowplugin/Inventory_Scalability_OF13/__init__.robot index cefbd0c6c7..f40b6a1a9d 100644 --- a/csit/suites/openflowplugin/Inventory_Scalability_OF13/__init__.robot +++ b/csit/suites/openflowplugin/Inventory_Scalability_OF13/__init__.robot @@ -7,7 +7,7 @@ Library ../../../libraries/Common.py Variables ../../../variables/Variables.py *** Variables *** -${start} sudo mn --controller=remote,ip=${CONTROLLER} --topo tree,${TOPO_TREE_DEPTH},${TOPO_TREE_FANOUT} --switch ovsk,protocols=OpenFlow13 +${start} sudo mn --controller=remote,ip=${ODL_SYSTEM_IP} --topo tree,${TOPO_TREE_DEPTH},${TOPO_TREE_FANOUT} --switch ovsk,protocols=OpenFlow13 *** Keywords *** Start Suite diff --git a/csit/suites/openflowplugin/Longevity/010__longevity_switches.robot b/csit/suites/openflowplugin/Longevity/010__longevity_switches.robot index 2de30ddd65..b17dedde9c 100644 --- a/csit/suites/openflowplugin/Longevity/010__longevity_switches.robot +++ b/csit/suites/openflowplugin/Longevity/010__longevity_switches.robot @@ -36,8 +36,8 @@ Check If There Is A Reason To Exit Test Or If Duration Has Expired ... indicate if the requested duration of the longevity test has elapsed. The caller does not have to use ... that return value. Should Be Equal ${comparator1} ${comparator2} ${comparator_failure_message} - Verify Controller Is Not Dead ${CONTROLLER} - Verify Controller Has No Null Pointer Exceptions ${CONTROLLER} + Verify Controller Is Not Dead ${ODL_SYSTEM_IP} + Verify Controller Has No Null Pointer Exceptions ${ODL_SYSTEM_IP} ${is_expired}= Check If Test Duration Is Expired [Return] ${is_expired} @@ -53,7 +53,7 @@ Check If Test Duration Is Expired Longevity Suite Setup [Documentation] In addtion to opening the REST session to the controller, the ${end_time} that this ... test should not exceed is calculated and made in to a suite wide variable. - Create Session session http://${CONTROLLER}:${RESTCONFPORT} auth=${AUTH} headers=${HEADERS_XML} + Create Session session http://${ODL_SYSTEM_IP}:${RESTCONFPORT} auth=${AUTH} headers=${HEADERS_XML} ${start_time}= Get Current Date ${end_time}= Add Time To Date ${start_time} ${TEST_LENGTH} ${end_time}= Convert Date ${end_time} epoch diff --git a/csit/suites/openflowplugin/Longevity/020__longevity_switches_links.robot b/csit/suites/openflowplugin/Longevity/020__longevity_switches_links.robot index 63bb8a543f..2c7ee34f97 100644 --- a/csit/suites/openflowplugin/Longevity/020__longevity_switches_links.robot +++ b/csit/suites/openflowplugin/Longevity/020__longevity_switches_links.robot @@ -40,7 +40,7 @@ Check If There Is A Reason To Exit Test Or If Duration Has Expired ... indicate if the requested duration of the longevity test has elapsed. The caller does not have to use ... that return value. Should Be Equal ${comparator1} ${comparator2} ${comparator_failure_message} - Verify Controller Is Not Dead ${CONTROLLER} + Verify Controller Is Not Dead ${ODL_SYSTEM_IP} ${is_expired}= Check If Test Duration Is Expired [Return] ${is_expired} @@ -56,7 +56,7 @@ Check If Test Duration Is Expired Longevity Suite Setup [Documentation] In addtion to opening the REST session to the controller, the ${end_time} that this ... test should not exceed is calculated and made in to a suite wide variable. - Create Session session http://${CONTROLLER}:${RESTCONFPORT} auth=${AUTH} headers=${HEADERS_XML} + Create Session session http://${ODL_SYSTEM_IP}:${RESTCONFPORT} auth=${AUTH} headers=${HEADERS_XML} ${mininet_conn_id}= Open Connection ${MININET} prompt=${DEFAULT_LINUX_PROMPT} Login With Public Key ${MININET_USER} ${USER_HOME}/.ssh/${SSH_KEY} any Log Copying ${CREATE_FULLYMESH_TOPOLOGY_FILE_PATH} file to Mininet VM 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 dd557013bf..c3e1d87698 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 @@ -1,6 +1,6 @@ *** Settings *** Documentation Test suite for RESTCONF inventory -Suite Setup Create Session session http://${CONTROLLER}:${RESTCONFPORT} auth=${AUTH} headers=${HEADERS_XML} +Suite Setup Create Session session http://${ODL_SYSTEM_IP}:${RESTCONFPORT} auth=${AUTH} headers=${HEADERS_XML} Suite Teardown Delete All Sessions Library Collections Library RequestsLibrary 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 0ed6fdf3c0..3cd5b63d43 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 @@ -1,6 +1,6 @@ *** Settings *** Documentation Test suite for RESTCONF Topology -Suite Setup Create Session session http://${CONTROLLER}:${RESTCONFPORT} auth=${AUTH} headers=${HEADERS} +Suite Setup Create Session session http://${ODL_SYSTEM_IP}:${RESTCONFPORT} auth=${AUTH} headers=${HEADERS} Suite Teardown Delete All Sessions Library Collections Library RequestsLibrary diff --git a/csit/suites/openflowplugin/MD_SAL_NSF_OF10/030__restconf_statistics.robot b/csit/suites/openflowplugin/MD_SAL_NSF_OF10/030__restconf_statistics.robot index e1b22b3f7d..d64b05d55c 100644 --- a/csit/suites/openflowplugin/MD_SAL_NSF_OF10/030__restconf_statistics.robot +++ b/csit/suites/openflowplugin/MD_SAL_NSF_OF10/030__restconf_statistics.robot @@ -1,6 +1,6 @@ *** Settings *** Documentation Test suite for RESTCONF statistics -Suite Setup Create Session session http://${CONTROLLER}:${RESTCONFPORT} auth=${AUTH} headers=${HEADERS_XML} +Suite Setup Create Session session http://${ODL_SYSTEM_IP}:${RESTCONFPORT} auth=${AUTH} headers=${HEADERS_XML} Suite Teardown Delete All Sessions Library Collections Library RequestsLibrary 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 3f8a7ab25d..10b5db3d5d 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 @@ -1,6 +1,6 @@ *** Settings *** Documentation Test suite for RESTCONF FRM -Suite Setup Create Session session http://${CONTROLLER}:${RESTCONFPORT} auth=${AUTH} headers=${HEADERS_XML} +Suite Setup Create Session session http://${ODL_SYSTEM_IP}:${RESTCONFPORT} auth=${AUTH} headers=${HEADERS_XML} Suite Teardown Delete All Sessions Library Collections Library RequestsLibrary diff --git a/csit/suites/openflowplugin/MD_SAL_NSF_OF10/__init__.robot b/csit/suites/openflowplugin/MD_SAL_NSF_OF10/__init__.robot index 05e5b1f859..7c42042c24 100644 --- a/csit/suites/openflowplugin/MD_SAL_NSF_OF10/__init__.robot +++ b/csit/suites/openflowplugin/MD_SAL_NSF_OF10/__init__.robot @@ -6,4 +6,4 @@ Library SSHLibrary Resource ../../../libraries/Utils.robot *** Variables *** -${start} sudo mn --controller=remote,ip=${CONTROLLER} --topo tree,2 +${start} sudo mn --controller=remote,ip=${ODL_SYSTEM_IP} --topo tree,2 diff --git a/csit/suites/openflowplugin/MD_SAL_NSF_OF13/010__restconf_inventory.robot b/csit/suites/openflowplugin/MD_SAL_NSF_OF13/010__restconf_inventory.robot index dd557013bf..c3e1d87698 100644 --- a/csit/suites/openflowplugin/MD_SAL_NSF_OF13/010__restconf_inventory.robot +++ b/csit/suites/openflowplugin/MD_SAL_NSF_OF13/010__restconf_inventory.robot @@ -1,6 +1,6 @@ *** Settings *** Documentation Test suite for RESTCONF inventory -Suite Setup Create Session session http://${CONTROLLER}:${RESTCONFPORT} auth=${AUTH} headers=${HEADERS_XML} +Suite Setup Create Session session http://${ODL_SYSTEM_IP}:${RESTCONFPORT} auth=${AUTH} headers=${HEADERS_XML} Suite Teardown Delete All Sessions Library Collections Library RequestsLibrary diff --git a/csit/suites/openflowplugin/MD_SAL_NSF_OF13/020__restconf_topology.robot b/csit/suites/openflowplugin/MD_SAL_NSF_OF13/020__restconf_topology.robot index 0ed6fdf3c0..3cd5b63d43 100644 --- a/csit/suites/openflowplugin/MD_SAL_NSF_OF13/020__restconf_topology.robot +++ b/csit/suites/openflowplugin/MD_SAL_NSF_OF13/020__restconf_topology.robot @@ -1,6 +1,6 @@ *** Settings *** Documentation Test suite for RESTCONF Topology -Suite Setup Create Session session http://${CONTROLLER}:${RESTCONFPORT} auth=${AUTH} headers=${HEADERS} +Suite Setup Create Session session http://${ODL_SYSTEM_IP}:${RESTCONFPORT} auth=${AUTH} headers=${HEADERS} Suite Teardown Delete All Sessions Library Collections Library RequestsLibrary diff --git a/csit/suites/openflowplugin/MD_SAL_NSF_OF13/030__restconf_statistics.robot b/csit/suites/openflowplugin/MD_SAL_NSF_OF13/030__restconf_statistics.robot index e1b22b3f7d..d64b05d55c 100644 --- a/csit/suites/openflowplugin/MD_SAL_NSF_OF13/030__restconf_statistics.robot +++ b/csit/suites/openflowplugin/MD_SAL_NSF_OF13/030__restconf_statistics.robot @@ -1,6 +1,6 @@ *** Settings *** Documentation Test suite for RESTCONF statistics -Suite Setup Create Session session http://${CONTROLLER}:${RESTCONFPORT} auth=${AUTH} headers=${HEADERS_XML} +Suite Setup Create Session session http://${ODL_SYSTEM_IP}:${RESTCONFPORT} auth=${AUTH} headers=${HEADERS_XML} Suite Teardown Delete All Sessions Library Collections Library RequestsLibrary diff --git a/csit/suites/openflowplugin/MD_SAL_NSF_OF13/040__restconf_frm.robot b/csit/suites/openflowplugin/MD_SAL_NSF_OF13/040__restconf_frm.robot index 0b5836d444..f5ab5b34b5 100644 --- a/csit/suites/openflowplugin/MD_SAL_NSF_OF13/040__restconf_frm.robot +++ b/csit/suites/openflowplugin/MD_SAL_NSF_OF13/040__restconf_frm.robot @@ -1,6 +1,6 @@ *** Settings *** Documentation Test suite for RESTCONF FRM -Suite Setup Create Session session http://${CONTROLLER}:${RESTCONFPORT} auth=${AUTH} headers=${HEADERS_XML} +Suite Setup Create Session session http://${ODL_SYSTEM_IP}:${RESTCONFPORT} auth=${AUTH} headers=${HEADERS_XML} Suite Teardown Delete All Sessions Library Collections Library RequestsLibrary diff --git a/csit/suites/openflowplugin/MD_SAL_NSF_OF13/__init__.robot b/csit/suites/openflowplugin/MD_SAL_NSF_OF13/__init__.robot index c0a4b223fc..f372134b23 100644 --- a/csit/suites/openflowplugin/MD_SAL_NSF_OF13/__init__.robot +++ b/csit/suites/openflowplugin/MD_SAL_NSF_OF13/__init__.robot @@ -6,6 +6,6 @@ Library SSHLibrary Resource ../../../libraries/Utils.robot *** Variables *** -${start} sudo mn --controller=remote,ip=${CONTROLLER} --topo tree,2 --switch ovsk,protocols=OpenFlow13 +${start} sudo mn --controller=remote,ip=${ODL_SYSTEM_IP} --topo tree,2 --switch ovsk,protocols=OpenFlow13 *** Keywords *** diff --git a/csit/suites/openflowplugin/Maximum_Links/010__finding_max_links.robot b/csit/suites/openflowplugin/Maximum_Links/010__finding_max_links.robot index f7526107d7..6271eca35f 100644 --- a/csit/suites/openflowplugin/Maximum_Links/010__finding_max_links.robot +++ b/csit/suites/openflowplugin/Maximum_Links/010__finding_max_links.robot @@ -25,7 +25,7 @@ Find Max Switch Links *** Keywords *** Link Scale Suite Setup [Documentation] Do initial steps for link scale tests - Create Session session http://${CONTROLLER}:${RESTCONFPORT} auth=${AUTH} headers=${HEADERS_XML} + Create Session session http://${ODL_SYSTEM_IP}:${RESTCONFPORT} auth=${AUTH} headers=${HEADERS_XML} ${mininet_conn_id}= Open Connection ${MININET} prompt=${DEFAULT_LINUX_PROMPT} Login With Public Key ${MININET_USER} ${USER_HOME}/.ssh/${SSH_KEY} any Log Copying ${CREATE_FULLYMESH_TOPOLOGY_FILE_PATH} file to Mininet VM diff --git a/csit/suites/openflowplugin/Maximum_Switches/010__finding_max_switches.robot b/csit/suites/openflowplugin/Maximum_Switches/010__finding_max_switches.robot index fa37f03cd7..d51a4dc191 100644 --- a/csit/suites/openflowplugin/Maximum_Switches/010__finding_max_switches.robot +++ b/csit/suites/openflowplugin/Maximum_Switches/010__finding_max_switches.robot @@ -1,6 +1,6 @@ *** Settings *** Documentation Test suite for finding out max number of switches -Suite Setup Create Session session http://${CONTROLLER}:${RESTCONFPORT} auth=${AUTH} headers=${HEADERS_XML} +Suite Setup Create Session session http://${ODL_SYSTEM_IP}:${RESTCONFPORT} auth=${AUTH} headers=${HEADERS_XML} Suite Teardown Scalability Suite Teardown Library OperatingSystem Library RequestsLibrary diff --git a/csit/suites/openflowplugin/Maximum_Switches/020__find_max_switches.robot b/csit/suites/openflowplugin/Maximum_Switches/020__find_max_switches.robot index 2813f6aebd..e2d87530b0 100644 --- a/csit/suites/openflowplugin/Maximum_Switches/020__find_max_switches.robot +++ b/csit/suites/openflowplugin/Maximum_Switches/020__find_max_switches.robot @@ -41,7 +41,7 @@ Start Suite Execute Command sudo mn -c Write ${start} Read Until mininet> - Write start ${CONTROLLER} ${init_sw} + Write start ${ODL_SYSTEM_IP} ${init_sw} Read Until mininet> Wait Until Keyword Succeeds 10s 1s Verify Switches Connected ${init_sw} @@ -54,7 +54,7 @@ Add Switches Verify Switches Connected [Arguments] ${exp_switches} [Documentation] Verifies if switches are connected/present in operational inventory - ${sw} ${rep} ${found}= Flow Stats Collected controller=${CONTROLLER} + ${sw} ${rep} ${found}= Flow Stats Collected controller=${ODL_SYSTEM_IP} Should Be Equal As Numbers ${sw} ${exp_switches} Log Store Max Found diff --git a/csit/suites/openflowplugin/Performance/010_Cbench.robot b/csit/suites/openflowplugin/Performance/010_Cbench.robot index 251f456251..559665dddc 100644 --- a/csit/suites/openflowplugin/Performance/010_Cbench.robot +++ b/csit/suites/openflowplugin/Performance/010_Cbench.robot @@ -47,7 +47,7 @@ Run Cbench And Log Results ##down can catch this problem and log the results as zero. However, we need to know which ##file to log to, so setting it as a suite variable here. Set Suite Variable ${output_filename} - ${output}= Run Command On Remote System ${cbench_system} ${cbench_executable} -c ${CONTROLLER} ${cbench_args} prompt_timeout=${test_timeout} + ${output}= Run Command On Remote System ${cbench_system} ${cbench_executable} -c ${ODL_SYSTEM_IP} ${cbench_args} prompt_timeout=${test_timeout} Log ${output} Should Contain ${output} RESULT ${result_line}= Get Lines Containing String ${output} RESULT diff --git a/csit/suites/openflowplugin/Performance_Flow_Config/010_Rest_Config_Flows.robot b/csit/suites/openflowplugin/Performance_Flow_Config/010_Rest_Config_Flows.robot index a7c70b873a..4f4add24bb 100644 --- a/csit/suites/openflowplugin/Performance_Flow_Config/010_Rest_Config_Flows.robot +++ b/csit/suites/openflowplugin/Performance_Flow_Config/010_Rest_Config_Flows.robot @@ -15,7 +15,7 @@ Library SSHLibrary ${switches} 25 ${flows} 2000 ${threads} 5 -${start} sudo mn --controller=remote,ip=${CONTROLLER} --topo linear,${switches},1 --switch ovsk,protocols=OpenFlow13 +${start} sudo mn --controller=remote,ip=${ODL_SYSTEM_IP} --topo linear,${switches},1 --switch ovsk,protocols=OpenFlow13 ${PERFSCRIPT} ${CURDIR}/../../../../tools/odl-mdsal-clustering-tests/clustering-performance-test/flow_add_delete_test.py ${PARSESCRIPT} ${CURDIR}/../../../../tools/odl-mdsal-clustering-tests/clustering-performance-test/create_plot_data_files.py @@ -30,7 +30,7 @@ Are Switches Connected [Teardown] Stop Http Session Configure And Deconfigure Flows - ${result}= Run Process ${PERFSCRIPT} --host ${CONTROLLER} --flows ${flows} + ${result}= Run Process ${PERFSCRIPT} --host ${ODL_SYSTEM_IP} --flows ${flows} ... --threads ${threads} --auth shell=yes Log ${result.stdout} Create File out.log.txt content=${result.stdout} @@ -68,8 +68,8 @@ Stop Suite Start Http Session [Documentation] Starts http session - Log http://${CONTROLLER}:${RESTCONFPORT} auth=${AUTH} headers=${HEADERS_XML} - Create Session tcsession http://${CONTROLLER}:${RESTCONFPORT} auth=${AUTH} headers=${HEADERS_XML} + Log http://${ODL_SYSTEM_IP}:${RESTCONFPORT} auth=${AUTH} headers=${HEADERS_XML} + Create Session tcsession http://${ODL_SYSTEM_IP}:${RESTCONFPORT} auth=${AUTH} headers=${HEADERS_XML} Stop Http Session [Documentation] Stops http session diff --git a/csit/suites/openflowplugin/Performance_Flow_Config/020_Stats_Collection_Gauss.robot b/csit/suites/openflowplugin/Performance_Flow_Config/020_Stats_Collection_Gauss.robot index 233ff08df2..8e0679c1b5 100644 --- a/csit/suites/openflowplugin/Performance_Flow_Config/020_Stats_Collection_Gauss.robot +++ b/csit/suites/openflowplugin/Performance_Flow_Config/020_Stats_Collection_Gauss.robot @@ -18,7 +18,7 @@ ${swspread} gauss ${tabspread} gauss ${topourl} /restconf/operational/network-topology:network-topology/topology/flow:1 ${invurl} /restconf/operational/opendaylight-inventory:nodes -@{cntls} ${CONTROLLER} +@{cntls} ${ODL_SYSTEM_IP} *** Test Cases *** Configure Flows @@ -29,7 +29,7 @@ Configure Flows Set Suite Variable ${flows} Check Configured Are Operational - Wait Until Keyword Succeeds 110s 20s Check Flows Inventory ${flows} ${CONTROLLER} + Wait Until Keyword Succeeds 110s 20s Check Flows Inventory ${flows} ${ODL_SYSTEM_IP} Deconfigure Flows ${res}= Deconfigure Flows flow_details=${flows} controllers=@{cntls} nrthreads=5 @@ -37,7 +37,7 @@ Deconfigure Flows Check No Flows In Operational ${noflows}= Create List - Wait Until Keyword Succeeds 110s 20s Check Flows Inventory ${noflows} ${CONTROLLER} + Wait Until Keyword Succeeds 110s 20s Check Flows Inventory ${noflows} ${ODL_SYSTEM_IP} *** Keywords *** Connect Switches @@ -48,9 +48,9 @@ Connect Switches Write sudo ovs-vsctl set-manager ptcp:6644 Write sudo mn -c Read Until ${DEFAULT_LINUX_PROMPT} - Write sudo mn --controller=remote,ip=${CONTROLLER} --topo linear,${swnr} --switch ovsk,protocols=OpenFlow13 + Write sudo mn --controller=remote,ip=${ODL_SYSTEM_IP} --topo linear,${swnr} --switch ovsk,protocols=OpenFlow13 Read Until mininet> - Create Session session http://${CONTROLLER}:${RESTCONFPORT} auth=${AUTH} headers=${HEADERS_XML} + Create Session session http://${ODL_SYSTEM_IP}:${RESTCONFPORT} auth=${AUTH} headers=${HEADERS_XML} Wait Until Keyword Succeeds 10s 1s Are Switches Connected Topo Stop Switches diff --git a/csit/suites/openflowplugin/Performance_Flow_Config/030_Stats_Collection_Linear.robot b/csit/suites/openflowplugin/Performance_Flow_Config/030_Stats_Collection_Linear.robot index 00f2d98ff1..8d3cb677f7 100644 --- a/csit/suites/openflowplugin/Performance_Flow_Config/030_Stats_Collection_Linear.robot +++ b/csit/suites/openflowplugin/Performance_Flow_Config/030_Stats_Collection_Linear.robot @@ -18,7 +18,7 @@ ${swspread} linear ${tabspread} linear ${topourl} /restconf/operational/network-topology:network-topology/topology/flow:1 ${invurl} /restconf/operational/opendaylight-inventory:nodes -@{cntls} ${CONTROLLER} +@{cntls} ${ODL_SYSTEM_IP} *** Test Cases *** Configure Flows @@ -29,7 +29,7 @@ Configure Flows Set Suite Variable ${flows} Check Configured Are Operational - Wait Until Keyword Succeeds 110s 20s Check Flows Inventory ${flows} ${CONTROLLER} + Wait Until Keyword Succeeds 110s 20s Check Flows Inventory ${flows} ${ODL_SYSTEM_IP} Deconfigure Flows ${res}= Deconfigure Flows flow_details=${flows} controllers=@{cntls} nrthreads=5 @@ -37,7 +37,7 @@ Deconfigure Flows Check No Flows In Operational ${noflows}= Create List - Wait Until Keyword Succeeds 110s 20s Check Flows Inventory ${noflows} ${CONTROLLER} + Wait Until Keyword Succeeds 110s 20s Check Flows Inventory ${noflows} ${ODL_SYSTEM_IP} *** Keywords *** Connect Switches @@ -48,9 +48,9 @@ Connect Switches Write sudo ovs-vsctl set-manager ptcp:6644 Write sudo mn -c Read Until ${DEFAULT_LINUX_PROMPT} - Write sudo mn --controller=remote,ip=${CONTROLLER} --topo linear,${swnr} --switch ovsk,protocols=OpenFlow13 + Write sudo mn --controller=remote,ip=${ODL_SYSTEM_IP} --topo linear,${swnr} --switch ovsk,protocols=OpenFlow13 Read Until mininet> - Create Session session http://${CONTROLLER}:${RESTCONFPORT} auth=${AUTH} headers=${HEADERS_XML} + Create Session session http://${ODL_SYSTEM_IP}:${RESTCONFPORT} auth=${AUTH} headers=${HEADERS_XML} Wait Until Keyword Succeeds 10s 1s Are Switches Connected Topo Stop Switches diff --git a/csit/suites/openflowplugin/Performance_Flow_Config/040_Stats_Collection_One.robot b/csit/suites/openflowplugin/Performance_Flow_Config/040_Stats_Collection_One.robot index bb8557b14d..c7a040bf76 100644 --- a/csit/suites/openflowplugin/Performance_Flow_Config/040_Stats_Collection_One.robot +++ b/csit/suites/openflowplugin/Performance_Flow_Config/040_Stats_Collection_One.robot @@ -18,7 +18,7 @@ ${swspread} first ${tabspread} first ${topourl} /restconf/operational/network-topology:network-topology/topology/flow:1 ${invurl} /restconf/operational/opendaylight-inventory:nodes -@{cntls} ${CONTROLLER} +@{cntls} ${ODL_SYSTEM_IP} *** Test Cases *** Configure Flows @@ -29,7 +29,7 @@ Configure Flows Set Suite Variable ${flows} Check Configured Are Operational - Wait Until Keyword Succeeds 110s 20s Check Flows Inventory ${flows} ${CONTROLLER} + Wait Until Keyword Succeeds 110s 20s Check Flows Inventory ${flows} ${ODL_SYSTEM_IP} Deconfigure Flows ${res}= Deconfigure Flows flow_details=${flows} controllers=@{cntls} nrthreads=5 @@ -37,7 +37,7 @@ Deconfigure Flows Check No Flows In Operational ${noflows}= Create List - Wait Until Keyword Succeeds 110s 20s Check Flows Inventory ${noflows} ${CONTROLLER} + Wait Until Keyword Succeeds 110s 20s Check Flows Inventory ${noflows} ${ODL_SYSTEM_IP} *** Keywords *** Connect Switches @@ -48,9 +48,9 @@ Connect Switches Write sudo ovs-vsctl set-manager ptcp:6644 Write sudo mn -c Read Until ${DEFAULT_LINUX_PROMPT} - Write sudo mn --controller=remote,ip=${CONTROLLER} --topo linear,${swnr} --switch ovsk,protocols=OpenFlow13 + Write sudo mn --controller=remote,ip=${ODL_SYSTEM_IP} --topo linear,${swnr} --switch ovsk,protocols=OpenFlow13 Read Until mininet> - Create Session session http://${CONTROLLER}:${RESTCONFPORT} auth=${AUTH} headers=${HEADERS_XML} + Create Session session http://${ODL_SYSTEM_IP}:${RESTCONFPORT} auth=${AUTH} headers=${HEADERS_XML} Wait Until Keyword Succeeds 10s 1s Are Switches Connected Topo Stop Switches diff --git a/csit/suites/openflowplugin/Performance_Flow_Config/050_Stats_Collection_FirstTable.robot b/csit/suites/openflowplugin/Performance_Flow_Config/050_Stats_Collection_FirstTable.robot index 2a7b039e72..601169c153 100644 --- a/csit/suites/openflowplugin/Performance_Flow_Config/050_Stats_Collection_FirstTable.robot +++ b/csit/suites/openflowplugin/Performance_Flow_Config/050_Stats_Collection_FirstTable.robot @@ -18,7 +18,7 @@ ${swspread} linear ${tabspread} first ${topourl} /restconf/operational/network-topology:network-topology/topology/flow:1 ${invurl} /restconf/operational/opendaylight-inventory:nodes -@{cntls} ${CONTROLLER} +@{cntls} ${ODL_SYSTEM_IP} *** Test Cases *** Configure Flows @@ -29,7 +29,7 @@ Configure Flows Set Suite Variable ${flows} Check Configured Are Operational - Wait Until Keyword Succeeds 110s 20s Check Flows Inventory ${flows} ${CONTROLLER} + Wait Until Keyword Succeeds 110s 20s Check Flows Inventory ${flows} ${ODL_SYSTEM_IP} Deconfigure Flows ${res}= Deconfigure Flows flow_details=${flows} controllers=@{cntls} nrthreads=5 @@ -37,7 +37,7 @@ Deconfigure Flows Check No Flows In Operational ${noflows}= Create List - Wait Until Keyword Succeeds 110s 20s Check Flows Inventory ${noflows} ${CONTROLLER} + Wait Until Keyword Succeeds 110s 20s Check Flows Inventory ${noflows} ${ODL_SYSTEM_IP} *** Keywords *** Connect Switches @@ -48,9 +48,9 @@ Connect Switches Write sudo ovs-vsctl set-manager ptcp:6644 Write sudo mn -c Read Until ${DEFAULT_LINUX_PROMPT} - Write sudo mn --controller=remote,ip=${CONTROLLER} --topo linear,${swnr} --switch ovsk,protocols=OpenFlow13 + Write sudo mn --controller=remote,ip=${ODL_SYSTEM_IP} --topo linear,${swnr} --switch ovsk,protocols=OpenFlow13 Read Until mininet> - Create Session session http://${CONTROLLER}:${RESTCONFPORT} auth=${AUTH} headers=${HEADERS_XML} + Create Session session http://${ODL_SYSTEM_IP}:${RESTCONFPORT} auth=${AUTH} headers=${HEADERS_XML} Wait Until Keyword Succeeds 10s 1s Are Switches Connected Topo Stop Switches diff --git a/csit/suites/openflowplugin/Performance_Flow_Config/060_Stats_Collection_Basic16kScenario.robot b/csit/suites/openflowplugin/Performance_Flow_Config/060_Stats_Collection_Basic16kScenario.robot index b61c4e327c..302c2efbc5 100644 --- a/csit/suites/openflowplugin/Performance_Flow_Config/060_Stats_Collection_Basic16kScenario.robot +++ b/csit/suites/openflowplugin/Performance_Flow_Config/060_Stats_Collection_Basic16kScenario.robot @@ -16,8 +16,8 @@ ${swnr} 16 ${flnr} 16000 ${swspread} linear ${tabspread} linear -@{cntls} ${CONTROLLER} -${start_cmd} sudo mn --controller=remote,ip=${CONTROLLER} --topo linear,${swnr} --switch ovsk,protocols=OpenFlow13 +@{cntls} ${ODL_SYSTEM_IP} +${start_cmd} sudo mn --controller=remote,ip=${ODL_SYSTEM_IP} --topo linear,${swnr} --switch ovsk,protocols=OpenFlow13 *** Test Cases *** Connect Mininet @@ -33,7 +33,7 @@ Configure Flows Are Flows Operational [Documentation] Operational datastore check if all flows are present there - Wait Until Keyword Succeeds 110s 5s Check Flows Inventory ${flows} ${CONTROLLER} + Wait Until Keyword Succeeds 110s 5s Check Flows Inventory ${flows} ${ODL_SYSTEM_IP} Deconfigure Flows [Documentation] Removal of 16k flows from config datastore @@ -43,7 +43,7 @@ Deconfigure Flows Check No Flows In Operational [Documentation] Operational datastore to be without any flows ${noflows}= Create List - Wait Until Keyword Succeeds 110s 5s Check Flows Inventory ${noflows} ${CONTROLLER} + Wait Until Keyword Succeeds 110s 5s Check Flows Inventory ${noflows} ${ODL_SYSTEM_IP} Configure Flows Again [Documentation] Configuration of 16k flows into config datastore again @@ -52,7 +52,7 @@ Configure Flows Again Are Flows Operational Again [Documentation] Operational datastore check if all flows are present there - Wait Until Keyword Succeeds 110s 5s Check Flows Inventory ${flows} ${CONTROLLER} + Wait Until Keyword Succeeds 110s 5s Check Flows Inventory ${flows} ${ODL_SYSTEM_IP} Stop Mininet [Documentation] Disconnect/Stop mininet @@ -68,7 +68,7 @@ Connect Mininet Again Check Flows Are Operational Again [Documentation] All 16k switches should be present in the operational datastore after mininet reconnection - Wait Until Keyword Succeeds 110s 5s Check Flows Inventory ${flows} ${CONTROLLER} + Wait Until Keyword Succeeds 110s 5s Check Flows Inventory ${flows} ${ODL_SYSTEM_IP} Deconfigure Flows End [Documentation] Flows deconfiguration @@ -78,7 +78,7 @@ Deconfigure Flows End Check No Flows In Operational Last [Documentation] Operational datastore to be without any flows ${noflows}= Create List - Wait Until Keyword Succeeds 110s 5s Check Flows Inventory ${noflows} ${CONTROLLER} + Wait Until Keyword Succeeds 110s 5s Check Flows Inventory ${noflows} ${ODL_SYSTEM_IP} Stop Mininet End Stop Switches @@ -96,7 +96,7 @@ Connect Switches Wait Until Keyword Succeeds 10s 1s Are Switches Connected Topo Create Http Session - Create Session session http://${CONTROLLER}:${RESTCONFPORT} auth=${AUTH} headers=${HEADERS_XML} + Create Session session http://${ODL_SYSTEM_IP}:${RESTCONFPORT} auth=${AUTH} headers=${HEADERS_XML} Stop Switches [Documentation] Stops mininet diff --git a/csit/suites/openflowplugin/Performance_Flow_Config/070_Stats_Collection_100k_WithMininetRestart.robot b/csit/suites/openflowplugin/Performance_Flow_Config/070_Stats_Collection_100k_WithMininetRestart.robot index ed1d1e565f..dfef1dca8b 100644 --- a/csit/suites/openflowplugin/Performance_Flow_Config/070_Stats_Collection_100k_WithMininetRestart.robot +++ b/csit/suites/openflowplugin/Performance_Flow_Config/070_Stats_Collection_100k_WithMininetRestart.robot @@ -19,8 +19,8 @@ ${fpr} 25 ${nrthreads} 5 ${swspread} linear ${tabspread} first -@{cntls} ${CONTROLLER} -${start_cmd} sudo mn --controller=remote,ip=${CONTROLLER} --topo linear,${swnr} --switch ovsk,protocols=OpenFlow13 +@{cntls} ${ODL_SYSTEM_IP} +${start_cmd} sudo mn --controller=remote,ip=${ODL_SYSTEM_IP} --topo linear,${swnr} --switch ovsk,protocols=OpenFlow13 ${getf_cmd} sh ./get-total-found.sh ${getr_cmd} sh ./get-total-reported.sh ${iperiod} 1s @@ -102,7 +102,7 @@ Connect Switches Wait Until Keyword Succeeds 10s 1s Are Switches Connected Topo Create Http Session And Upload Files - Create Session session http://${CONTROLLER}:${RESTCONFPORT} auth=${AUTH} headers=${HEADERS_XML} + Create Session session http://${ODL_SYSTEM_IP}:${RESTCONFPORT} auth=${AUTH} headers=${HEADERS_XML} Open Connection ${MININET} prompt=${DEFAULT_LINUX_PROMPT} timeout=600 Login With Public Key ${MININET_USER} ${USER_HOME}/.ssh/${SSH_KEY} any Put File ${CURDIR}/../../../../tools/odl-mdsal-clustering-tests/clustering-performance-test/ovs-scripts/* ./ @@ -134,7 +134,7 @@ Are Switches Connected Topo Check Flows Inventory [Arguments] ${rswitches} ${rflows} [Documentation] Checks in inventory has required state - ${sw} ${repf} ${foundf}= Flow Stats Collected controller=${CONTROLLER} + ${sw} ${repf} ${foundf}= Flow Stats Collected controller=${ODL_SYSTEM_IP} Should Be Equal As Numbers ${rswitches} ${sw} Should Be Equal As Numbers ${rflows} ${foundf} diff --git a/csit/suites/openflowplugin/Performance_Flow_Config/080_Rpc_100k_Flows_Configuration_Time_Measure.robot b/csit/suites/openflowplugin/Performance_Flow_Config/080_Rpc_100k_Flows_Configuration_Time_Measure.robot index 51be2416b9..c794ef9a50 100644 --- a/csit/suites/openflowplugin/Performance_Flow_Config/080_Rpc_100k_Flows_Configuration_Time_Measure.robot +++ b/csit/suites/openflowplugin/Performance_Flow_Config/080_Rpc_100k_Flows_Configuration_Time_Measure.robot @@ -17,8 +17,8 @@ ${fpr} 25 ${nrthreads} 5 ${swspread} linear ${tabspread} first -@{cntls} ${CONTROLLER} -${start_cmd} sudo mn --controller=remote,ip=${CONTROLLER} --topo linear,${swnr} --switch ovsk,protocols=OpenFlow13 +@{cntls} ${ODL_SYSTEM_IP} +${start_cmd} sudo mn --controller=remote,ip=${ODL_SYSTEM_IP} --topo linear,${swnr} --switch ovsk,protocols=OpenFlow13 ${getf_cmd} sh ./get-total-found.sh ${getr_cmd} sh ./get-total-reported.sh ${iperiod} 1s @@ -77,7 +77,7 @@ Connect Switches Wait Until Keyword Succeeds 10s 1s Are Switches Connected Topo Create Http Session And Upload Files - Create Session session http://${CONTROLLER}:${RESTCONFPORT} auth=${AUTH} headers=${HEADERS_XML} + Create Session session http://${ODL_SYSTEM_IP}:${RESTCONFPORT} auth=${AUTH} headers=${HEADERS_XML} Open Connection ${MININET} prompt=${DEFAULT_LINUX_PROMPT} timeout=600 Login With Public Key ${MININET_USER} ${USER_HOME}/.ssh/${SSH_KEY} any Put File ${CURDIR}/../../../../tools/odl-mdsal-clustering-tests/clustering-performance-test/ovs-scripts/* ./ @@ -107,7 +107,7 @@ Are Switches Connected Topo Check Flows Inventory [Arguments] ${rswitches} ${rflows} [Documentation] Checks in inventory has required state - ${sw} ${repf} ${foundf}= Flow Stats Collected controller=${CONTROLLER} + ${sw} ${repf} ${foundf}= Flow Stats Collected controller=${ODL_SYSTEM_IP} Should Be Equal As Numbers ${rswitches} ${sw} Should Be Equal As Numbers ${rflows} ${foundf} diff --git a/csit/suites/openflowplugin/Performance_Flow_Config/090_BulkMaticConfigDsSetup_100k.robot b/csit/suites/openflowplugin/Performance_Flow_Config/090_BulkMaticConfigDsSetup_100k.robot index 8c9927630d..f051f1a055 100644 --- a/csit/suites/openflowplugin/Performance_Flow_Config/090_BulkMaticConfigDsSetup_100k.robot +++ b/csit/suites/openflowplugin/Performance_Flow_Config/090_BulkMaticConfigDsSetup_100k.robot @@ -17,8 +17,8 @@ ${fpr} 25 ${nrthreads} 5 ${swspread} linear ${tabspread} first -@{cntls} ${CONTROLLER} -${start_cmd} sudo mn --controller=remote,ip=${CONTROLLER} --topo linear,${swnr} --switch ovsk,protocols=OpenFlow13 +@{cntls} ${ODL_SYSTEM_IP} +${start_cmd} sudo mn --controller=remote,ip=${ODL_SYSTEM_IP} --topo linear,${swnr} --switch ovsk,protocols=OpenFlow13 ${getf_cmd} sh ./get-total-found.sh ${getr_cmd} sh ./get-total-reported.sh ${iperiod} 1s @@ -77,7 +77,7 @@ Connect Switches Wait Until Keyword Succeeds 10s 1s Are Switches Connected Topo Create Http Session And Upload Files - Create Session session http://${CONTROLLER}:${RESTCONFPORT} auth=${AUTH} headers=${HEADERS_XML} + Create Session session http://${ODL_SYSTEM_IP}:${RESTCONFPORT} auth=${AUTH} headers=${HEADERS_XML} Open Connection ${MININET} prompt=${DEFAULT_LINUX_PROMPT} timeout=600 Login With Public Key ${MININET_USER} ${USER_HOME}/.ssh/${SSH_KEY} any Put File ${CURDIR}/../../../../tools/odl-mdsal-clustering-tests/clustering-performance-test/ovs-scripts/* ./ @@ -107,7 +107,7 @@ Are Switches Connected Topo Check Flows Inventory [Arguments] ${rswitches} ${rflows} [Documentation] Checks in inventory has required state - ${sw} ${repf} ${foundf}= Flow Stats Collected controller=${CONTROLLER} + ${sw} ${repf} ${foundf}= Flow Stats Collected controller=${ODL_SYSTEM_IP} Should Be Equal As Numbers ${rswitches} ${sw} Should Be Equal As Numbers ${rflows} ${foundf} diff --git a/csit/suites/openflowplugin/Sanity3Node/010__Flows_OF13_Cluster.robot b/csit/suites/openflowplugin/Sanity3Node/010__Flows_OF13_Cluster.robot index b66b1d686e..86d4808076 100644 --- a/csit/suites/openflowplugin/Sanity3Node/010__Flows_OF13_Cluster.robot +++ b/csit/suites/openflowplugin/Sanity3Node/010__Flows_OF13_Cluster.robot @@ -396,9 +396,9 @@ Init Flow Variables Set Suite Variable ${xmlroot} Create Controllers Sessions - Create Session session1 http://${CONTROLLER}:${RESTCONFPORT} auth=${AUTH} headers=${HEADERS_XML} - Create Session session2 http://${CONTROLLER1}:${RESTCONFPORT} auth=${AUTH} headers=${HEADERS_XML} - Create Session session3 http://${CONTROLLER2}:${RESTCONFPORT} auth=${AUTH} headers=${HEADERS_XML} + Create Session session1 http://${ODL_SYSTEM_IP}:${RESTCONFPORT} auth=${AUTH} headers=${HEADERS_XML} + Create Session session2 http://${ODL_SYSTEM_2_IP}:${RESTCONFPORT} auth=${AUTH} headers=${HEADERS_XML} + Create Session session3 http://${ODL_SYSTEM_3_IP}:${RESTCONFPORT} auth=${AUTH} headers=${HEADERS_XML} Get Controller Response [Arguments] ${session} ${url} diff --git a/csit/suites/openflowplugin/Sanity3Node/__init__.robot b/csit/suites/openflowplugin/Sanity3Node/__init__.robot index e232ced22e..678bc2bc47 100644 --- a/csit/suites/openflowplugin/Sanity3Node/__init__.robot +++ b/csit/suites/openflowplugin/Sanity3Node/__init__.robot @@ -19,5 +19,5 @@ Start Suite Execute Command sudo mn -c Write ${start} Read Until mininet> - Write start_with_cluster ${CONTROLLER},${CONTROLLER1},${CONTROLLER2} + Write start_with_cluster ${ODL_SYSTEM_IP},${ODL_SYSTEM_2_IP},${ODL_SYSTEM_3_IP} Read Until mininet> diff --git a/csit/suites/openflowplugin/Switch_Qualification/010_OpenFlow_Connection.robot b/csit/suites/openflowplugin/Switch_Qualification/010_OpenFlow_Connection.robot index 70e36e87fd..16049227cb 100644 --- a/csit/suites/openflowplugin/Switch_Qualification/010_OpenFlow_Connection.robot +++ b/csit/suites/openflowplugin/Switch_Qualification/010_OpenFlow_Connection.robot @@ -16,7 +16,7 @@ Variables ../../../variables/Variables.py ${SWITCH_CLASS} Ovs ${SWITCH_IP} ${MININET} ${SWITCH_PROMPT} ${DEFAULT_LINUX_PROMPT} -${CONTROLLER} null +${ODL_SYSTEM_IP} null ${REST_CONTEXT} /restconf/operational/opendaylight-inventory:nodes *** Test Cases *** @@ -38,12 +38,12 @@ Switch Qualification Suite Setup ${test_switch}= Get Switch ${SWITCH_CLASS} Set Suite Variable ${test_switch} Call Method ${test_switch} set_mgmt_ip ${SWITCH_IP} - Call Method ${test_switch} set_controller_ip ${CONTROLLER} + Call Method ${test_switch} set_controller_ip ${ODL_SYSTEM_IP} Call Method ${test_switch} set_mgmt_prompt ${SWITCH_PROMPT} Log MAKE: ${test_switch.make}\n MODEL: ${test_switch.model}\n IP: ${test_switch.mgmt_ip}\n PROMPT: ${test_switch.mgmt_prompt}\n CONTROLLER_IP: ${test_switch.of_controller_ip}\n MGMT_PROTOCOL: ${test_switch.mgmt_protocol} Ping ${test_switch.mgmt_ip} Initialize Switch ${test_switch} - Create Session session http://${CONTROLLER}:${RESTCONFPORT} auth=${AUTH} headers=${HEADERS_XML} + Create Session session http://${ODL_SYSTEM_IP}:${RESTCONFPORT} auth=${AUTH} headers=${HEADERS_XML} Switch Qualification Suite Teardown Cleanup Switch ${test_switch} diff --git a/csit/suites/openflowplugin/Switch_Qualification/020_OpenFlow_Actions.robot b/csit/suites/openflowplugin/Switch_Qualification/020_OpenFlow_Actions.robot index 185662ed2d..c02d102ab8 100644 --- a/csit/suites/openflowplugin/Switch_Qualification/020_OpenFlow_Actions.robot +++ b/csit/suites/openflowplugin/Switch_Qualification/020_OpenFlow_Actions.robot @@ -29,7 +29,7 @@ Library ../../../libraries/SwitchClasses/${SWITCH_CLASS}.py ${SWITCH_CLASS} Ovs ${SWITCH_IP} ${MININET} ${SWITCH_PROMPT} ${DEFAULT_LINUX_PROMPT} -${CONTROLLER} null +${ODL_SYSTEM_IP} null ${REST_CON} /restconf/config/opendaylight-inventory:nodes ${ipv4_src} 11.3.0.0/16 ${ipv4_dst} 99.0.0.0/8 @@ -107,14 +107,14 @@ OpenFlow Actions Suite Setup ${test_switch}= Get Switch ${SWITCH_CLASS} Set Suite Variable ${test_switch} Call Method ${test_switch} set_mgmt_ip ${SWITCH_IP} - Call Method ${test_switch} set_controller_ip ${CONTROLLER} + Call Method ${test_switch} set_controller_ip ${ODL_SYSTEM_IP} Call Method ${test_switch} set_mgmt_prompt ${SWITCH_PROMPT} - Run Command On Remote System ${CONTROLLER} ps -elf | grep java + Run Command On Remote System ${ODL_SYSTEM_IP} ps -elf | grep java Log MAKE: ${test_switch.make}\n MODEL: ${test_switch.model}\n IP: ${test_switch.mgmt_ip}\n PROMPT: ${test_switch.mgmt_prompt}\n CONTROLLER_IP: ${test_switch.of_controller_ip}\n MGMT_PROTOCOL: ${test_switch.mgmt_protocol} Ping ${test_switch.mgmt_ip} Initialize Switch ${test_switch} Configure OpenFlow ${test_switch} - Create Session session http://${CONTROLLER}:${RESTCONFPORT} auth=${AUTH} headers=${HEADERS_XML} + Create Session session http://${ODL_SYSTEM_IP}:${RESTCONFPORT} auth=${AUTH} headers=${HEADERS_XML} OpenFlow Actions Suite Teardown Cleanup Switch ${test_switch}