From 5a90eb869495ae726e2c8db2adbe9d28995902bd Mon Sep 17 00:00:00 2001
From: Deepak <deepak.mk17@gmail.com>
Date: Fri, 29 Jan 2016 04:50:02 +0530
Subject: [PATCH] Replace deprecated variables in suites/vtn (1).

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

Change-Id: I74766518606fc6bd38e04e3139c798fd73b48fb0
Signed-off-by: Deepak <deepak.mk17@gmail.com>
---
 csit/suites/vtn/VTN_C_OF10/020__vtn_vbrif_portmap.robot    | 2 +-
 csit/suites/vtn/VTN_C_OF10/030__verify_switch.robot        | 2 +-
 csit/suites/vtn/VTN_C_OF10/040__vtn_vbrif_audit.robot      | 2 +-
 csit/suites/vtn/VTN_C_OF10/050__vtn_vbr_flowfilter.robot   | 2 +-
 csit/suites/vtn/VTN_C_OF10/060__vtn_vbrif_flowfilter.robot | 2 +-
 csit/suites/vtn/VTN_C_OF10/070__vtn_flowfilter.robot       | 2 +-
 csit/suites/vtn/VTN_C_OF10/080__vlan_vtn.robot             | 2 +-
 csit/suites/vtn/VTN_C_OF10/__init__.robot                  | 2 +-
 csit/suites/vtn/VTN_C_OF13/020__vtn_vbrif_portmap.robot    | 2 +-
 csit/suites/vtn/VTN_C_OF13/030__verify_switch.robot        | 2 +-
 csit/suites/vtn/VTN_C_OF13/040__vtn_vbrif_audit.robot      | 2 +-
 csit/suites/vtn/VTN_C_OF13/050__vtn_vbr_flowfilter.robot   | 2 +-
 csit/suites/vtn/VTN_C_OF13/060__vtn_vbrif_flowfilter.robot | 2 +-
 csit/suites/vtn/VTN_C_OF13/070__vtn_flowfilter.robot       | 2 +-
 csit/suites/vtn/VTN_C_OF13/__init__.robot                  | 2 +-
 csit/suites/vtn/VTN_Mgr_OF10/__init__.robot                | 2 +-
 csit/suites/vtn/VTN_Mgr_OF10_Li/__init__.robot             | 2 +-
 csit/suites/vtn/VTN_Mgr_OF13/__init__.robot                | 2 +-
 csit/suites/vtn/VTN_Mgr_OF13_Li/__init__.robot             | 2 +-
 19 files changed, 19 insertions(+), 19 deletions(-)

diff --git a/csit/suites/vtn/VTN_C_OF10/020__vtn_vbrif_portmap.robot b/csit/suites/vtn/VTN_C_OF10/020__vtn_vbrif_portmap.robot
index cdf114a3fd..ecd9168f3c 100644
--- a/csit/suites/vtn/VTN_C_OF10/020__vtn_vbrif_portmap.robot
+++ b/csit/suites/vtn/VTN_C_OF10/020__vtn_vbrif_portmap.robot
@@ -7,7 +7,7 @@ Resource          ../../../libraries/VtnCoKeywords.robot
 *** Test Cases ***
 Add a ODL Controller
     [Documentation]    Add a Controller
-    Add a Controller    odc_test    ${CONTROLLER}
+    Add a Controller    odc_test    ${ODL_SYSTEM_IP}
 
 Verify the Controller Status is waiting_audit
     [Documentation]    Check Controller status
diff --git a/csit/suites/vtn/VTN_C_OF10/030__verify_switch.robot b/csit/suites/vtn/VTN_C_OF10/030__verify_switch.robot
index 11f2e3231d..0a2c391138 100644
--- a/csit/suites/vtn/VTN_C_OF10/030__verify_switch.robot
+++ b/csit/suites/vtn/VTN_C_OF10/030__verify_switch.robot
@@ -7,7 +7,7 @@ Resource          ../../../libraries/VtnCoKeywords.robot
 *** Test Cases ***
 Add a ODL Controller
     [Documentation]    Add a Controller odc1
-    Add a Controller    odc_test    ${CONTROLLER}
+    Add a Controller    odc_test    ${ODL_SYSTEM_IP}
 
 Verify the Controller Status is waiting_audit
     [Documentation]    Check Controller status
diff --git a/csit/suites/vtn/VTN_C_OF10/040__vtn_vbrif_audit.robot b/csit/suites/vtn/VTN_C_OF10/040__vtn_vbrif_audit.robot
index 160676fb98..b982353c33 100644
--- a/csit/suites/vtn/VTN_C_OF10/040__vtn_vbrif_audit.robot
+++ b/csit/suites/vtn/VTN_C_OF10/040__vtn_vbrif_audit.robot
@@ -32,7 +32,7 @@ Create VBRIF in VBRIDGE Vbr_audit Interface2
 
 Update controller to Valid IP
     [Documentation]    Update Controller ip to valid from invalid
