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>

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 cdf114a3fd5ba210947e46e48e3656b50d71f0d3..ecd9168f3ce4c3c09f1d8bd43d04f569749dee8d 100644 (file)
--- 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 11f2e3231dc4fa34dfa205151bc4b1f3bb99a486..0a2c3911381f29ae21f78875b9eda38278787df1 100644 (file)
--- 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 160676fb9864b8ee308aa082149672e7d760dce2..b982353c334c074ec513db7129d62aa6b545d7a5 100644 (file)
--- 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 cd39e6cfac0ac060e418a888b1f2d17d35e07c54..bf3e2676e46952fa25fe27bf1b9e496e0f588d60 100644 (file)
--- 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 5b461eda69974d8c731c94d8e85d952611603ee7..d08125e8097015cdce112578d06933c4eb9a80c4 100644 (file)
--- 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 993030ec8f2590b20aa6d178f3d88492be50896c..8c6a63adae66c3cb3b0d2816fbc0063ac4b719b9 100644 (file)
--- 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 ce5ccad411b39b3e48c975d3ace0acef23901788..f272ee8d9c0c2d759b7695bda86d0985e5e976b5 100644 (file)
--- 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 6217310525904aa01f0becdc09a069111ed4cf7f..2c452e07f0b36d783ec5586c42aee0da589f32ba 100644 (file)
--- 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 cdf114a3fd5ba210947e46e48e3656b50d71f0d3..ecd9168f3ce4c3c09f1d8bd43d04f569749dee8d 100644 (file)
--- 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 11f2e3231dc4fa34dfa205151bc4b1f3bb99a486..0a2c3911381f29ae21f78875b9eda38278787df1 100644 (file)
--- 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 160676fb9864b8ee308aa082149672e7d760dce2..b982353c334c074ec513db7129d62aa6b545d7a5 100644 (file)
--- 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 cd39e6cfac0ac060e418a888b1f2d17d35e07c54..bf3e2676e46952fa25fe27bf1b9e496e0f588d60 100644 (file)
--- 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 5b461eda69974d8c731c94d8e85d952611603ee7..d08125e8097015cdce112578d06933c4eb9a80c4 100644 (file)
--- 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 993030ec8f2590b20aa6d178f3d88492be50896c..8c6a63adae66c3cb3b0d2816fbc0063ac4b719b9 100644 (file)
--- 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 755cac37988eed94b08f231d9875f170b17fa03e..ce8d89eeb47b08724199b8a45bb1399ab66f523c 100644 (file)
--- 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 f442217587644032e8d73bd61bbab02a1a6e9680..2b3bfb9a103b4820a77efbc9aeaeb03ecef8bf12 100644 (file)
--- 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 cf1898d937a8c589c26945b7430c8899920f784a..1eb2f94921f23ef7402f52ca93921f390f74d19a 100644 (file)
--- 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 c6d483e76e6155f622b382ebfddfb3ef2da3b8f2..7f18c0b37b68d9223ba28901f9ba41f1208a3538 100644 (file)
--- 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 ab7c7fc0a8382ee4ca1288788a035bb6b934dde4..d3439ce4bba40760a59b016bfb274d110b3766fb 100644 (file)
--- 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