Eliminate CONTROLLER and MININET in BGPCEP suites 25/55725/7
authorAndrej Kilvady <akilvady@cisco.com>
Thu, 20 Apr 2017 11:43:07 +0000 (13:43 +0200)
committerVratko Polák <vrpolak@cisco.com>
Mon, 24 Apr 2017 12:19:37 +0000 (12:19 +0000)
Change-Id: I67743506aa1236fa16260f563b0282bd1a82cfcb
Signed-off-by: Andrej Kilvady <akilvady@cisco.com>
csit/suites/bgpcep/bgpingest/bgp_app_peer_prefixcount.robot
csit/suites/bgpcep/bgpuser/bgp_app_peer_basic.robot
csit/suites/bgpcep/bgpuser/cases.robot
csit/suites/bgpcep/bgpuser/ebgp_peers_basic.robot
csit/suites/bgpcep/bgpuser/ibgp_peer_lsp.robot
csit/suites/bgpcep/bgpuser/ibgp_peer_lsp_Be.robot
csit/suites/bgpcep/bgpuser/ibgp_peers_basic.robot
csit/suites/bgpcep/throughpcep/cases.robot

index e838fe86ca3f97d5d77b21311d446025129a2a5e..58ed8bc124ec811f2dc4ecf7fdaf46ee9d02ff93 100644 (file)
@@ -58,8 +58,8 @@ ${CHECK_PERIOD_APP_PEER_PREFIX_COUNT}    ${CHECK_PERIOD}
 ${REPETITIONS_APP_PEER_PREFIX_COUNT}    1
 ${BGP_PEER_LOG_LEVEL}    info
 ${BGP_APP_PEER_LOG_LEVEL}    info
-${CONTROLLER_LOG_LEVEL}    INFO
-${CONTROLLER_BGP_LOG_LEVEL}    DEFAULT
+${ODL_LOG_LEVEL}    INFO
+${ODL_BGP_LOG_LEVEL}    DEFAULT
 ${BGP_PEER_COMMAND}    python play.py --amount 0 --myip=${TOOLS_SYSTEM_IP} --myport=${BGP_TOOL_PORT} --peerip=${ODL_SYSTEM_IP} --peerport=${ODL_BGP_PORT} --${BGP_PEER_LOG_LEVEL}
 ${BGP_PEER_OPTIONS}    &>bgp_peer.log
 ${BGP_APP_PEER_ID}    10.0.0.10
@@ -212,9 +212,9 @@ Setup_Everything
     Builtin.Set_Suite_Variable    ${bgp_emptying_timeout}    ${bgp_filling_timeout*3.0/4}
     ${result} =    BuiltIn.Evaluate    str(int(${COUNT_APP_PEER_PREFIX_COUNT}) - int(${PREFILL}))
     Builtin.Set_Suite_Variable    ${remaining_prefixes}    ${result}
-    KarafKeywords.Execute_Controller_Karaf_Command_On_Background    log:set ${CONTROLLER_LOG_LEVEL}
-    KarafKeywords.Execute_Controller_Karaf_Command_On_Background    log:set ${CONTROLLER_BGP_LOG_LEVEL} org.opendaylight.bgpcep
-    KarafKeywords.Execute_Controller_Karaf_Command_On_Background    log:set ${CONTROLLER_BGP_LOG_LEVEL} org.opendaylight.protocol
+    KarafKeywords.Execute_Controller_Karaf_Command_On_Background    log:set ${ODL_LOG_LEVEL}
+    KarafKeywords.Execute_Controller_Karaf_Command_On_Background    log:set ${ODL_BGP_LOG_LEVEL} org.opendaylight.bgpcep
+    KarafKeywords.Execute_Controller_Karaf_Command_On_Background    log:set ${ODL_BGP_LOG_LEVEL} org.opendaylight.protocol
     ${script_uri_opt}=    CompareStream.Set_Variable_If_At_Most_Boron    ${Empty}    --uri config/bgp-rib:application-rib/${BGP_APP_PEER_ID}/tables/bgp-types:ipv4-address-family/bgp-types:unicast-subsequent-address-family/
     BuiltIn.Set_Suite_Variable    ${script_uri_opt}
 
