Replace deprecated variables in suites/iotdm (1).

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

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

diff --git a/csit/suites/iotdm/basic/010_Restconf_OK.robot b/csit/suites/iotdm/basic/010_Restconf_OK.robot
index 9efa093fc36cd6327e8020bd4aeb86658b48d4d0..16420fc01914ec1685d9b6d09da42877d656312f 100644 (file)
--- a/csit/suites/iotdm/basic/010_Restconf_OK.robot
+++ b/csit/suites/iotdm/basic/010_Restconf_OK.robot
@@ -1,6 +1,6 @@
 *** Settings ***
 Documentation     Test suite to verify Restconf is OK
-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           RequestsLibrary
 Library           ../../../libraries/Common.py

diff --git a/csit/suites/iotdm/basic/030_LayerTest.robot b/csit/suites/iotdm/basic/030_LayerTest.robot
index 1dbe6a5bcbaecfb132887f1dd593f12a6092d55e..010ba0cdbdc44723e4ad4d5385a395f9dea2c01c 100644 (file)
--- a/csit/suites/iotdm/basic/030_LayerTest.robot
+++ b/csit/suites/iotdm/basic/030_LayerTest.robot
@@ -1,11 +1,11 @@
 *** Settings ***
 Documentation     Test for layers AE/CONTAINER/CONTENTINSTANCE
-Suite Teardown    Kill The Tree    ${CONTROLLER}    InCSE1    admin    admin
+Suite Teardown    Kill The Tree    ${ODL_SYSTEM_IP}    InCSE1    admin    admin
 Library           ../../../libraries/criotdm.py
 Library           Collections
 
 *** Variables ***
-${httphost}       ${CONTROLLER}
+${httphost}       ${ODL_SYSTEM_IP}
 ${httpuser}       admin
 ${httppass}       admin
 ${rt_ae}          2

diff --git a/csit/suites/iotdm/basic/040_AEAttributeTest.robot b/csit/suites/iotdm/basic/040_AEAttributeTest.robot
index 0260055d1e002f6a9ebaf62e1da92ebd5083cfaa..6b02a85079c7b3d18e5900984014deebe2302a67 100644 (file)
--- a/csit/suites/iotdm/basic/040_AEAttributeTest.robot
+++ b/csit/suites/iotdm/basic/040_AEAttributeTest.robot
@@ -1,10 +1,10 @@
 *** Settings ***
-Suite Teardown    Kill The Tree    ${CONTROLLER}    InCSE1    admin    admin
+Suite Teardown    Kill The Tree    ${ODL_SYSTEM_IP}    InCSE1    admin    admin
 Library           ../../../libraries/criotdm.py
 Library           Collections
 
 *** Variables ***
-${httphost}       ${CONTROLLER}
+${httphost}       ${ODL_SYSTEM_IP}
 ${httpuser}       admin
 ${httppass}       admin
 ${rt_ae}          2

diff --git a/csit/suites/iotdm/basic/050_ContainerAttributeTest.robot b/csit/suites/iotdm/basic/050_ContainerAttributeTest.robot
index d8ade1d5c25ff45fa4c034900988fb3417d7b592..7dece440f237e73a4291d3ada87c2a9510f66c16 100644 (file)
--- a/csit/suites/iotdm/basic/050_ContainerAttributeTest.robot
+++ b/csit/suites/iotdm/basic/050_ContainerAttributeTest.robot
@@ -1,10 +1,10 @@
 *** Settings ***
-Suite Teardown    Kill The Tree    ${CONTROLLER}    InCSE1    admin    admin
+Suite Teardown    Kill The Tree    ${ODL_SYSTEM_IP}    InCSE1    admin    admin
 Library           ../../../libraries/criotdm.py
 Library           Collections
 
 *** Variables ***
-${httphost}       ${CONTROLLER}
+${httphost}       ${ODL_SYSTEM_IP}
 ${httpuser}       admin
 ${httppass}       admin
 ${rt_ae}          2

diff --git a/csit/suites/iotdm/basic/060_ConInAttributeTest.robot b/csit/suites/iotdm/basic/060_ConInAttributeTest.robot
index 39d7a4dac7eb16f80ac14cf5f4e4eeb5badd8998..8d5c5c8a938f95904e69eb212a390ae9e56b9b0d 100644 (file)
--- a/csit/suites/iotdm/basic/060_ConInAttributeTest.robot
+++ b/csit/suites/iotdm/basic/060_ConInAttributeTest.robot
@@ -1,10 +1,10 @@
 *** Settings ***
-Suite Teardown    Kill The Tree    ${CONTROLLER}    InCSE1    admin    admin
+Suite Teardown    Kill The Tree    ${ODL_SYSTEM_IP}    InCSE1    admin    admin
 Library           ../../../libraries/criotdm.py
 Library           Collections
 
 *** Variables ***
-${httphost}       ${CONTROLLER}
+${httphost}       ${ODL_SYSTEM_IP}
 ${httpuser}       admin
 ${httppass}       admin
 ${rt_ae}          2

diff --git a/csit/suites/iotdm/basic/070_DeleteTest.robot b/csit/suites/iotdm/basic/070_DeleteTest.robot
index 5b14d0660edded1dd1ca2ca85df18caae40e11dc..fb634b6438c8fb23aaf02a6858f8b4be0bf10929 100644 (file)
--- a/csit/suites/iotdm/basic/070_DeleteTest.robot
+++ b/csit/suites/iotdm/basic/070_DeleteTest.robot
@@ -1,10 +1,10 @@
 *** Settings ***
-Suite Teardown    Kill The Tree    ${CONTROLLER}    InCSE1    admin    admin
+Suite Teardown    Kill The Tree    ${ODL_SYSTEM_IP}    InCSE1    admin    admin
 Library           ../../../libraries/criotdm.py
 Library           Collections
 
 *** Variables ***
-${httphost}       ${CONTROLLER}
+${httphost}       ${ODL_SYSTEM_IP}
 ${httpuser}       admin
 ${httppass}       admin
 ${rt_ae}          2

diff --git a/csit/suites/iotdm/basic/080_FilterCriteriaTest.robot b/csit/suites/iotdm/basic/080_FilterCriteriaTest.robot
index f93ee8bbd3933aa93f5201745050162d1450da69..ea8af703452844dd076a71c677850a9728c14625 100644 (file)
--- a/csit/suites/iotdm/basic/080_FilterCriteriaTest.robot
+++ b/csit/suites/iotdm/basic/080_FilterCriteriaTest.robot
@@ -1,11 +1,11 @@
 *** Settings ***
 Suite Setup       Connect And Create The Tree
-Suite Teardown    Kill The Tree    ${CONTROLLER}    InCSE1    admin    admin
+Suite Teardown    Kill The Tree    ${ODL_SYSTEM_IP}    InCSE1    admin    admin
 Library           ../../../libraries/criotdm.py
 Library           Collections
 
 *** Variables ***
-${httphost}       ${CONTROLLER}
+${httphost}       ${ODL_SYSTEM_IP}
 ${httpuser}       admin
 ${httppass}       admin
 ${rt_ae}          2
@@ -80,7 +80,7 @@ Set Suite Variable
     \    Should Contain    ${error}    rcn
 
 Delete the tree
-    Kill The Tree    ${CONTROLLER}    InCSE1    admin    admin
+    Kill The Tree    ${ODL_SYSTEM_IP}    InCSE1    admin    admin
     #==================================================
     #    FilterCriteria Test
     #==================================================