-    Update Controller    odc_test    ${CONTROLLER}    valid_IP
+    Update Controller    odc_test    ${ODL_SYSTEM_IP}    valid_IP
 
 Verify the Controller State is in waiting_audit
     [Documentation]    Check Controller status
diff --git a/csit/suites/vtn/VTN_C_OF10/050__vtn_vbr_flowfilter.robot b/csit/suites/vtn/VTN_C_OF10/050__vtn_vbr_flowfilter.robot
index cd39e6cfac..bf3e2676e4 100644
--- a/csit/suites/vtn/VTN_C_OF10/050__vtn_vbr_flowfilter.robot
+++ b/csit/suites/vtn/VTN_C_OF10/050__vtn_vbr_flowfilter.robot
@@ -7,7 +7,7 @@ Resource          ../../../libraries/VtnCoKeywords.robot
 *** Test Cases ***
 Add a ODL Controller
     [Documentation]    Add a Controller
-    Add a Controller    odc_test    ${CONTROLLER}
+    Add a Controller    odc_test    ${ODL_SYSTEM_IP}
 
 Verify the Controller Status is waiting_audit
     [Documentation]    Check Controller status
diff --git a/csit/suites/vtn/VTN_C_OF10/060__vtn_vbrif_flowfilter.robot b/csit/suites/vtn/VTN_C_OF10/060__vtn_vbrif_flowfilter.robot
index 5b461eda69..d08125e809 100644
--- a/csit/suites/vtn/VTN_C_OF10/060__vtn_vbrif_flowfilter.robot
+++ b/csit/suites/vtn/VTN_C_OF10/060__vtn_vbrif_flowfilter.robot
@@ -7,7 +7,7 @@ Resource          ../../../libraries/VtnCoKeywords.robot
 *** Test Cases ***
 Add a ODL Controller
     [Documentation]    Add a Controller
-    Add a Controller    odc_test    ${CONTROLLER}
+    Add a Controller    odc_test    ${ODL_SYSTEM_IP}
 
 Verify the Controller Status is waiting_audit
     [Documentation]    Check Controller status
diff --git a/csit/suites/vtn/VTN_C_OF10/070__vtn_flowfilter.robot b/csit/suites/vtn/VTN_C_OF10/070__vtn_flowfilter.robot
index 993030ec8f..8c6a63adae 100644
--- a/csit/suites/vtn/VTN_C_OF10/070__vtn_flowfilter.robot
+++ b/csit/suites/vtn/VTN_C_OF10/070__vtn_flowfilter.robot
@@ -7,7 +7,7 @@ Resource          ../../../libraries/VtnCoKeywords.robot
 *** Test Cases ***
 Add a ODL Controller
     [Documentation]    Add a Controller
-    Add a Controller    odc_test    ${CONTROLLER}
+    Add a Controller    odc_test    ${ODL_SYSTEM_IP}
 
 Verify the Controller Status is waiting_audit
     [Documentation]    Check Controller status
diff --git a/csit/suites/vtn/VTN_C_OF10/080__vlan_vtn.robot b/csit/suites/vtn/VTN_C_OF10/080__vlan_vtn.robot
index ce5ccad411..f272ee8d9c 100644
--- a/csit/suites/vtn/VTN_C_OF10/080__vlan_vtn.robot
+++ b/csit/suites/vtn/VTN_C_OF10/080__vlan_vtn.robot
@@ -7,7 +7,7 @@ Resource          ../../../libraries/VtnCoKeywords.robot
 *** Test Cases ***
 Add a ODL Controller
     [Documentation]    Add a Controller
-    Add a Controller    odc_test    ${CONTROLLER}
+    Add a Controller    odc_test    ${ODL_SYSTEM_IP}
 
 Verify the Controller Status is waiting_audit
     [Documentation]    Check Controller status
diff --git a/csit/suites/vtn/VTN_C_OF10/__init__.robot b/csit/suites/vtn/VTN_C_OF10/__init__.robot
index 6217310525..2c452e07f0 100644
--- a/csit/suites/vtn/VTN_C_OF10/__init__.robot
+++ b/csit/suites/vtn/VTN_C_OF10/__init__.robot
@@ -6,6 +6,6 @@ Library           SSHLibrary
 Resource          ../../../libraries/VtnCoKeywords.robot
 
 *** Variables ***
-${start}          sudo mn --controller=remote,ip=${CONTROLLER} --topo tree,2
+${start}          sudo mn --controller=remote,ip=${ODL_SYSTEM_IP} --topo tree,2
 
 *** Keywords ***