index baa54e30b1fc5c9b1291c5eb22d4deb3213ce795..c41fff94c061b622177c5e6b7a306c7309260605 100644 (file)
@@ -76,8 +76,8 @@ ${TOOLS_SYSTEM_PROMPT}    ${DEFAULT_LINUX_PROMPT}
 ${HOLDTIME}       180
 ${BGP_PEER_LOG_LEVEL}    debug
 ${BGP_APP_PEER_LOG_LEVEL}    debug
-${CONTROLLER_LOG_LEVEL}    INFO
-${CONTROLLER_BGP_LOG_LEVEL}    DEFAULT
+${ODL_LOG_LEVEL}    INFO
+${ODL_BGP_LOG_LEVEL}    DEFAULT
 ${BGP_PEER_COMMAND}    python play.py --amount 0 --myip=${TOOLS_SYSTEM_IP} --myport=${BGP_TOOL_PORT} --peerip=${ODL_SYSTEM_IP} --peerport=${ODL_BGP_PORT} --${BGP_PEER_LOG_LEVEL}
 ${BGP_PEER_OPTIONS}    ${EMPTY}
 ${BGP_APP_PEER_ID}    ${ODL_SYSTEM_IP}
@@ -327,9 +327,9 @@ Setup_Everything
     OperatingSystem.Create_Directory    ${ACTUAL_RESPONSES_FOLDER}
     RequestsLibrary.Create_Session    operational    http://${ODL_SYSTEM_IP}:${RESTCONFPORT}${OPERATIONAL_TOPO_API}    auth=${AUTH}
     RequestsLibrary.Create_Session    ${CONFIG_SESSION}    http://${ODL_SYSTEM_IP}:${RESTCONFPORT}    auth=${AUTH}
-    KarafKeywords.Execute_Controller_Karaf_Command_On_Background    log:set ${CONTROLLER_LOG_LEVEL}
-    KarafKeywords.Execute_Controller_Karaf_Command_On_Background    log:set ${CONTROLLER_BGP_LOG_LEVEL} org.opendaylight.bgpcep
-    KarafKeywords.Execute_Controller_Karaf_Command_On_Background    log:set ${CONTROLLER_BGP_LOG_LEVEL} org.opendaylight.protocol
+    KarafKeywords.Execute_Controller_Karaf_Command_On_Background    log:set ${ODL_LOG_LEVEL}
+    KarafKeywords.Execute_Controller_Karaf_Command_On_Background    log:set ${ODL_BGP_LOG_LEVEL} org.opendaylight.bgpcep
+    KarafKeywords.Execute_Controller_Karaf_Command_On_Background    log:set ${ODL_BGP_LOG_LEVEL} org.opendaylight.protocol
     ${scritp_uri_opt}=    CompareStream.Set_Variable_If_At_Most_Boron    ${Empty}    --uri config/bgp-rib:application-rib/${ODL_SYSTEM_IP}/tables/bgp-types:ipv4-address-family/bgp-types:unicast-subsequent-address-family/
     BuiltIn.Set_Suite_Variable    ${scritp_uri_opt}
 
index 14349ea8d28e45282cc8d71145b622008f41fdc3..1e4e103f8e5d63b72610e552b779b6fe0b459dc3 100644 (file)
@@ -52,8 +52,8 @@ ${BGP_VARIABLES_FOLDER}    ${CURDIR}/../../../variables/bgpuser/
 ${TOOLS_SYSTEM_PROMPT}    ${DEFAULT_LINUX_PROMPT}
 ${HOLDTIME}       180
 ${BGP_TOOL_LOG_LEVEL}    info
-${CONTROLLER_LOG_LEVEL}    INFO
-${CONTROLLER_BGP_LOG_LEVEL}    DEFAULT
+${ODL_LOG_LEVEL}    INFO
+${ODL_BGP_LOG_LEVEL}    DEFAULT
 ${CONFIG_SESSION}    session
 ${PROTOCOL_OPENCONFIG}    ${RIB_INSTANCE}
 ${DEVICE_NAME}    controller-config
