summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRadek Zetik <radekx.zetik@intel.com>2015-10-02 14:10:30 +0100
committerMaryam Tahhan <maryam.tahhan@intel.com>2015-10-15 16:53:26 +0000
commit0e720a2e22505762e79a52cf4fa708d4e01e254b (patch)
tree7804cf79cbb5a68ee5ba92544368829788126819
parent827a2c43d3d4ee2abd632dad59c6cd3d47e5092a (diff)
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 <radekx.zetik@intel.com> Reviewed-by: Maryam Tahhan <maryam.tahhan@intel.com> Reviewed-by: Brian Castelli <brian.castelli@spirent.com> Reviewed-by: Gene Snider <eugene.snider@huawei.com> Reviewed-by: Al Morton <acmorton@att.com> Reviewed-by: Tv Rao <tv.rao@freescale.com>
-rw-r--r--conf/10_custom.conf12
-rwxr-xr-xvsperf22
2 files changed, 32 insertions, 2 deletions
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
diff --git a/vsperf b/vsperf
index 310e1a40..7a442658 100755
--- a/vsperf
+++ b/vsperf
@@ -388,6 +388,28 @@ def main():
logger.error("No tests matched --test option or positional args. Done.")
sys.exit(1)
+ # set dpdk, ovs and qemu paths accorfing to VNF and VSWITCH
+ if settings.getValue('VSWITCH').endswith('Vanilla'):
+ # settings paths for Vanilla
+ settings.setValue('OVS_DIR', (settings.getValue('OVS_DIR_VANILLA')))
+ settings.setValue('QEMU_DIR', (settings.getValue('QEMU_DIR_VANILLA')))
+ elif settings.getValue('VSWITCH').endswith('Vhost'):
+ if settings.getValue('VNF').endswith('Cuse'):
+ # settings paths for Cuse
+ settings.setValue('RTE_SDK', (settings.getValue('RTE_SDK_CUSE')))
+ settings.setValue('OVS_DIR', (settings.getValue('OVS_DIR_CUSE')))
+ settings.setValue('QEMU_DIR', (settings.getValue('QEMU_DIR_CUSE')))
+ else:
+ # settings paths for VhostUser
+ settings.setValue('RTE_SDK', (settings.getValue('RTE_SDK_USER')))
+ settings.setValue('OVS_DIR', (settings.getValue('OVS_DIR_USER')))
+ settings.setValue('QEMU_DIR', (settings.getValue('QEMU_DIR_USER')))
+ else:
+ # default - set to VHOST USER but can be changed during enhancement
+ settings.setValue('RTE_SDK', (settings.getValue('RTE_SDK_USER')))
+ settings.setValue('OVS_DIR', (settings.getValue('OVS_DIR_USER')))
+ settings.setValue('QEMU_DIR', (settings.getValue('QEMU_DIR_USER')))
+
# create results directory
if not os.path.exists(results_path):
logger.info("Creating result directory: " + results_path)