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

diff --git a/csit/suites/controller/NETCONF/010__netconf_inventory.robot b/csit/suites/controller/NETCONF/010__netconf_inventory.robot
index 8bdccb3c8480da175a92d38b466112bf99350db9..2749e1779c4d3f854bc80f7f3356ac4ada5a9292 100644 (file)
--- 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 07c3ae3c9fde9a4f607e38ff926420bf2d06cd88..b47aa14977ac7bc5fb91b5c914e5eec61a61d4a4 100644 (file)
--- 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