Replace deprecated variables in suites/controller (1).

+ CONTROLLER -> ODL_SYSTEM_IP
+ CONTROLLER1 -> ODL_SYSTEM_2_IP
+ CONTROLLER2 -> ODL_SYSTEM_3_IP

Change-Id: I566022374a993f72fb63195f5c070d26ecf038bf
Signed-off-by: Deepak <deepak.mk17@gmail.com>

diff --git a/csit/suites/controller/Clustering_Datastore/001_start_cluster.robot b/csit/suites/controller/Clustering_Datastore/001_start_cluster.robot
index aaad93aafa9f36f23293ceaeaf364a71c76d09f7..1a3eca67bd7d7ce6fd4bc1436218d405dc79b6d5 100644 (file)
--- a/csit/suites/controller/Clustering_Datastore/001_start_cluster.robot
+++ b/csit/suites/controller/Clustering_Datastore/001_start_cluster.robot
@@ -4,7 +4,7 @@ Default Tags      3-node-cluster
 Resource          ../../../libraries/ClusterKeywords.robot
 
 *** Variables ***
-@{controllers}    ${CONTROLLER}    ${CONTROLLER1}    ${CONTROLLER2}
+@{controllers}    ${ODL_SYSTEM_IP}    ${ODL_SYSTEM_2_IP}    ${ODL_SYSTEM_3_IP}
 ${KARAF_HOME}     ${WORKSPACE}/${BUNDLEFOLDER}
 ${START_TIMEOUT}    300s
 ${STOP_TIMEOUT}    180s

diff --git a/csit/suites/controller/Clustering_Datastore/050_car_persistence_recovery.robot b/csit/suites/controller/Clustering_Datastore/050_car_persistence_recovery.robot
index fde39ab3868ae02da163c91991ca0e43cea300ae..259425f708d36d8e3d911e085d089275281d3ffa 100644 (file)
--- a/csit/suites/controller/Clustering_Datastore/050_car_persistence_recovery.robot
+++ b/csit/suites/controller/Clustering_Datastore/050_car_persistence_recovery.robot
@@ -9,7 +9,7 @@ Variables         ../../../variables/Variables.py
 ${CAR_SHARD}      shard-car-config
 ${NUM_CARS}       ${50}
 ${KARAF_HOME}     ${WORKSPACE}/${BUNDLEFOLDER}
-@{controllers}    ${CONTROLLER}    ${CONTROLLER1}    ${CONTROLLER2}
+@{controllers}    ${ODL_SYSTEM_IP}    ${ODL_SYSTEM_2_IP}    ${ODL_SYSTEM_3_IP}
 ${START_TIMEOUT}    300s
 ${STOP_TIMEOUT}    180s
 

diff --git a/csit/suites/controller/Clustering_Datastore/140_recovery_restart_follower.robot b/csit/suites/controller/Clustering_Datastore/140_recovery_restart_follower.robot
index d92e88675c434f88e6910312da4265bc117e6af3..8a9a3130819b417f542ccceb45db7e54bd8f7be6 100644 (file)
--- a/csit/suites/controller/Clustering_Datastore/140_recovery_restart_follower.robot
+++ b/csit/suites/controller/Clustering_Datastore/140_recovery_restart_follower.robot
@@ -11,7 +11,7 @@ Variables         ../../../variables/Variables.py
 *** Variables ***
 ${CAR_SHARD}      shard-car-config
 ${NUM_CARS}       ${60}
-@{controllers}    ${CONTROLLER}    ${CONTROLLER1}    ${CONTROLLER2}
+@{controllers}    ${ODL_SYSTEM_IP}    ${ODL_SYSTEM_2_IP}    ${ODL_SYSTEM_3_IP}
 ${KARAF_HOME}     ${WORKSPACE}/${BUNDLEFOLDER}
 ${START_TIMEOUT}    300s
 ${STOP_TIMEOUT}    180s

diff --git a/csit/suites/controller/Clustering_Datastore/999_cleanup.robot b/csit/suites/controller/Clustering_Datastore/999_cleanup.robot
index 4a78cd908a84e17046201c6454deea58a7439d51..667b425e599c45d2e4a1d4acd6eb6253a14715ac 100644 (file)
--- a/csit/suites/controller/Clustering_Datastore/999_cleanup.robot
+++ b/csit/suites/controller/Clustering_Datastore/999_cleanup.robot
@@ -6,7 +6,7 @@ Library           ../../../libraries/UtilLibrary.py
 Variables         ../../../variables/Variables.py
 
 *** Variables ***
-@{controllers}    ${CONTROLLER}    ${CONTROLLER1}    ${CONTROLLER2}
+@{controllers}    ${ODL_SYSTEM_IP}    ${ODL_SYSTEM_2_IP}    ${ODL_SYSTEM_3_IP}
 ${KARAF_HOME}     ${WORKSPACE}/${BUNDLEFOLDER}
 
 *** Test Cases ***

