diff options
Diffstat (limited to 'conf')
| -rwxr-xr-x | conf/01_testcases.conf | 16 | ||||
| -rw-r--r-- | conf/02_vswitch.conf | 3 | ||||
| -rw-r--r-- | conf/04_vnf.conf | 39 |
3 files changed, 35 insertions, 23 deletions
diff --git a/conf/01_testcases.conf b/conf/01_testcases.conf index 815e3a76..39e924bd 100755 --- a/conf/01_testcases.conf +++ b/conf/01_testcases.conf @@ -116,6 +116,22 @@ PERFORMANCE_TESTS = [ "biDirectional": "True", }, { + "Name": "pvvp_tput", + "Traffic Type": "rfc2544", + "Collector": "cpu", + "Deployment": "pvvp", + "Description": "LTD.Throughput.RFC2544.PacketLossRatio", + "biDirectional": "True", + }, + { + "Name": "pvvp_back2back", + "Traffic Type": "back2back", + "Collector": "cpu", + "Deployment": "pvvp", + "Description": "LTD.Throughput.RFC2544.BackToBackFrames", + "biDirectional": "True", + }, + { "Name": "phy2phy_cpu_load", "Traffic Type": "rfc2544", "Deployment": "p2p", diff --git a/conf/02_vswitch.conf b/conf/02_vswitch.conf index 73c42a9a..32f4c0e1 100644 --- a/conf/02_vswitch.conf +++ b/conf/02_vswitch.conf @@ -42,6 +42,9 @@ VSWITCHD_VANILLA_ARGS = ['--pidfile'] VSWITCH_VANILLA_PHY_PORT_NAMES = ['', ''] VSWITCH_VANILLA_KERNEL_MODULES = ['openvswitch'] +# Bridge name to be used by VSWTICH +VSWITCH_BRIDGE_NAME = 'br0' + # directory where hugepages will be mounted on system init HUGEPAGE_DIR = '/dev/hugepages' diff --git a/conf/04_vnf.conf b/conf/04_vnf.conf index 1c3712ed..034e4108 100644 --- a/conf/04_vnf.conf +++ b/conf/04_vnf.conf @@ -16,18 +16,20 @@ # VNF configuration # ############################ VNF_DIR = 'vnfs/' -VNF = 'QemuDpdkVhost' +VNF = 'QemuDpdkVhostUser' # ############################ # Guest configuration # ############################ # directory which is shared to QEMU guests. Useful for exchanging files -# between host and guest -GUEST_SHARE_DIR = '/tmp/qemu_share' +# between host and guest, VNF specific share will be created +# For 2 VNFs you may use ['/tmp/qemu0_share', '/tmp/qemu1_share'] +GUEST_SHARE_DIR = ['/tmp/qemu0_share', '/tmp/qemu1_share'] # location of guest disk image -GUEST_IMAGE = '' +# For 2 VNFs you may use ['guest1.img', 'guest2.img'] +GUEST_IMAGE = ['', ''] # username for guest image GUEST_USERNAME = '' @@ -57,34 +59,25 @@ LOG_FILE_GUEST_CMDS = 'guest-cmds.log' QEMU_BIN = 'qemu-system-x86_64' -# Guest shell prompt when inside DPDK dir -# for example: root@ovdk_guest DPDK]#' -QEMU_GUEST_DPDK_PROMPT = '' - -# Guest shell prompt when inside the -# test-pmd directory of DPDK -# for example: 'root@ovdk_guest test-pmd]#' -QEMU_GUEST_TEST_PMD_PROMPT = '' - OVS_VAR_DIR = '/usr/local/var/run/openvswitch/' -GUEST_NET1_MAC = '00:00:00:00:00:01' -GUEST_NET2_MAC = '00:00:00:00:00:02' +# For 2 VNFs you may use ['00:00:00:00:00:01', '00:00:00:00:00:03'] +GUEST_NET1_MAC = ['00:00:00:00:00:01', '00:00:00:00:00:03'] +GUEST_NET2_MAC = ['00:00:00:00:00:02', '00:00:00:00:00:04'] -GUEST_NET1_PCI_ADDRESS = '00:04.0' -GUEST_NET2_PCI_ADDRESS = '00:05.0' -GUEST_MEMORY = '3072' +# For 2 VNFs you may use ['00:04.0', '00:04.0'] +GUEST_NET1_PCI_ADDRESS = ['00:04.0', '00:04.0'] +GUEST_NET2_PCI_ADDRESS = ['00:05.0', '00:05.0'] + +GUEST_MEMORY = ['4096', '4096'] # test-pmd requires 2 VM cores -GUEST_SMP = '2' +GUEST_SMP = ['2', '2'] # Host cores to use to affinitize the SMP cores of a QEMU instance # For 2 VNFs you may use [(4,5), (6, 7)] -GUEST_CORE_BINDING = [(4, 5)] - -# Starte Qemu on cores 3, 4,5 (0x038) -QEMU_CORE = '38' +GUEST_CORE_BINDING = [(6, 7), (9, 10)] GUEST_OVS_DPDK_DIR = '/root/ovs_dpdk' OVS_DPDK_SHARE = '/mnt/ovs_dpdk_share' |