xena_bug: Resolve baseconfig reporting option to work with new versions

[vswitchperf.git] / conf / 04_vnf.conf

diff --git a/conf/04_vnf.conf b/conf/04_vnf.conf
index 1c3712e..926ea50 100644 (file)
--- a/conf/04_vnf.conf
+++ b/conf/04_vnf.conf
@@ -16,33 +16,53 @@
 # 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 = ['', '']
+
+# guarding timer for VM start up
+# For 2 VNFs you may use [180, 180]
+GUEST_TIMEOUT = [180, 180]
+
+# packet forwarding mode: io|mac|mac_retry|macswap|flowgen|rxonly|txonly|csum|icmpecho
+GUEST_TESTPMD_FWD_MODE = 'csum'
+
+# guest loopback application method; supported options are:
+#       'testpmd'       - testpmd from dpdk will be built and used
+#       'l2fwd'         - l2fwd module provided by Huawei will be built and used
+#       'linux_bridge'  - linux bridge will be configured
+#       'buildin'       - nothing will be configured by vsperf; VM image must
+#                         ensure traffic forwarding between its interfaces
+# This configuration option can be overridden by CLI SCALAR option
+# guest_loopback, e.g. --test-params "guest_loopback=l2fwd"
+# For 2 VNFs you may use ['testpmd', 'l2fwd']
+GUEST_LOOPBACK = ['testpmd', 'testpmd']
 
 # username for guest image
-GUEST_USERNAME = ''
+GUEST_USERNAME = 'root'
 
 # password for guest image
-GUEST_PASSWORD = ''
+GUEST_PASSWORD = 'root'
 
 # login username prompt for guest image
-GUEST_PROMPT_LOGIN = ''
+GUEST_PROMPT_LOGIN = '.* login:'
 
 # login password prompt for guest image
-GUEST_PROMPT_PASSWORD = ''
+GUEST_PROMPT_PASSWORD = 'Password: '
 
 # standard prompt for guest image
-GUEST_PROMPT = ''
+GUEST_PROMPT = 'root.*#'
 
 # log file for qemu
 LOG_FILE_QEMU = 'qemu.log'
@@ -55,36 +75,53 @@ LOG_FILE_GUEST_CMDS = 'guest-cmds.log'
 # Executables
 # ############################
 
-QEMU_BIN = 'qemu-system-x86_64'
+QEMU_BIN = os.path.join(QEMU_DIR, 'x86_64-softmmu/qemu-system-x86_64')
 
-# Guest shell prompt when inside DPDK dir
-# for example: root@ovdk_guest DPDK]#'
-QEMU_GUEST_DPDK_PROMPT = ''
+# For 2 VNFs you may use ['eth0', 'eth2']
+GUEST_NIC1_NAME = ['eth0', 'eth0']
+GUEST_NIC2_NAME = ['eth1', 'eth1']
 
-# Guest shell prompt when inside the
-# test-pmd directory of DPDK
-# for example: 'root@ovdk_guest test-pmd]#'
-QEMU_GUEST_TEST_PMD_PROMPT = ''
+# 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']
 
-OVS_VAR_DIR = '/usr/local/var/run/openvswitch/'
+# 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_NET1_MAC = '00:00:00:00:00:01'
-GUEST_NET2_MAC = '00:00:00:00:00:02'
-
-GUEST_NET1_PCI_ADDRESS = '00:04.0'
-GUEST_NET2_PCI_ADDRESS = '00:05.0'
-
-GUEST_MEMORY = '3072'
+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_START_TIMEOUT = 120
 GUEST_OVS_DPDK_DIR = '/root/ovs_dpdk'
 OVS_DPDK_SHARE = '/mnt/ovs_dpdk_share'
+
+# IP addresses to use for Vanilla OVS PVP testing
+# Consider using RFC 2544/3330 recommended IP addresses for benchmark testing.
+# Network: 198.18.0.0/15
+# Netmask: 255.254.0.0
+# Broadcast: 198.19.255.255
+# First IP: 198.18.0.1
+# Last IP: 198.19.255.254
+# Hosts: 131070
+#
+
+# ARP entries for the IXIA ports and the bridge you are using:
+VANILLA_TGEN_PORT1_IP = '1.1.1.10'
+VANILLA_TGEN_PORT1_MAC = 'AA:BB:CC:DD:EE:FF'
+
+VANILLA_TGEN_PORT2_IP = '1.1.2.10'
+VANILLA_TGEN_PORT2_MAC = 'AA:BB:CC:DD:EE:F0'
+
+VANILLA_BRIDGE_IP = ['1.1.1.5/16', '1.1.1.6/16']
+
+VANILLA_NIC1_IP_CIDR = ['192.168.1.2/24', '192.168.1.4/24']
+VANILLA_NIC2_IP_CIDR = ['192.168.1.3/24', '192.168.1.5/24']
+
+VNF_AFFINITIZATION_ON = True