@@ -233,9 +233,9 @@ Setup_Everything
     SSHKeywords.Assure_Library_Ipaddr    target_dir=.
     SSHLibrary.Put_File    ${CURDIR}/../../../../tools/fastbgp/play.py
     RequestsLibrary.Create_Session    ${CONFIG_SESSION}    http://${ODL_SYSTEM_IP}:${RESTCONFPORT}    auth=${AUTH}
-    KarafKeywords.Execute_Controller_Karaf_Command_On_Background    log:set ${CONTROLLER_LOG_LEVEL}
-    KarafKeywords.Execute_Controller_Karaf_Command_On_Background    log:set ${CONTROLLER_BGP_LOG_LEVEL} org.opendaylight.bgpcep
-    KarafKeywords.Execute_Controller_Karaf_Command_On_Background    log:set ${CONTROLLER_BGP_LOG_LEVEL} org.opendaylight.protocol
+    KarafKeywords.Execute_Controller_Karaf_Command_On_Background    log:set ${ODL_LOG_LEVEL}
+    KarafKeywords.Execute_Controller_Karaf_Command_On_Background    log:set ${ODL_BGP_LOG_LEVEL} org.opendaylight.bgpcep
+    KarafKeywords.Execute_Controller_Karaf_Command_On_Background    log:set ${ODL_BGP_LOG_LEVEL} org.opendaylight.protocol
 
 Teardown_Everything
     [Documentation]    Create and Log the diff between expected and actual responses, make sure Python tool was killed.
index 2411e7e5e10ff0e36fec3c97f614b0afa7a9edfd..a6ecacc15e6712c4d1867e4d613e27cdcc1b7306 100644 (file)
@@ -39,8 +39,8 @@ Resource          ${CURDIR}/../../../libraries/WaitForFailure.robot
 ${BGP_VARIABLES_FOLDER}    ${CURDIR}/../../../variables/bgpuser/
 ${HOLDTIME}       180
 ${BGP_PEER_LOG_LEVEL}    debug
-${CONTROLLER_LOG_LEVEL}    INFO
-${CONTROLLER_BGP_LOG_LEVEL}    DEFAULT
+${ODL_LOG_LEVEL}    INFO
+${ODL_BGP_LOG_LEVEL}    DEFAULT
 ${iBGP_PEER1_IP}    127.0.0.1
 ${eBGP_PEER1_IP}    127.0.0.3
 ${eBGP_PEER2_IP}    127.0.0.4
@@ -211,9 +211,9 @@ Setup_Everything
     SSHLibrary.Put_File    ${CURDIR}/../../../../tools/fastbgp/play.py
     RequestsLibrary.Create_Session    operational    http://${ODL_SYSTEM_IP}:${RESTCONFPORT}${OPERATIONAL_TOPO_API}    auth=${AUTH}
     TemplatedRequests.Create_Default_Session
-    KarafKeywords.Execute_Controller_Karaf_Command_On_Background    log:set ${CONTROLLER_LOG_LEVEL}
-    KarafKeywords.Execute_Controller_Karaf_Command_On_Background    log:set ${CONTROLLER_BGP_LOG_LEVEL} org.opendaylight.bgpcep
-    KarafKeywords.Execute_Controller_Karaf_Command_On_Background    log:set ${CONTROLLER_BGP_LOG_LEVEL} org.opendaylight.protocol
+    KarafKeywords.Execute_Controller_Karaf_Command_On_Background    log:set ${ODL_LOG_LEVEL}
+    KarafKeywords.Execute_Controller_Karaf_Command_On_Background    log:set ${ODL_BGP_LOG_LEVEL} org.opendaylight.bgpcep
+    KarafKeywords.Execute_Controller_Karaf_Command_On_Background    log:set ${ODL_BGP_LOG_LEVEL} org.opendaylight.protocol
 
 Teardown_Everything
     [Documentation]    Create and Log the diff between expected and actual responses, make sure Python tool was killed.
