From 7c1e3422ab18d0bd17e18b3144a6b7e1795abbbc Mon Sep 17 00:00:00 2001 From: "Karthik.S" Date: Mon, 29 Aug 2016 17:19:48 +0530 Subject: [PATCH] Fix VTN Coordinator and Manager CSIT for Beryllium * Modify VTN Coordinator keyword file to download VTN Co distribution * Modify VTN Manager keyword file to fix verification of dscp actions for beryllium Change-Id: I524a0ef94ac6437b4b9524b39a94860b87e5163a Signed-off-by: Karthik.S --- csit/libraries/VtnCoKeywords.robot | 19 +++++++++++-------- csit/libraries/VtnMaKeywords.robot | 4 +++- 2 files changed, 14 insertions(+), 9 deletions(-) diff --git a/csit/libraries/VtnCoKeywords.robot b/csit/libraries/VtnCoKeywords.robot index dbbcaed476..95b2a9d0d4 100644 --- a/csit/libraries/VtnCoKeywords.robot +++ b/csit/libraries/VtnCoKeywords.robot @@ -43,14 +43,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' 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 - ${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' - Run Keyword If '${ODL_STREAM}' == 'boron' or '${ODL_STREAM}' == 'carbon' SSHLibrary.Execute Command tar -C/ -jxvf ${vtn_dist}*-bin.tar.bz2 + Run Keyword If '${ODL_STREAM}' == 'boron' or '${ODL_STREAM}' == 'carbon' 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 @@ -64,6 +57,16 @@ Start SuiteVtnCo SSHLibrary.Execute Command /usr/local/vtn/bin/lgcnw_control loglevel trace 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 + ${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' + SSHLibrary.Execute Command tar -C/ -jxvf ${vtn_dist}*-bin.tar.bz2 + Stop SuiteVtnCo [Documentation] Exit the Launch Test Log Stop the Launch Test diff --git a/csit/libraries/VtnMaKeywords.robot b/csit/libraries/VtnMaKeywords.robot index 0cb1511844..fe334f34ff 100644 --- a/csit/libraries/VtnMaKeywords.robot +++ b/csit/libraries/VtnMaKeywords.robot @@ -44,6 +44,7 @@ ${in_port} 1 ${filter_index} 1 @{inet_action} set_field:192.0.0.1->ip_src set_field:192.0.0.2->ip_dst ${dscp_action} set_field:32->ip_dscp +${dscp_be_action} set_field:32->nw_tos_shifted ${dscp_flow} mod_nw_tos:128 @{icmp_action} mod_tp_dst:1 mod_tp_src:3 ${drop_action} actions=drop @@ -315,7 +316,8 @@ Verify flowactions [Documentation] Verify the flowfilter actions after ping in the dumpflows write ${DUMPFLOWS} ${result} Read Until mininet> - Should Contain ${result} ${actions} + Run Keyword If '${actions}' == 'set_field:32->ip_dscp' and '${ODL_STREAM}' == 'beryllium' Should Contain ${result} ${dscp_be_action} + ... ELSE Should Contain ${result} ${actions} Add a vtn flowfilter [Arguments] ${vtn_name} ${vtnflowfilter_data} -- 2.36.6