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 <deepak.mk17@gmail.com>

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 c6937e8eefa5acfa3c6666b64a2f2a4dad599acd..39be604fba6b0b32abcbc11e48a388e9059739d6 100644 (file)
--- 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 e260e723923db5b49ccf9421c0e64f16300903c2..9cc5857e0aac11c91ade50dd265d7efc5cac1bec 100644 (file)
--- 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 d2b61e4c230d86e35a3c71838da92f5056146914..aff53fdcd6729e14e643aa5ca12234f340eaa7e2 100644 (file)
--- 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 be5563a380fcbca24244ee578fc3a36bfba542ea..1a9faa84cc8b56fd79c49913dad723c31b873a62 100644 (file)
--- 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 9ec10bfae112d90dd52ec2de0bd908656b53a7c2..c3673b573c83402c335905d6045347bc1dc2c161 100644 (file)
--- 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 8022db33d02f16d37fd73e6ba94815c06a8a285e..96664e59c24ee3e73d363ef19f058ce7a4c68ae1 100644 (file)
--- 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 85a205abcdef97c665d2899a2072209be1f48da6..7c449abfef668a666f6f6c4ff241be6efc08f9e9 100644 (file)
--- 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 5d8c9b20581ec1621c579be9cacb0c4ea57ca3e7..dab8c7db407b1d62ced67f8b5db20da1cad9b53e 100644 (file)
--- 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 cefbd0c6c7d62294b5734ceb4d6ae47283af0239..f40b6a1a9d978fd1166813f581ca058accac4613 100644 (file)
--- 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 47ddb442d6c177f2ef08e89e529a64d81743229d..06e890016c4fcd80364be0699c2bec1acffe8357 100644 (file)
--- 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 9d1f6d00d5944ff329a630dea42976a69754ab5f..917b0e2d490be37f1b74557ae65bbb3389f20381 100644 (file)
--- 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