index 20701f447bb1457ddcac1f1c55cbc7e3e0d82def..62e9db79e044fe4091c83e8d95ee0e91d98ece59 100644 (file)
@@ -39,8 +39,8 @@ ${BGP_PEER_OPTIONS}    &>${BGP_PEER_LOG_FILE}
 ${DEFAULT_RIB_CHECK_PERIOD}    1s
 ${DEFAULT_RIB_CHECK_TIMEOUT}    10s
 ${BGP_PEER_LOG_LEVEL}    debug
-${CONTROLLER_LOG_LEVEL}    INFO
-${CONTROLLER_BGP_LOG_LEVEL}    DEFAULT
+${ODL_LOG_LEVEL}    INFO
+${ODL_BGP_LOG_LEVEL}    DEFAULT
 ${JSONKEYSTR}     "linkstate-route"
 ${BGP_PEER_NAME}    example-bgp-peer
 ${DEVICE_NAME}    controller-config
@@ -138,9 +138,9 @@ Setup_Everything
     SSHLibrary.Put_File    ${CURDIR}/../../../../tools/fastbgp/play.py
     RequestsLibrary.Create_Session    operational    http://${ODL_SYSTEM_IP}:${RESTCONFPORT}${OPERATIONAL_API}    auth=${AUTH}
     RequestsLibrary.Create_Session    ${CONFIG_SESSION}    http://${ODL_SYSTEM_IP}:${RESTCONFPORT}    auth=${AUTH}
-    KarafKeywords.Execute_Controller_Karaf_Command_On_Background    log:set ${CONTROLLER_LOG_LEVEL}
-    KarafKeywords.Execute_Controller_Karaf_Command_On_Background    log:set ${CONTROLLER_BGP_LOG_LEVEL} org.opendaylight.bgpcep
-    KarafKeywords.Execute_Controller_Karaf_Command_On_Background    log:set ${CONTROLLER_BGP_LOG_LEVEL} org.opendaylight.protocol
+    KarafKeywords.Execute_Controller_Karaf_Command_On_Background    log:set ${ODL_LOG_LEVEL}
+    KarafKeywords.Execute_Controller_Karaf_Command_On_Background    log:set ${ODL_BGP_LOG_LEVEL} org.opendaylight.bgpcep
+    KarafKeywords.Execute_Controller_Karaf_Command_On_Background    log:set ${ODL_BGP_LOG_LEVEL} org.opendaylight.protocol
 
 Teardown_Everything
     [Documentation]    Create and Log the diff between expected and actual responses, make sure Python tool was killed.
index d625aab836aaa01d3b6cb544a7fb393750964803..20ab33b040ccce4460a79346f7fef030c5cb1502 100644 (file)
@@ -40,8 +40,8 @@ ${BGP_PEER_OPTIONS}    &>${BGP_PEER_LOG_FILE}
 ${DEFAULT_RIB_CHECK_PERIOD}    1s
 ${DEFAULT_RIB_CHECK_TIMEOUT}    10s
 ${BGP_PEER_LOG_LEVEL}    debug
-${CONTROLLER_LOG_LEVEL}    INFO
-${CONTROLLER_BGP_LOG_LEVEL}    DEFAULT
+${ODL_LOG_LEVEL}    INFO
+${ODL_BGP_LOG_LEVEL}    DEFAULT
 ${JSONKEYSTR}     "linkstate-route"
 ${BGP_PEER_NAME}    example-bgp-peer
 ${DEVICE_NAME}    controller-config
@@ -102,9 +102,9 @@ Setup_Everything
     SSHLibrary.Put_File    ${CURDIR}/../../../../tools/fastbgp/play.py
     RequestsLibrary.Create_Session    operational    http://${ODL_SYSTEM_IP}:${RESTCONFPORT}${OPERATIONAL_API}    auth=${AUTH}
     RequestsLibrary.Create_Session    ${CONFIG_SESSION}    http://${ODL_SYSTEM_IP}:${RESTCONFPORT}    auth=${AUTH}