diff --git a/csit/suites/vtn/VTN_C_OF13/020__vtn_vbrif_portmap.robot b/csit/suites/vtn/VTN_C_OF13/020__vtn_vbrif_portmap.robot
index cdf114a3fd..ecd9168f3c 100644
--- a/csit/suites/vtn/VTN_C_OF13/020__vtn_vbrif_portmap.robot
+++ b/csit/suites/vtn/VTN_C_OF13/020__vtn_vbrif_portmap.robot
@@ -7,7 +7,7 @@ Resource          ../../../libraries/VtnCoKeywords.robot
 *** Test Cases ***
 Add a ODL Controller
     [Documentation]    Add a Controller
-    Add a Controller    odc_test    ${CONTROLLER}
+    Add a Controller    odc_test    ${ODL_SYSTEM_IP}
 
 Verify the Controller Status is waiting_audit
     [Documentation]    Check Controller status
diff --git a/csit/suites/vtn/VTN_C_OF13/030__verify_switch.robot b/csit/suites/vtn/VTN_C_OF13/030__verify_switch.robot
index 11f2e3231d..0a2c391138 100644
--- a/csit/suites/vtn/VTN_C_OF13/030__verify_switch.robot
+++ b/csit/suites/vtn/VTN_C_OF13/030__verify_switch.robot
@@ -7,7 +7,7 @@ Resource          ../../../libraries/VtnCoKeywords.robot
 *** Test Cases ***
 Add a ODL Controller
     [Documentation]    Add a Controller odc1
-    Add a Controller    odc_test    ${CONTROLLER}
+    Add a Controller    odc_test    ${ODL_SYSTEM_IP}
 
 Verify the Controller Status is waiting_audit
     [Documentation]    Check Controller status
diff --git a/csit/suites/vtn/VTN_C_OF13/040__vtn_vbrif_audit.robot b/csit/suites/vtn/VTN_C_OF13/040__vtn_vbrif_audit.robot
index 160676fb98..b982353c33 100644
--- a/csit/suites/vtn/VTN_C_OF13/040__vtn_vbrif_audit.robot
+++ b/csit/suites/vtn/VTN_C_OF13/040__vtn_vbrif_audit.robot
@@ -32,7 +32,7 @@ Create VBRIF in VBRIDGE Vbr_audit Interface2
 
 Update controller to Valid IP
     [Documentation]    Update Controller ip to valid from invalid
-    Update Controller    odc_test    ${CONTROLLER}    valid_IP
+    Update Controller    odc_test    ${ODL_SYSTEM_IP}    valid_IP
 
 Verify the Controller State is in waiting_audit
     [Documentation]    Check Controller status
diff --git a/csit/suites/vtn/VTN_C_OF13/050__vtn_vbr_flowfilter.robot b/csit/suites/vtn/VTN_C_OF13/050__vtn_vbr_flowfilter.robot
index cd39e6cfac..bf3e2676e4 100644
--- a/csit/suites/vtn/VTN_C_OF13/050__vtn_vbr_flowfilter.robot
+++ b/csit/suites/vtn/VTN_C_OF13/050__vtn_vbr_flowfilter.robot
@@ -7,7 +7,7 @@ Resource          ../../../libraries/VtnCoKeywords.robot
 *** Test Cases ***
 Add a ODL Controller
     [Documentation]    Add a Controller
-    Add a Controller    odc_test    ${CONTROLLER}
+    Add a Controller    odc_test    ${ODL_SYSTEM_IP}
 
 Verify the Controller Status is waiting_audit
     [Documentation]    Check Controller status
diff --git a/csit/suites/vtn/VTN_C_OF13/060__vtn_vbrif_flowfilter.robot b/csit/suites/vtn/VTN_C_OF13/060__vtn_vbrif_flowfilter.robot
index 5b461eda69..d08125e809 100644
--- a/csit/suites/vtn/VTN_C_OF13/060__vtn_vbrif_flowfilter.robot
+++ b/csit/suites/vtn/VTN_C_OF13/060__vtn_vbrif_flowfilter.robot
@@ -7,7 +7,7 @@ Resource          ../../../libraries/VtnCoKeywords.robot
 *** Test Cases ***
 Add a ODL Controller
     [Documentation]    Add a Controller
-    Add a Controller    odc_test    ${CONTROLLER}
+    Add a Controller    odc_test    ${ODL_SYSTEM_IP}
 
 Verify the Controller Status is waiting_audit
     [Documentation]    Check Controller status
diff --git a/csit/suites/vtn/VTN_C_OF13/070__vtn_flowfilter.robot b/csit/suites/vtn/VTN_C_OF13/070__vtn_flowfilter.robot
index 993030ec8f..8c6a63adae 100644
--- a/csit/suites/vtn/VTN_C_OF13/070__vtn_flowfilter.robot
+++ b/csit/suites/vtn/VTN_C_OF13/070__vtn_flowfilter.robot
@@ -7,7 +7,7 @@ Resource          ../../../libraries/VtnCoKeywords.robot
 *** Test Cases ***
 Add a ODL Controller
     [Documentation]    Add a Controller
