From 27345c85940ca6e36bc37610a818c959a6a10d27 Mon Sep 17 00:00:00 2001 From: Deepak Date: Sun, 31 Jan 2016 19:52:00 +0530 Subject: [PATCH] Replace deprecated variables in suites/l2switch (2). + MININET -> TOOLS_SYSTEM_IP + MININET_USER -> TOOLS_SYSTEM_USER + MININET_PASSWORD -> TOOLS_SYSTEM_PASSWORD + MININET_PROMPT -> TOOLS_SYSTEM_PROMPT Change-Id: Ia7da401ae1e61f3c67052cf02a623334b3907408 Signed-off-by: Deepak --- .../suites/l2switch/Inventory_Scalability_OF13/__init__.robot | 4 ++-- csit/suites/l2switch/Loop_Removal_OF13/010__loop_of_3.robot | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/csit/suites/l2switch/Inventory_Scalability_OF13/__init__.robot b/csit/suites/l2switch/Inventory_Scalability_OF13/__init__.robot index f40b6a1a9d..a4a8153300 100644 --- a/csit/suites/l2switch/Inventory_Scalability_OF13/__init__.robot +++ b/csit/suites/l2switch/Inventory_Scalability_OF13/__init__.robot @@ -15,8 +15,8 @@ Start Suite ${TOPO_TREE_DEPTH} Convert To Integer ${TOPO_TREE_DEPTH} ${TOPO_TREE_FANOUT} Convert To Integer ${TOPO_TREE_FANOUT} ${numnodes} Num Of Nodes ${TOPO_TREE_DEPTH} ${TOPO_TREE_FANOUT} - Open Connection ${MININET} prompt=> timeout=${numnodes*3} - Login With Public Key ${MININET_USER} ${USER_HOME}/.ssh/${SSH_KEY} any + Open Connection ${TOOLS_SYSTEM_IP} prompt=> timeout=${numnodes*3} + Login With Public Key ${TOOLS_SYSTEM_USER} ${USER_HOME}/.ssh/${SSH_KEY} any Write sudo ovs-vsctl set-manager ptcp:6644 Read Until > Write sudo mn -c 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 06e890016c..56277fc98b 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 @@ -91,9 +91,9 @@ Start Suite [Documentation] Open controller session & mininet connection and start mininet custom topo 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 + ${mininet_conn_id}= Open Connection ${TOOLS_SYSTEM_IP} prompt=${DEFAULT_LINUX_PROMPT} timeout=30s Set Suite Variable ${mininet_conn_id} - Login With Public Key ${MININET_USER} ${USER_HOME}/.ssh/${SSH_KEY} any + Login With Public Key ${TOOLS_SYSTEM_USER} ${USER_HOME}/.ssh/${SSH_KEY} any Put File ${CURDIR}/../topologies/customtopo.py Execute Command sudo ovs-vsctl set-manager ptcp:6644 Execute Command sudo mn -c -- 2.36.6