From: Sam Hague <shague@redhat.com>
Date: Thu, 8 Nov 2018 20:21:00 +0000 (-0500)
Subject: Dont check tunnels on single node
X-Git-Tag: pre-potassium~483
X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?p=integration%2Ftest.git;a=commitdiff_plain;h=b66ff9f85a176986e646c99c2cd2aa2e2497d820

Dont check tunnels on single node

Change-Id: I96d1e415342899f3743be700ea1c64117ff35066
Signed-off-by: Sam Hague <shague@redhat.com>
---

diff --git a/csit/libraries/DevstackUtils.robot b/csit/libraries/DevstackUtils.robot
index 224be72518..044050dd50 100644
--- a/csit/libraries/DevstackUtils.robot
+++ b/csit/libraries/DevstackUtils.robot
@@ -16,6 +16,7 @@ ${OS_CMP1_IP}     ${EMPTY}
 ${OS_CMP2_IP}     ${EMPTY}
 @{OS_ALL_IPS}     @{EMPTY}
 @{OS_CMP_IPS}     @{EMPTY}
+${OS_NODE_CNT}    ${1}
 
 *** Keywords ***
 Open Connection
@@ -50,7 +51,7 @@ Write Commands Until Prompt And Log
 
 Log Devstack Nodes Data
     ${output} =    BuiltIn.Catenate    SEPARATOR=\n    OS_CNTL_HOSTNAME: ${OS_CNTL_HOSTNAME} - OS_CNTL_IP: ${OS_CNTL_IP} - OS_CONTROL_NODE_IP: ${OS_CONTROL_NODE_IP}    OS_CMP1_HOSTNAME: ${OS_CMP1_HOSTNAME} - OS_CMP1_IP: ${OS_CMP1_IP} - OS_COMPUTE_1_IP: ${OS_COMPUTE_1_IP}    OS_CMP2_HOSTNAME: ${OS_CMP2_HOSTNAME} - OS_CMP2_IP: ${OS_CMP2_IP} - OS_COMPUTE_2_IP: ${OS_COMPUTE_2_IP}    OS_ALL_IPS: @{OS_ALL_IPS}
-    ...    OS_CMP_IPS: @{OS_CMP_IPS}
+    ...    OS_CMP_IPS: @{OS_CMP_IPS}    OS_NODE_CNT: ${OS_NODE_CNT}    OS_ALL_CONN_IDS: @{OS_ALL_CONN_IDS}    OS_CMP_CONN_IDS: @{OS_CMP_CONN_IDS}
     BuiltIn.Log    DevStack Nodes Data:\n${output}
 
 Get DevStack Hostnames
@@ -102,5 +103,6 @@ Get DevStack Nodes Data
     BuiltIn.Run Keyword If    "${OPENSTACK_TOPO}" == "1cmb-0ctl-0cmp"    DevstackUtils.Set Node Data For AllinOne Setup
     ...    ELSE IF    "${OPENSTACK_TOPO}" == "1cmb-0ctl-1cmp"    DevstackUtils.Set Node Data For Control And Compute Node Setup
     ...    ELSE IF    "${OPENSTACK_TOPO}" == "0cmb-1ctl-2cmp"    DevstackUtils.Set Node Data For Control And Two Compute Node Setup
+    ${OS_NODE_CNT} =    BuiltIn.Get Length    ${OS_ALL_IPS}
     DevstackUtils.Get DevStack Hostnames
     DevstackUtils.Log Devstack Nodes Data
diff --git a/csit/libraries/OpenStackOperations.robot b/csit/libraries/OpenStackOperations.robot
index 2b594be96c..6b87944d67 100644
--- a/csit/libraries/OpenStackOperations.robot
+++ b/csit/libraries/OpenStackOperations.robot
@@ -1240,6 +1240,7 @@ Verify Services
 
 Verify Expected Default Tunnels
     [Documentation]    Verify if the default tunnels are created
+    BuiltIn.Return From Keyword If    ${OS_NODE_CNT} == ${1}    ${True}
     ${output} =    ODLTools.Analyze Tunnels    test_name=${SUITE_NAME}.Suite Setup
     BuiltIn.Should Contain    ${output}    All tunnels are up
 
diff --git a/csit/libraries/VpnOperations.robot b/csit/libraries/VpnOperations.robot
index 17318fb017..9376bd6f81 100644
--- a/csit/libraries/VpnOperations.robot
+++ b/csit/libraries/VpnOperations.robot
@@ -178,6 +178,7 @@ Verify ARP REQUEST in groupTable
 
 Verify Tunnel Status as UP
     [Documentation]    Verify that the tunnels are UP
+    BuiltIn.Return From Keyword If    ${OS_NODE_CNT} == ${1}    ${True}
     ${output}=    Issue Command On Karaf Console    ${TEP_SHOW_STATE}
     Log    ${output}
     Should Contain    ${output}    ${STATE_UP}