-    KarafKeywords.Execute_Controller_Karaf_Command_On_Background    log:set ${CONTROLLER_LOG_LEVEL}
-    KarafKeywords.Execute_Controller_Karaf_Command_On_Background    log:set ${CONTROLLER_BGP_LOG_LEVEL} org.opendaylight.bgpcep
-    KarafKeywords.Execute_Controller_Karaf_Command_On_Background    log:set ${CONTROLLER_BGP_LOG_LEVEL} org.opendaylight.protocol
+    KarafKeywords.Execute_Controller_Karaf_Command_On_Background    log:set ${ODL_LOG_LEVEL}
+    KarafKeywords.Execute_Controller_Karaf_Command_On_Background    log:set ${ODL_BGP_LOG_LEVEL} org.opendaylight.bgpcep
+    KarafKeywords.Execute_Controller_Karaf_Command_On_Background    log:set ${ODL_BGP_LOG_LEVEL} org.opendaylight.protocol
 
 Teardown_Everything
     [Documentation]    Create and Log the diff between expected and actual responses, make sure Python tool was killed.
index 78695b0cbed2a1aeb8a02d128ad9e11a3053bd26..631eba207770abbe0a3f098030de49455b1a3ecf 100644 (file)
@@ -47,8 +47,8 @@ Resource          ${CURDIR}/../../../libraries/WaitForFailure.robot
 ${BGP_VARIABLES_FOLDER}    ${CURDIR}/../../../variables/bgpuser/
 ${HOLDTIME}       180
 ${BGP_PEER_LOG_LEVEL}    debug
-${CONTROLLER_LOG_LEVEL}    INFO
-${CONTROLLER_BGP_LOG_LEVEL}    DEFAULT
+${ODL_LOG_LEVEL}    INFO
+${ODL_BGP_LOG_LEVEL}    DEFAULT
 ${DEVICE_NAME}    controller-config
 ${BGP_PEER1_IP}    127.0.0.1
 ${BGP_PEER2_IP}    127.0.0.2
@@ -308,9 +308,9 @@ Setup_Everything
     SSHLibrary.Put_File    ${CURDIR}/../../../../tools/fastbgp/play.py
     RequestsLibrary.Create_Session    operational    http://${ODL_SYSTEM_IP}:${RESTCONFPORT}${OPERATIONAL_TOPO_API}    auth=${AUTH}
     RequestsLibrary.Create_Session    ${CONFIG_SESSION}    http://${ODL_SYSTEM_IP}:${RESTCONFPORT}    auth=${AUTH}
-    KarafKeywords.Execute_Controller_Karaf_Command_On_Background    log:set ${CONTROLLER_LOG_LEVEL}
-    KarafKeywords.Execute_Controller_Karaf_Command_On_Background    log:set ${CONTROLLER_BGP_LOG_LEVEL} org.opendaylight.bgpcep
-    KarafKeywords.Execute_Controller_Karaf_Command_On_Background    log:set ${CONTROLLER_BGP_LOG_LEVEL} org.opendaylight.protocol
+    KarafKeywords.Execute_Controller_Karaf_Command_On_Background    log:set ${ODL_LOG_LEVEL}
+    KarafKeywords.Execute_Controller_Karaf_Command_On_Background    log:set ${ODL_BGP_LOG_LEVEL} org.opendaylight.bgpcep
+    KarafKeywords.Execute_Controller_Karaf_Command_On_Background    log:set ${ODL_BGP_LOG_LEVEL} org.opendaylight.protocol
 
 Teardown_Everything
     [Documentation]    Create and Log the diff between expected and actual responses, make sure Python tool was killed.
index c57aed8882fe7da315145283e6d9fa8e0fd76198..96d77298bcea844c48ba0e89191aa02d796587c6 100644 (file)
@@ -49,14 +49,14 @@ Documentation     PCEP performance suite, uses restconf with configurable authen
 ...               In case of failed test case, other tests are skipped (unless
 ...               this is overriden by [Setup]) to finish test run sooner.
 ...
-...               Variables and test case names refer to Controller and Mininet,
-...               those are assumed to be separate remote VMs, one to host ODL,
+...               Variables and test case names refer to Controller(ODL_SYSTEM) and Mininet
+...               (TOOLS_SYSTEM), those are assumed to be separate remote VMs, one to host ODL,
 ...               other to host tools.
 ...               In case updater and pcc-mock are desired to run
