From 0e720a2e22505762e79a52cf4fa708d4e01e254b Mon Sep 17 00:00:00 2001 From: Radek Zetik Date: Fri, 2 Oct 2015 14:10:30 +0100 Subject: Default config picks up OVS variants Running a test with vanilla-ovs, vhost-user-ovs, vhost-cuse-ovs,... does not require any building or configuration changes - the vswitch needs only to specified on the command line. The config file contains new variables for particular ovs build. OvsVanilla: OVS_DIR_VANILLA, QEMU_DIR_VANILLA VhostCuse: RTE_SDK_CUSE, OVS_DIR_CUSE, QEMU_DIR_CUSE VhostUser: RTE_SDK_USER, OVS_DIR_USER, QEMU_DIR_USER The vspef chooses right paths according to command line switches '--vswitch' (or 'VSWITCH') and '--vnf' (or 'VNF') JIRA: VSPERF-86 Change-Id: I22e3a7f9e21d6ceb13830e444716b4274314560c Signed-off-by: Radek Zetik Reviewed-by: Maryam Tahhan Reviewed-by: Brian Castelli Reviewed-by: Gene Snider Reviewed-by: Al Morton Reviewed-by: Tv Rao --- conf/10_custom.conf | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) (limited to 'conf/10_custom.conf') diff --git a/conf/10_custom.conf b/conf/10_custom.conf index 95118753..eafa06bb 100644 --- a/conf/10_custom.conf +++ b/conf/10_custom.conf @@ -13,8 +13,16 @@ # limitations under the License. # traffic generator to use in tests -RTE_SDK = '' # full path to DPDK src dir -OVS_DIR = '' # full path to Open vSwitch src dir +OVS_DIR_VANILLA = '~/src_vanilla/ovs/' +QEMU_DIR_VANILLA = '~/src_vanilla/qemu/' + +RTE_SDK_CUSE = '~/src_cuse/dpdk/' +OVS_DIR_CUSE = '~/src_cuse/ovs/' +QEMU_DIR_CUSE = '~/src_cuse/qemu/' + +RTE_SDK_USER = '~/src/dpdk/' +OVS_DIR_USER = '~/src/ovs/' +QEMU_DIR_USER = '~/src/qemu/' RTE_TARGET = '' # the relevant DPDK build target # traffic generator to use in tests -- cgit 1.2.3-korg