diff --git a/csit/suites/controller/Clustering_Routedrpc/001_start_cluster.robot b/csit/suites/controller/Clustering_Routedrpc/001_start_cluster.robot
index 5cbd3d65ab9bb066d58a55167a8efb0c073611fd..69f2ece2c9410c495ff2967d225145b06fee272c 100644 (file)
--- a/csit/suites/controller/Clustering_Routedrpc/001_start_cluster.robot
+++ b/csit/suites/controller/Clustering_Routedrpc/001_start_cluster.robot
@@ -4,7 +4,7 @@ Default Tags      3-node-cluster
 Resource          ../../../libraries/ClusterKeywords.robot
 
 *** Variables ***
-@{controllers}    ${CONTROLLER}    ${CONTROLLER1}    ${CONTROLLER2}
+@{controllers}    ${ODL_SYSTEM_IP}    ${ODL_SYSTEM_2_IP}    ${ODL_SYSTEM_3_IP}
 ${KARAF_HOME}     ${WORKSPACE}/${BUNDLEFOLDER}
 
 *** Test Cases ***

diff --git a/csit/suites/controller/Clustering_Routedrpc/023_routed_rpc_crud_test.robot b/csit/suites/controller/Clustering_Routedrpc/023_routed_rpc_crud_test.robot
index 727b1d28d4ad642dad9467bd45138bf228484b32..087d9fd13032a5690ba1e09dfefd473f67a5cf45 100644 (file)
--- a/csit/suites/controller/Clustering_Routedrpc/023_routed_rpc_crud_test.robot
+++ b/csit/suites/controller/Clustering_Routedrpc/023_routed_rpc_crud_test.robot
@@ -8,7 +8,7 @@ Resource          ../../../libraries/CarsAndPeople.robot
 Variables         ../../../variables/Variables.py
 
 *** Variables ***
-@{controllers}    ${CONTROLLER}    ${CONTROLLER1}    ${CONTROLLER2}
+@{controllers}    ${ODL_SYSTEM_IP}    ${ODL_SYSTEM_2_IP}    ${ODL_SYSTEM_3_IP}
 ${SHARD_CAR_NAME}    shard-car-config
 ${SHARD_PEOPLE_NAME}    shard-people-config
 ${SHARD_CAR_PERSON_NAME}    shard-car-people-config

diff --git a/csit/suites/controller/NETCONF/010__netconf_inventory.robot b/csit/suites/controller/NETCONF/010__netconf_inventory.robot
index d14ee22ff9dee5620c61ad8b426bd59ed89134e4..8bdccb3c8480da175a92d38b466112bf99350db9 100644 (file)
--- a/csit/suites/controller/NETCONF/010__netconf_inventory.robot
+++ b/csit/suites/controller/NETCONF/010__netconf_inventory.robot
@@ -1,6 +1,6 @@
 *** Settings ***
 Documentation     Test suite for NETCONF client
-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           OperatingSystem

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 81c754486cdbcef2d5eba2818ca7eb61b5d375e2..07c3ae3c9fde9a4f607e38ff926420bf2d06cd88 100644 (file)
--- a/csit/suites/controller/OneNode_Datastore/010_crud_mdsal_perf.robot
+++ b/csit/suites/controller/OneNode_Datastore/010_crud_mdsal_perf.robot
@@ -28,9 +28,9 @@ Resource          ../../../libraries/SetupUtils.robot
 ${ITEM_COUNT}     ${10000}
 ${ITEM_BATCH}     ${10000}
 ${PROCEDURE_TIMEOUT}    5m
-${addcarcmd}      python cluster_rest_script.py --host ${CONTROLLER} --port ${RESTCONFPORT} add --itemtype car --itemcount ${ITEM_COUNT} --ipr ${ITEM_BATCH}
-${addpeoplecmd}    python cluster_rest_script.py --host ${CONTROLLER} --port ${RESTCONFPORT} add --itemtype people --itemcount ${ITEM_COUNT} --ipr ${ITEM_BATCH}
-${purchasecmd}    python cluster_rest_script.py --host ${CONTROLLER} --port ${RESTCONFPORT} add-rpc --itemtype car-people --itemcount ${ITEM_COUNT} --threads 5
+${addcarcmd}      python cluster_rest_script.py --host ${ODL_SYSTEM_IP} --port ${RESTCONFPORT} add --itemtype car --itemcount ${ITEM_COUNT} --ipr ${ITEM_BATCH}
+${addpeoplecmd}    python cluster_rest_script.py --host ${ODL_SYSTEM_IP} --port ${RESTCONFPORT} add --itemtype people --itemcount ${ITEM_COUNT} --ipr ${ITEM_BATCH}
+${purchasecmd}    python cluster_rest_script.py --host ${ODL_SYSTEM_IP} --port ${RESTCONFPORT} add-rpc --itemtype car-people --itemcount ${ITEM_COUNT} --threads 5
 ${carurl}         /restconf/config/car:cars
 ${peopleurl}      /restconf/config/people:people
 ${carpeopleurl}    /restconf/config/car-people:car-people
@@ -110,7 +110,7 @@ Start Suite
     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
-    RequestsLibrary.Create Session    session    http://${CONTROLLER}:${RESTCONFPORT}    auth=${AUTH}
+    RequestsLibrary.Create Session    session    http://${ODL_SYSTEM_IP}:${RESTCONFPORT}    auth=${AUTH}
 
 Stop Suite
     [Documentation]    Suite teardown keyword