Remove ODL_STREAM from VtnCoKeywords.robot

[integration/test.git] / csit / libraries / VtnCoKeywords.robot

diff --git a/csit/libraries/VtnCoKeywords.robot b/csit/libraries/VtnCoKeywords.robot
index 95b2a9d0d4a232c0a18790b2df0502f8e8e2cbac..9aed1b937ee1e21dc51627ca8e897923ed6d3e0e 100644 (file)
--- a/csit/libraries/VtnCoKeywords.robot
+++ b/csit/libraries/VtnCoKeywords.robot
@@ -8,13 +8,14 @@ Library           SSHLibrary
 Library           Collections
 Library           XML
 Variables         ../variables/Variables.py
+Resource          ./CompareStream.robot
 Resource          ./Utils.robot
 Resource          ./MininetKeywords.robot
 
 *** variable ***
-${vlan_topo}      sudo mn --controller=remote,ip=${ODL_SYSTEM_IP} --custom vlan_vtn_test.py --topo vlantopo
+${vlan_topo}      --custom vlan_vtn_test.py --topo vlantopo
 ${nexus_path}     https://nexus.opendaylight.org/content/repositories/opendaylight.snapshot/org/opendaylight/vtn/distribution.vtn-coordinator
-${boron}          6.3.1-SNAPSHOT
+${boron}          6.3.2-SNAPSHOT
 ${carbon}         6.4.0-SNAPSHOT
 ${vtn_dist}       distribution.vtn-coordinator
 
@@ -43,7 +44,7 @@ Start SuiteVtnCo
     SSHLibrary.Execute Command    sudo chown jenkins /usr/local/vtn
     SSHLibrary.Execute Command    sudo yum install -q -y http://yum.postgresql.org/9.3/redhat/rhel-7-x86_64/pgdg-centos93-9.3-2.noarch.rpm
     SSHLibrary.Execute Command    sudo yum install -q -y postgresql93-libs postgresql93 postgresql93-server postgresql93-contrib postgresql93-odbc-09.03.0400
-    Run Keyword If    '${ODL_STREAM}' == 'boron' or '${ODL_STREAM}' == 'carbon'    Download VtnCo Distribution
+    CompareStream.Run_Keyword_If_At_Least_Else    boron    Download VtnCo Distribution
     ...    ELSE    SSHLibrary.Execute Command    tar -C/ -jxvf ${WORKSPACE}/${BUNDLEFOLDER}/externalapps/${vtn_dist}*-bin.tar.bz2
     SSHLibrary.Execute Command    /usr/local/vtn/sbin/db_setup
     SSHLibrary.Execute Command    /usr/local/vtn/bin/vtn_start
@@ -58,13 +59,14 @@ Start SuiteVtnCo
     SSHLibrary.Execute Command    exit
 
 Download VtnCo Distribution
-    Run Keyword If    '${ODL_STREAM}' == 'boron'    SSHLibrary.Execute Command    wget "${nexus_path}/${boron}/maven-metadata.xml"
-    ...    ELSE IF    '${ODL_STREAM}' == 'carbon'    SSHLibrary.Execute Command    wget "${nexus_path}/${carbon}/maven-metadata.xml"
-    Run Keyword If    '${ODL_STREAM}' == 'boron' or '${ODL_STREAM}' == 'carbon'    SSHLibrary.Get_file    maven-metadata.xml
+    # TODO: https://trello.com/c/fDiIUFMv/431-remove-hardcoded-versions-of-vtn-coordinator-in-libraries-vtncokeywords-robot
+    CompareStream.Run_Keyword_If_Equals    boron    SSHLibrary.Execute Command    wget "${nexus_path}/${boron}/maven-metadata.xml"
+    CompareStream.Run_Keyword_If_Equals    carbon    SSHLibrary.Execute Command    wget "${nexus_path}/${carbon}/maven-metadata.xml"
+    CompareStream.Run_Keyword_If_At_Least_Boron    SSHLibrary.Get_file    maven-metadata.xml
     ${time_stamp}=    XML.Get Element Text    maven-metadata.xml    xpath=.//snapshot/timestamp
     ${build_number}=    XML.Get Element Text    maven-metadata.xml    xpath=.//snapshot/buildNumber
-    Run Keyword If    '${ODL_STREAM}' == 'boron'    SSHLibrary.Execute Command    wget '${nexus_path}/${boron}/${vtn_dist}-6.3.1-${time_stamp}-${build_number}-bin.tar.bz2'
-    ...    ELSE IF    '${ODL_STREAM}' == 'carbon'    SSHLibrary.Execute Command    wget '${nexus_path}/${carbon}/${vtn_dist}-6.4.0-${time_stamp}-${build_number}-bin.tar.bz2'
+    CompareStream.Run_Keyword_If_Equals    boron    SSHLibrary.Execute Command    wget '${nexus_path}/${boron}/${vtn_dist}-6.3.2-${time_stamp}-${build_number}-bin.tar.bz2'
+    CompareStream.Run_Keyword_If_Equals    carbon    SSHLibrary.Execute Command    wget '${nexus_path}/${carbon}/${vtn_dist}-6.4.0-${time_stamp}-${build_number}-bin.tar.bz2'
     SSHLibrary.Execute Command    tar -C/ -jxvf ${vtn_dist}*-bin.tar.bz2
 
 Stop SuiteVtnCo