From 607634d1d3fbf0d47b1bbfe234f4fbe70b3eb37e Mon Sep 17 00:00:00 2001 From: Deepak Date: Fri, 29 Jan 2016 05:01:04 +0530 Subject: [PATCH] Replace deprecated variables in suites/l2switch (1). + CONTROLLER -> ODL_SYSTEM_IP + CONTROLLER1 -> ODL_SYSTEM_2_IP + CONTROLLER2 -> ODL_SYSTEM_3_IP Change-Id: Ic27e5fbbd1617f07f9b523435c1c186ad6bb5184 Signed-off-by: Deepak --- .../Address_Tracking_OF13/010__restconf_inv_addresses.robot | 2 +- csit/suites/l2switch/Address_Tracking_OF13/__init__.robot | 2 +- .../Flow_Programming_OF13/010__restconf_inv_flows.robot | 2 +- csit/suites/l2switch/Flow_Programming_OF13/__init__.robot | 2 +- .../Host_Tracking_OF13/010__restconf_topo_nodes.robot | 2 +- csit/suites/l2switch/Host_Tracking_OF13/__init__.robot | 2 +- .../Inventory_Scalability_OF13/010__restconf_inventory.robot | 2 +- .../Inventory_Scalability_OF13/020__restconf_topology.robot | 2 +- .../suites/l2switch/Inventory_Scalability_OF13/__init__.robot | 2 +- csit/suites/l2switch/Loop_Removal_OF13/010__loop_of_3.robot | 4 ++-- .../l2switch/Maximum_Hosts/010__finding_max_hosts.robot | 2 +- 11 files changed, 12 insertions(+), 12 deletions(-) diff --git a/csit/suites/l2switch/Address_Tracking_OF13/010__restconf_inv_addresses.robot b/csit/suites/l2switch/Address_Tracking_OF13/010__restconf_inv_addresses.robot index c6937e8eef..39be604fba 100644 --- a/csit/suites/l2switch/Address_Tracking_OF13/010__restconf_inv_addresses.robot +++ b/csit/suites/l2switch/Address_Tracking_OF13/010__restconf_inv_addresses.robot @@ -1,6 +1,6 @@ *** Settings *** Documentation Test suite for AddressObservations in 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 RequestsLibrary Resource ../../../libraries/Utils.robot diff --git a/csit/suites/l2switch/Address_Tracking_OF13/__init__.robot b/csit/suites/l2switch/Address_Tracking_OF13/__init__.robot index e260e72392..9cc5857e0a 100644 --- a/csit/suites/l2switch/Address_Tracking_OF13/__init__.robot +++ b/csit/suites/l2switch/Address_Tracking_OF13/__init__.robot @@ -6,4 +6,4 @@ Library SSHLibrary Resource ../../../libraries/Utils.robot *** Variables *** -${start} sudo mn --controller=remote,ip=${CONTROLLER} --topo=linear,3 --switch ovsk,protocols=OpenFlow13 +${start} sudo mn --controller=remote,ip=${ODL_SYSTEM_IP} --topo=linear,3 --switch ovsk,protocols=OpenFlow13 diff --git a/csit/suites/l2switch/Flow_Programming_OF13/010__restconf_inv_flows.robot b/csit/suites/l2switch/Flow_Programming_OF13/010__restconf_inv_flows.robot index d2b61e4c23..aff53fdcd6 100644 --- a/csit/suites/l2switch/Flow_Programming_OF13/010__restconf_inv_flows.robot +++ b/csit/suites/l2switch/Flow_Programming_OF13/010__restconf_inv_flows.robot @@ -1,6 +1,6 @@ *** Settings *** Documentation Test suite for FlowProgramming in 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/l2switch/Flow_Programming_OF13/__init__.robot b/csit/suites/l2switch/Flow_Programming_OF13/__init__.robot index be5563a380..1a9faa84cc 100644 --- a/csit/suites/l2switch/Flow_Programming_OF13/__init__.robot +++ b/csit/suites/l2switch/Flow_Programming_OF13/__init__.robot @@ -6,4 +6,4 @@ 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 diff --git a/csit/suites/l2switch/Host_Tracking_OF13/010__restconf_topo_nodes.robot b/csit/suites/l2switch/Host_Tracking_OF13/010__restconf_topo_nodes.robot index 9ec10bfae1..c3673b573c 100644 --- a/csit/suites/l2switch/Host_Tracking_OF13/010__restconf_topo_nodes.robot +++ b/csit/suites/l2switch/Host_Tracking_OF13/010__restconf_topo_nodes.robot @@ -1,6 +1,6 @@ *** Settings *** Documentation Test suite for Address in 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 RequestsLibrary Resource ../../../libraries/Utils.robot diff --git a/csit/suites/l2switch/Host_Tracking_OF13/__init__.robot b/csit/suites/l2switch/Host_Tracking_OF13/__init__.robot index 8022db33d0..96664e59c2 100644 --- a/csit/suites/l2switch/Host_Tracking_OF13/__init__.robot +++ b/csit/suites/l2switch/Host_Tracking_OF13/__init__.robot @@ -6,4 +6,4 @@ Library SSHLibrary Resource ../../../libraries/Utils.robot *** Variables *** -${start} sudo mn --controller=remote,ip=${CONTROLLER} --topo=linear,3 --switch ovsk,protocols=OpenFlow13 --mac +${start} sudo mn --controller=remote,ip=${ODL_SYSTEM_IP} --topo=linear,3 --switch ovsk,protocols=OpenFlow13 --mac diff --git a/csit/suites/l2switch/Inventory_Scalability_OF13/010__restconf_inventory.robot b/csit/suites/l2switch/Inventory_Scalability_OF13/010__restconf_inventory.robot index 85a205abcd..7c449abfef 100644 --- a/csit/suites/l2switch/Inventory_Scalability_OF13/010__restconf_inventory.robot +++ b/csit/suites/l2switch/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/l2switch/Inventory_Scalability_OF13/020__restconf_topology.robot b/csit/suites/l2switch/Inventory_Scalability_OF13/020__restconf_topology.robot index 5d8c9b2058..dab8c7db40 100644 --- a/csit/suites/l2switch/Inventory_Scalability_OF13/020__restconf_topology.robot +++ b/csit/suites/l2switch/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/l2switch/Inventory_Scalability_OF13/__init__.robot b/csit/suites/l2switch/Inventory_Scalability_OF13/__init__.robot index cefbd0c6c7..f40b6a1a9d 100644 --- a/csit/suites/l2switch/Inventory_Scalability_OF13/__init__.robot +++ b/csit/suites/l2switch/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/l2switch/Loop_Removal_OF13/010__loop_of_3.robot b/csit/suites/l2switch/Loop_Removal_OF13/010__loop_of_3.robot index 47ddb442d6..06e890016c 100644 --- a/csit/suites/l2switch/Loop_Removal_OF13/010__loop_of_3.robot +++ b/csit/suites/l2switch/Loop_Removal_OF13/010__loop_of_3.robot @@ -89,8 +89,8 @@ Add Port *** Keywords *** Start Suite [Documentation] Open controller session & mininet connection and start mininet custom topo - Create Session session http://${CONTROLLER}:${RESTCONFPORT} auth=${AUTH} headers=${HEADERS_XML} - ${start}= Set Variable sudo mn --controller=remote,ip=${CONTROLLER} --custom customtopo.py --topo ring --switch ovsk,protocols=OpenFlow13 + Create Session session http://${ODL_SYSTEM_IP}:${RESTCONFPORT} auth=${AUTH} headers=${HEADERS_XML} + ${start}= Set Variable sudo mn --controller=remote,ip=${ODL_SYSTEM_IP} --custom customtopo.py --topo ring --switch ovsk,protocols=OpenFlow13 ${mininet_conn_id}= Open Connection ${MININET} prompt=${DEFAULT_LINUX_PROMPT} timeout=30s Set Suite Variable ${mininet_conn_id} Login With Public Key ${MININET_USER} ${USER_HOME}/.ssh/${SSH_KEY} any diff --git a/csit/suites/l2switch/Maximum_Hosts/010__finding_max_hosts.robot b/csit/suites/l2switch/Maximum_Hosts/010__finding_max_hosts.robot index 9d1f6d00d5..917b0e2d49 100644 --- a/csit/suites/l2switch/Maximum_Hosts/010__finding_max_hosts.robot +++ b/csit/suites/l2switch/Maximum_Hosts/010__finding_max_hosts.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 -- 2.36.6