From 8f955f582899c99789df79e8ee993e78f10ca447 Mon Sep 17 00:00:00 2001 From: Deepak Date: Sun, 31 Jan 2016 19:47:05 +0530 Subject: [PATCH] Replace deprecated variables in suites/controller (2). + MININET -> TOOLS_SYSTEM_IP + MININET_USER -> TOOLS_SYSTEM_USER + MININET_PASSWORD -> TOOLS_SYSTEM_PASSWORD + MININET_PROMPT -> TOOLS_SYSTEM_PROMPT Change-Id: I7e1399863549a24f824f2c51a59b490e983e4a0a Signed-off-by: Deepak --- csit/suites/controller/NETCONF/010__netconf_inventory.robot | 4 ++-- .../controller/OneNode_Datastore/010_crud_mdsal_perf.robot | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/csit/suites/controller/NETCONF/010__netconf_inventory.robot b/csit/suites/controller/NETCONF/010__netconf_inventory.robot index 8bdccb3c84..2749e1779c 100644 --- a/csit/suites/controller/NETCONF/010__netconf_inventory.robot +++ b/csit/suites/controller/NETCONF/010__netconf_inventory.robot @@ -10,8 +10,8 @@ Library ../../../libraries/Common.py Variables ../../../variables/Variables.py *** Variables *** -${NETOPEER} ${MININET} -${NETOPEER_USER} ${MININET_USER} +${NETOPEER} ${TOOLS_SYSTEM_IP} +${NETOPEER_USER} ${TOOLS_SYSTEM_USER} ${FILE} ${CURDIR}/../../../variables/xmls/netconf.xml ${REST_CONT_CONF} /restconf/config/network-topology:network-topology/topology/topology-netconf ${REST_CONT_OPER} /restconf/operational/network-topology:network-topology/topology/topology-netconf diff --git a/csit/suites/controller/OneNode_Datastore/010_crud_mdsal_perf.robot b/csit/suites/controller/OneNode_Datastore/010_crud_mdsal_perf.robot index 07c3ae3c9f..b47aa14977 100644 --- a/csit/suites/controller/OneNode_Datastore/010_crud_mdsal_perf.robot +++ b/csit/suites/controller/OneNode_Datastore/010_crud_mdsal_perf.robot @@ -104,9 +104,9 @@ Start Suite [Documentation] Suite setup keyword SetupUtils.Setup_Utils_For_Setup_And_Teardown KarafKeywords.Execute_Controller_Karaf_Command_On_Background log:set ${CONTROLLER_LOG_LEVEL} - ${mininet_conn_id}= SSHLibrary.Open Connection ${MININET} prompt=${DEFAULT_LINUX_PROMPT} timeout=6s + ${mininet_conn_id}= SSHLibrary.Open Connection ${TOOLS_SYSTEM_IP} prompt=${DEFAULT_LINUX_PROMPT} timeout=6s Builtin.Set Suite Variable ${mininet_conn_id} - Utils.Flexible Mininet Login ${MININET_USER} + Utils.Flexible Mininet Login ${TOOLS_SYSTEM_USER} SSHLibrary.Put File ${CURDIR}/../../../../tools/odl-mdsal-clustering-tests/scripts/cluster_rest_script.py . ${stdout} ${stderr} ${rc}= SSHLibrary.Execute Command ls return_stdout=True return_stderr=True ... return_rc=True -- 2.36.6