-    Add a Controller    odc_test    ${CONTROLLER}
+    Add a Controller    odc_test    ${ODL_SYSTEM_IP}
 
 Verify the Controller Status is waiting_audit
     [Documentation]    Check Controller status
diff --git a/csit/suites/vtn/VTN_C_OF13/__init__.robot b/csit/suites/vtn/VTN_C_OF13/__init__.robot
index 755cac3798..ce8d89eeb4 100644
--- a/csit/suites/vtn/VTN_C_OF13/__init__.robot
+++ b/csit/suites/vtn/VTN_C_OF13/__init__.robot
@@ -6,6 +6,6 @@ Library           SSHLibrary
 Resource          ../../../libraries/VtnCoKeywords.robot
 
 *** Variables ***
-${start}          sudo mn --controller=remote,ip=${CONTROLLER} --topo tree,2 --switch ovsk,protocols=OpenFlow13
+${start}          sudo mn --controller=remote,ip=${ODL_SYSTEM_IP} --topo tree,2 --switch ovsk,protocols=OpenFlow13
 
 *** Keywords ***
diff --git a/csit/suites/vtn/VTN_Mgr_OF10/__init__.robot b/csit/suites/vtn/VTN_Mgr_OF10/__init__.robot
index f442217587..2b3bfb9a10 100644
--- a/csit/suites/vtn/VTN_Mgr_OF10/__init__.robot
+++ b/csit/suites/vtn/VTN_Mgr_OF10/__init__.robot
@@ -5,4 +5,4 @@ Suite Teardown    Stop SuiteVtnMa
 Resource          ../../../libraries/VtnMaKeywords.robot
 
 *** Variables ***
-${start}          sudo mn --controller=remote,ip=${CONTROLLER} --topo tree,2
+${start}          sudo mn --controller=remote,ip=${ODL_SYSTEM_IP} --topo tree,2
diff --git a/csit/suites/vtn/VTN_Mgr_OF10_Li/__init__.robot b/csit/suites/vtn/VTN_Mgr_OF10_Li/__init__.robot
index cf1898d937..1eb2f94921 100644
--- a/csit/suites/vtn/VTN_Mgr_OF10_Li/__init__.robot
+++ b/csit/suites/vtn/VTN_Mgr_OF10_Li/__init__.robot
@@ -5,4 +5,4 @@ Suite Teardown    Stop SuiteVtnMa
 Resource          ../../../libraries/VtnMaKeywordsLi.robot
 
 *** Variables ***
-${start}          sudo mn --controller=remote,ip=${CONTROLLER} --topo tree,2
+${start}          sudo mn --controller=remote,ip=${ODL_SYSTEM_IP} --topo tree,2
diff --git a/csit/suites/vtn/VTN_Mgr_OF13/__init__.robot b/csit/suites/vtn/VTN_Mgr_OF13/__init__.robot
index c6d483e76e..7f18c0b37b 100644
--- a/csit/suites/vtn/VTN_Mgr_OF13/__init__.robot
+++ b/csit/suites/vtn/VTN_Mgr_OF13/__init__.robot
@@ -5,4 +5,4 @@ Suite Teardown    Stop SuiteVtnMa
 Resource          ../../../libraries/VtnMaKeywords.robot
 
 *** Variables ***
-${start}          sudo mn --controller=remote,ip=${CONTROLLER} --topo tree,2 --switch ovsk,protocols=OpenFlow13
+${start}          sudo mn --controller=remote,ip=${ODL_SYSTEM_IP} --topo tree,2 --switch ovsk,protocols=OpenFlow13
diff --git a/csit/suites/vtn/VTN_Mgr_OF13_Li/__init__.robot b/csit/suites/vtn/VTN_Mgr_OF13_Li/__init__.robot
index ab7c7fc0a8..d3439ce4bb 100644
--- a/csit/suites/vtn/VTN_Mgr_OF13_Li/__init__.robot
+++ b/csit/suites/vtn/VTN_Mgr_OF13_Li/__init__.robot
@@ -5,4 +5,4 @@ Suite Teardown    Stop SuiteVtnMa
 Resource          ../../../libraries/VtnMaKeywordsLi.robot
 
 *** Variables ***
-${start}          sudo mn --controller=remote,ip=${CONTROLLER} --topo tree,2 --switch ovsk,protocols=OpenFlow13
+${start}          sudo mn --controller=remote,ip=${ODL_SYSTEM_IP} --topo tree,2 --switch ovsk,protocols=OpenFlow13
-- 
2.36.6