From: gvrangan <venkatrangang@hcl.com>
Date: Thu, 14 Apr 2016 22:46:36 +0000 (+0000)
Subject: Fix for VTN CSIT Job Failures
X-Git-Tag: release/lithium-sr4~33
X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?p=integration%2Ftest.git;a=commitdiff_plain;h=ca0dbbfe82022e20c8ed448e35e050f8ee843313

Fix for VTN CSIT Job Failures

* Temporory fix to install vlan package in Mininet
* Will be reverted once the Infra moves to Private Cloud

Change-Id: Ie1d46d92f0bd3566bf21f19949712e5d8bbbc308
Signed-off-by: gvrangan <venkatrangang@hcl.com>
---

diff --git a/csit/libraries/Utils.robot b/csit/libraries/Utils.robot
index 7afb4781cd..4d57d466f9 100644
--- a/csit/libraries/Utils.robot
+++ b/csit/libraries/Utils.robot
@@ -488,3 +488,13 @@ Write Commands Until Expected Prompt
     SSHLibrary.Write    ${cmd}
     ${output}=    SSHLibrary.Read Until    ${prompt}
     [Return]    ${output}
+
+Install Package On Ubuntu System
+    [Arguments]    ${package_name}    ${system}=${TOOLS_SYSTEM_IP}     ${user}=${TOOLS_SYSTEM_USER}    ${password}=${TOOLS_SYSTEM_PASSWORD}    ${prompt}=${DEFAULT_LINUX_PROMPT}
+    ...    ${prompt_timeout}=30s
+    [Documentation]    Keyword to install packages for testing to Ubuntu Mininet VM
+    Log    Keyword to install package to Mininet Ubuntu VM
+    Open Connection    ${system}    prompt=${prompt}    timeout=${prompt_timeout}
+    Flexible Mininet Login    user=${user}    password=${password}
+    Write    sudo apt-get install -y ${package_name}
+    Read Until     ${prompt}
diff --git a/csit/libraries/VtnCoKeywords.robot b/csit/libraries/VtnCoKeywords.robot
index 6d4c01dcb4..b967b3b50a 100644
--- a/csit/libraries/VtnCoKeywords.robot
+++ b/csit/libraries/VtnCoKeywords.robot
@@ -256,6 +256,7 @@ Create VLANMAP in VBRIDGE
 
 Start vlan_topo
     [Documentation]    This will start mininet with custom topology on both the Virtual Machines
+    Install Package On Ubuntu System      vlan
     Start Mininet    ${TOOLS_SYSTEM_IP}    ${vlan_topo}    ${CURDIR}/${CREATE_VLAN_TOPOLOGY_FILE_PATH}
 
 Delete a FLOWLIST
diff --git a/csit/libraries/VtnMaKeywords.robot b/csit/libraries/VtnMaKeywords.robot
index f1a5f8d90b..af77af3053 100644
--- a/csit/libraries/VtnMaKeywords.robot
+++ b/csit/libraries/VtnMaKeywords.robot
@@ -219,15 +219,9 @@ Mininet Ping Should Not Succeed
 Start vlan_topo
     [Arguments]    ${OF}
     [Documentation]    Create custom topology for vlan functionality
-    Clean Mininet System
-    ${mininet_conn_id1}=    Open Connection    ${TOOLS_SYSTEM_IP}    prompt=${DEFAULT_LINUX_PROMPT}    timeout=30s
-    Set Suite Variable    ${mininet_conn_id1}
-    Login With Public Key    ${TOOLS_SYSTEM_USER}    ${USER_HOME}/.ssh/${SSH_KEY}    any
-    Execute Command    sudo ovs-vsctl set-manager ptcp:6644
-    Put File    ${CURDIR}/${CREATE_VLAN_TOPOLOGY_FILE_PATH}
-    Run Keyword If    '${OF}' == 'OF13'    Write    ${vlan_topo_13}
-    ...    ELSE IF    '${OF}' == 'OF10'    Write    ${vlan_topo_10}
-    ${result}    Read Until    mininet>
+    Install Package On Ubuntu System     vlan
+    Run Keyword If    '${OF}' == 'OF13'    Start Mininet    ${TOOLS_SYSTEM_IP}    ${vlan_topo_13}    ${CURDIR}/${CREATE_VLAN_TOPOLOGY_FILE_PATH}
+    ...    ELSE IF    '${OF}' == 'OF10'    Start Mininet    ${TOOLS_SYSTEM_IP}    ${vlan_topo_10}    ${CURDIR}/${CREATE_VLAN_TOPOLOGY_FILE_PATH}
 
 Get flow
     [Arguments]    ${vtn_name}