-...               from separate machines, their parameters use Mininet
+...               from separate machines, their parameters use Mininet(TOOLS_SYSTEM)
 ...               values as default.
 ...               If both updater VM and pcc-mock VM parameters are specified,
-...               Mininet parameters may be skipped.
+...               Mininet(TOOLS_SYSTEM) parameters may be skipped.
 ...
 ...               Some launch scripts put restrictions on how pybot options
 ...               can be specified, so there are utility variables to help with
@@ -76,44 +76,44 @@ Documentation     PCEP performance suite, uses restconf with configurable authen
 ...               Variables to override (only if needed) in pybot command:
 ...               (Look into Variables table to see the default values.)
 ...
-...               CONTROLLER: Numeric IP address of VM where ODL runs.
-...               CONTROLLER_USER: Username for ssh login to ODL VM.
-...               CONTROLLER_PASSWORD: Ssh password, empty means public keys are used instead.
-...               CONTROLLER_PROMPT: Substring to identify Linux prompt on ODL VM.
-...               CONTROLLER_WORKSPACE: Path to where files can be written on ODL VM.
 ...               FIRST_PCC_IP: Set in case bind address is different from public pcc-mock VM address.
 ...               LOG_NAME: Filename (without path) to save pcc-mock output into.
 ...               LOG_PATH: Override if not the same as pccmock VM workspace.
 ...               LSPS: Number of LSPs per PCC to simulate and test.
-...               TOOLS_SYSTEM_IP: Numeric IP address of VM to run pcc-mock and updater from by default.
-...               TOOLS_SYSTEM_PASSWORD: Linux password to go with the username (empty means keys).
-...               TOOLS_SYSTEM_PROMPT: Substring to identify Linux prompt on Mininet VM.
-...               TOOLS_SYSTEM_USER: Linux username to SSH to on Mininet VM.
-...               MININET_WORKSPACE: Path to where files may be created on Mininet VM.
 ...               MOCK_FILE: Filename to use for mock-pcc executable instead of the timestamped one.
+...               ODL_SYSTEM_IP: Numeric IP address of VM where ODL runs.
+...               ODL_SYSTEM_USER: Username for ssh login to ODL VM.
+...               ODL_SYSTEM_PASSWORD: Ssh password, empty means public keys are used instead.
+...               ODL_SYSTEM_PROMPT: Substring to identify Linux prompt on ODL VM.
+...               ODL_SYSTEM_WORKSPACE: Path to where files can be written on ODL VM.
 ...               PCCDOWNLOAD_HOSTHEADER: Download server may check checks this header before showing content.
 ...               PCCDOWNLOAD_URLBASE: URL to pcep-pcc-mock folder in Nexus (use numberic IP if DNS has problems).
-...               PCCMOCK_COLOCATED: If True, set PCCMOCKVM* to mirror CONTROLLER*
-...               PCCMOCKVM_IP: Override MININET for pcc-mock usage.
-...               PCCMOCKVM_*: Override corresponding MININET_* for pcc-mock usage.
+...               PCCMOCK_COLOCATED: If True, set PCCMOCKVM* to mirror ODL_SYSTEM*
+...               PCCMOCKVM_IP: Override TOOLS_SYSTEM for pcc-mock usage.
+...               PCCMOCKVM_*: Override corresponding TOOLS_SYSTEM_* for pcc-mock usage.
 ...               PCCS: Number of PCCs to simulate and test.
 ...               PCEP_READY_VERIFY_TIMEOUT: Grace period for pcep-topology to appear. Lower if ODL is ready.
 ...               RESTCONF_*: USER, PASSWORD and SCOPE to authenticate with, REUSE session.
 ...               (Note: If SCOPE is not empty, token-based authentication is used.)
