From 386a0c754b69e3434970d06eb3177168baa2d0f1 Mon Sep 17 00:00:00 2001 From: Deepak Date: Fri, 29 Jan 2016 04:56:03 +0530 Subject: [PATCH] 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 --- csit/suites/iotdm/basic/010_Restconf_OK.robot | 2 +- csit/suites/iotdm/basic/030_LayerTest.robot | 4 ++-- csit/suites/iotdm/basic/040_AEAttributeTest.robot | 4 ++-- csit/suites/iotdm/basic/050_ContainerAttributeTest.robot | 4 ++-- csit/suites/iotdm/basic/060_ConInAttributeTest.robot | 4 ++-- csit/suites/iotdm/basic/070_DeleteTest.robot | 4 ++-- csit/suites/iotdm/basic/080_FilterCriteriaTest.robot | 6 +++--- 7 files changed, 14 insertions(+), 14 deletions(-) diff --git a/csit/suites/iotdm/basic/010_Restconf_OK.robot b/csit/suites/iotdm/basic/010_Restconf_OK.robot index 9efa093fc3..16420fc019 100644 --- 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 1dbe6a5bcb..010ba0cdbd 100644 --- 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 0260055d1e..6b02a85079 100644 --- 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 d8ade1d5c2..7dece440f2 100644 --- 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 39d7a4dac7..8d5c5c8a93 100644 --- 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 5b14d0660e..fb634b6438 100644 --- 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 f93ee8bbd3..ea8af70345 100644 --- 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 #================================================== -- 2.36.6