Replace deprecated variables in suites/lispflowmapping (1).

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

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

diff --git a/csit/suites/lispflowmapping/all/020_RPC_CRUD.robot b/csit/suites/lispflowmapping/all/020_RPC_CRUD.robot
index 1b37d9681300a3dfc48f429b474f861ec0de5423..5fd2e39bfa8b9b679962ce0f5cd8d3afa8124a7b 100644 (file)
--- a/csit/suites/lispflowmapping/all/020_RPC_CRUD.robot
+++ b/csit/suites/lispflowmapping/all/020_RPC_CRUD.robot
@@ -1,6 +1,6 @@
 *** Settings ***
 Documentation     Test suite to verify CRUD operations using RPCs
-Suite Setup       Create Session    session    http://${CONTROLLER}:${RESTCONFPORT}    auth=${AUTH}    headers=${HEADERS}
+Suite Setup       Create Session    session    http://${ODL_SYSTEM_IP}:${RESTCONFPORT}    auth=${AUTH}    headers=${HEADERS}
 Suite Teardown    Delete All Sessions
 Library           Collections
 Library           OperatingSystem

diff --git a/csit/suites/lispflowmapping/all/030_RPC_Datatypes.robot b/csit/suites/lispflowmapping/all/030_RPC_Datatypes.robot
index 34f87e84376e7cbd2cac350607aead21faf83cf9..477e79359922914407d76a663d040cbf3f02c7aa 100644 (file)
--- a/csit/suites/lispflowmapping/all/030_RPC_Datatypes.robot
+++ b/csit/suites/lispflowmapping/all/030_RPC_Datatypes.robot
@@ -1,6 +1,6 @@
 *** Settings ***
 Documentation     Test suite to verify data types using RPCs
-Suite Setup       Create Session    session    http://${CONTROLLER}:${RESTCONFPORT}    auth=${AUTH}    headers=${HEADERS}
+Suite Setup       Create Session    session    http://${ODL_SYSTEM_IP}:${RESTCONFPORT}    auth=${AUTH}    headers=${HEADERS}
 Suite Teardown    Delete All Sessions
 Test Setup        Set Suite Variable    ${RPC_Datatype__current_json}    ${EMPTY}
 Test Teardown     Remove Datatype And Check Removal

diff --git a/csit/suites/lispflowmapping/msmr/020_RPC_CRUD.robot b/csit/suites/lispflowmapping/msmr/020_RPC_CRUD.robot
index a3bbeb1f120770b4d0b7e44c55b4a5ef4604f4c6..0ee2b62e6adef04cfe5cb961ed81678d7f757562 100644 (file)
--- a/csit/suites/lispflowmapping/msmr/020_RPC_CRUD.robot
+++ b/csit/suites/lispflowmapping/msmr/020_RPC_CRUD.robot
@@ -1,6 +1,6 @@
 *** Settings ***
 Documentation     Test suite to verify CRUD operations using RPCs
-Suite Setup       Create Session    session    http://${CONTROLLER}:${RESTCONFPORT}    auth=${AUTH}    headers=${HEADERS}
+Suite Setup       Create Session    session    http://${ODL_SYSTEM_IP}:${RESTCONFPORT}    auth=${AUTH}    headers=${HEADERS}
 Suite Teardown    Delete All Sessions
 Library           Collections
 Library           OperatingSystem

diff --git a/csit/suites/lispflowmapping/msmr/030_RPC_Datatypes.robot b/csit/suites/lispflowmapping/msmr/030_RPC_Datatypes.robot
index 2287f2f3bc22e6907a7eda88f38b1e932a42f03d..cd09d5d5786f814e504af1d3d75be6b41644e516 100644 (file)
--- a/csit/suites/lispflowmapping/msmr/030_RPC_Datatypes.robot
+++ b/csit/suites/lispflowmapping/msmr/030_RPC_Datatypes.robot
@@ -1,6 +1,6 @@
 *** Settings ***
 Documentation     Test suite to verify data types using RPCs
-Suite Setup       Create Session    session    http://${CONTROLLER}:${RESTCONFPORT}    auth=${AUTH}    headers=${HEADERS}
+Suite Setup       Create Session    session    http://${ODL_SYSTEM_IP}:${RESTCONFPORT}    auth=${AUTH}    headers=${HEADERS}
 Suite Teardown    Delete All Sessions
 Test Setup        Set Suite Variable    ${RPC_Datatype__current_json}    ${EMPTY}
 Test Teardown     Remove Datatype And Check Removal

diff --git a/csit/suites/lispflowmapping/performance/010_Southbound_MapRequest.robot b/csit/suites/lispflowmapping/performance/010_Southbound_MapRequest.robot
index d9d41212458397c0f41b6ee16054b6ffc97e97b2..fd9e2a7a8f7dbc9399946f8b318e836eb03303f8 100644 (file)
--- a/csit/suites/lispflowmapping/performance/010_Southbound_MapRequest.robot
+++ b/csit/suites/lispflowmapping/performance/010_Southbound_MapRequest.robot
@@ -25,7 +25,7 @@ ${PPS_RESULTS_FILE}    pps.csv
 *** Test Cases ***
 Add Simple IPv4 Mappings
     ${start_date}=    Get Current Date
-    Run Process With Logging And Status Check    ${MAPPING_BLASTER}    --host    ${CONTROLLER}    --mappings    ${MAPPINGS}
+    Run Process With Logging And Status Check    ${MAPPING_BLASTER}    --host    ${ODL_SYSTEM_IP}    --mappings    ${MAPPINGS}
     ${end_date}=    Get Current Date
     ${add_seconds}=    Subtract Date From Date    ${end_date}    ${start_date}
     Log    ${add_seconds}
@@ -34,7 +34,7 @@ Add Simple IPv4 Mappings
 Generate Test Traffic
     Reset Stats
     ${result}=    Run Process With Logging And Status Check    /usr/local/bin/udpreplay    --pps    ${REPLAY_PPS}    --repeat    ${REPLAY_CNT}
-    ...    --host    ${CONTROLLER}    --port    4342    ${REPLAY_FILE}
+    ...    --host    ${ODL_SYSTEM_IP}    --port    4342    ${REPLAY_FILE}
     ${partial}=    Fetch From Left    ${result.stdout}    s =
     Log    ${partial}
     ${get_seconds}=    Fetch From Right    ${partial}    ${SPACE}
@@ -72,7 +72,7 @@ Get Transmitted Map-Requests Stats
     [Return]    ${txmrep}
 
 Prepare Environment
-    Create Session    session    http://${CONTROLLER}:${RESTCONFPORT}    auth=${AUTH}    headers=${HEADERS}
+    Create Session    session    http://${ODL_SYSTEM_IP}:${RESTCONFPORT}    auth=${AUTH}    headers=${HEADERS}
     Run Process With Logging And Status Check    wget    -P    ${TOOLS_DIR}    ${LISP_SCAPY}
     Run Process With Logging And Status Check    ${PCAP_CREATOR}    --requests    ${MAPPINGS}