-...               UPDATER_COLOCATED: If True, overrides UPDATERVM_* parameters to point at Controller
-...               (The purpose is to provide an option without ability to unpack CONTROLLER value.)
-...               UPDATER_ODLADDRESS: Override if public CONTROLLER address is not best fit.
+...               TOOLS_SYSTEM_IP: Numeric IP address of VM to run pcc-mock and updater from by default.
+...               TOOLS_SYSTEM_PASSWORD: Linux password to go with the username (empty means keys).
+...               TOOLS_SYSTEM_PROMPT: Substring to identify Linux prompt on TOOLS_SYSTEM VM.
+...               TOOLS_SYSTEM_USER: Linux username to SSH to on TOOLS_SYSTEM VM.
+...               TOOLS_SYSTEM_WORKSPACE: Path to where files may be created on TOOLS_SYSTEM VM.
+...               UPDATER_COLOCATED: If True, overrides UPDATERVM_* parameters to point at ODL_SYSTEM
+...               (The purpose is to provide an option without ability to unpack ODL_SYSTEM value.)
+...               UPDATER_ODLADDRESS: Override if public ODL_SYSTEM address is not best fit.
 ...               UPDATER_REFRESH: Main updater thread may sleep this long. Balance precision with overhead.
 ...               UPDATER_TIMEOUT: If updater stops itself if running more than this time.
 ...               (Set this limit according to your performance target.)
 ...               UPDATERVM_ENABLE_TCP_RW_REUSE: Set to false if changing Linux configuration is not desired.
-...               UPDATERVM_IP: Override MININET for updater.py usage.
-...               UPDATERVM_*: Override corresponding MININET_* for updater.py usage.
+...               UPDATERVM_IP: Override TOOLS_SYSTEM for updater.py usage.
+...               UPDATERVM_*: Override corresponding TOOLS_SYSTEM_* for updater.py usage.
 Suite Setup       FailFast.Do_Not_Fail_Fast_From_Now_On
 Suite Teardown    Disconnect
 Test Setup        FailFast.Fail_This_Fast_On_Previous_Error
 Test Teardown     FailFast.Start_Failing_Fast_If_This_Failed
-Variables         ${CURDIR}/../../../variables/Variables.py
+Variables         ${CURDIR}/../../../variables/Variables.robot
 Library           SSHLibrary    timeout=10s
 Library           RequestsLibrary
 Library           ${CURDIR}/../../../libraries/AuthStandalone.py
@@ -126,15 +126,12 @@ Resource          ${CURDIR}/../../../libraries/Utils.robot    # for Flexible_SSH
 # This table acts as an exhaustive list of variables users can modify on pybot invocation.
 # It also contains commented-out lines for variables defined elswhere.
 # Keep this list in alphabetical order.
-${CONTROLLER_WORKSPACE}    /tmp
 ${FIRST_PCC_IP}    ${PCCMOCKVM_IP}
 # ${LOG_FILE} is reserved for location of pybot-created log.html
 ${LOG_NAME}       throughpcep.log
 ${LOG_PATH}       ${PCCMOCKVM_WORKSPACE}
 ${LSPS}           65535
-${MININET}        127.0.0.1
-${MININET_USER}    mininet
-${MININET_WORKSPACE}    /tmp
+${ODL_SYSTEM_WORKSPACE}    /tmp
 ${PCCDOWNLOAD_HOSTHEADER}    nexus.opendaylight.org
 ${PCCDOWNLOAD_URLBASE}    http://${PCCDOWNLOAD_HOSTHEADER}/content/repositories/opendaylight.snapshot/org/opendaylight/bgpcep/pcep-pcc-mock/
 ${PCCMOCK_COLOCATED}    False
@@ -142,7 +139,7 @@ ${PCCMOCKVM_IP}    ${TOOLS_SYSTEM_IP}
 ${PCCMOCKVM_PASSWORD}    ${TOOLS_SYSTEM_PASSWORD}
 ${PCCMOCKVM_PROMPT}    ${TOOLS_SYSTEM_PROMPT}
 ${PCCMOCKVM_USER}    ${TOOLS_SYSTEM_USER}
