X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=conf%2F04_vnf.conf;h=1c3712ed532a2477eec72597c5574db7da1fe3a6;hb=refs%2Fchanges%2F04%2F1304%2F4;hp=2603d58902c3ec15a30c721ef744d3fb7b0c86f0;hpb=0d212ded93dfd7f0b7868d00a1ed01270d55063b;p=vswitchperf.git

diff --git a/conf/04_vnf.conf b/conf/04_vnf.conf
index 2603d589..1c3712ed 100644
--- a/conf/04_vnf.conf
+++ b/conf/04_vnf.conf
@@ -15,13 +15,8 @@
 # ############################
 # VNF configuration
 # ############################
-QEMU_DIR = ''
-
-# ############################
-# Executables
-# ############################
-
-QEMU_BIN = 'qemu-system-x86_64'
+VNF_DIR = 'vnfs/'
+VNF = 'QemuDpdkVhost'
 
 # ############################
 # Guest configuration
@@ -56,3 +51,40 @@ LOG_FILE_QEMU = 'qemu.log'
 # multiple guests will result in log files with the guest number appended
 LOG_FILE_GUEST_CMDS = 'guest-cmds.log'
 
+# ############################
+# Executables
+# ############################
+
+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'
+
+GUEST_NET1_PCI_ADDRESS = '00:04.0'
+GUEST_NET2_PCI_ADDRESS = '00:05.0'
+
+GUEST_MEMORY = '3072'
+
+# test-pmd requires 2 VM cores
+GUEST_SMP = '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_OVS_DPDK_DIR = '/root/ovs_dpdk'
+OVS_DPDK_SHARE = '/mnt/ovs_dpdk_share'