-${PCCMOCKVM_WORKSPACE}    ${MININET_WORKSPACE}
+${PCCMOCKVM_WORKSPACE}    ${TOOLS_SYSTEM_WORKSPACE}
 ${PCCS}           1
 ${PCEP_READY_VERIFY_TIMEOUT}    300s
 # Yes, the default timeout is 5 minutes, as this suite might be started eagerly just after ODL starts booting up.
@@ -150,6 +147,7 @@ ${RESTCONF_PASSWORD}    ${PWD}    # from Variables.py
 ${RESTCONF_REUSE}    True
 ${RESTCONF_SCOPE}    ${EMPTY}
 ${RESTCONF_USER}    ${USER}    # from Variables.py
+${TOOLS_SYSTEM_WORKSPACE}    /tmp
 ${UPDATER_COLOCATED}    False
 ${UPDATER_ODLADDRESS}    ${ODL_SYSTEM_IP}
 ${UPDATER_REFRESH}    0.1
@@ -158,8 +156,8 @@ ${UPDATERVM_ENABLE_TCP_RW_REUSE}    True
 ${UPDATERVM_IP}    ${TOOLS_SYSTEM_IP}
 ${UPDATERVM_PASSWORD}    ${TOOLS_SYSTEM_PASSWORD}
 ${UPDATERVM_PROMPT}    ${TOOLS_SYSTEM_PROMPT}
-${UPDATERVM_USER}    ${MININET_USER}
-${UPDATERVM_WORKSPACE}    ${MININET_WORKSPACE}
+${UPDATERVM_USER}    ${TOOLS_SYSTEM_USER}
+${UPDATERVM_WORKSPACE}    ${TOOLS_SYSTEM_WORKSPACE}
 
 *** TestCases ***
 Download_Pcc_Mock
@@ -371,20 +369,20 @@ Restore_Tcp_Rw_Reuse
     BuiltIn.Should_Be_Equal    ${rc}    ${0}
 
 *** Keywords ***
-Pccmock_From_Controller
-    [Documentation]    Copy Controller values to Pccmock VM variables.
+Pccmock_From_Odl_System
+    [Documentation]    Copy Odl_System values to Pccmock VM variables.
     BuiltIn.Set_Suite_Variable    ${PCCMOCKVM_IP}    ${ODL_SYSTEM_IP}
     BuiltIn.Set_Suite_Variable    ${PCCMOCKVM_PASSWORD}    ${ODL_SYSTEM_PASSWORD}
     BuiltIn.Set_Suite_Variable    ${PCCMOCKVM_PROMPT}    ${ODL_SYSTEM_PROMPT}
-    BuiltIn.Set_Suite_Variable    ${PCCMOCKVM_WORKSPACE}    ${CONTROLLER_WORKSPACE}
-    BuiltIn.Set_Suite_Variable    ${LOG_PATH}    ${CONTROLLER_WORKSPACE}
+    BuiltIn.Set_Suite_Variable    ${PCCMOCKVM_WORKSPACE}    ${ODL_SYSTEM_WORKSPACE}
+    BuiltIn.Set_Suite_Variable    ${LOG_PATH}    ${ODL_SYSTEM_WORKSPACE}
 
-Updater_From_Controller
-    [Documentation]    Copy Controller values to Uprater VM variables.
+Updater_From_Odl_System
+    [Documentation]    Copy Odl_System values to Uprater VM variables.
     BuiltIn.Set_Suite_Variable    ${UPDATERVM_IP}    ${ODL_SYSTEM_IP}
     BuiltIn.Set_Suite_Variable    ${UPDATERVM_PASSWORD}    ${ODL_SYSTEM_PASSWORD}
     BuiltIn.Set_Suite_Variable    ${UPDATERVM_PROMPT}    ${ODL_SYSTEM_PROMPT}
-    BuiltIn.Set_Suite_Variable    ${UPDATERVM_WORKSPACE}    ${CONTROLLER_WORKSPACE}
+    BuiltIn.Set_Suite_Variable    ${UPDATERVM_WORKSPACE}    ${ODL_SYSTEM_WORKSPACE}
 
 Disconnect
     [Documentation]    Explicitly close all SSH connections.