pkt_gen: Add IxNet support for GRE frames

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

diff --git a/conf/04_vnf.conf b/conf/04_vnf.conf
index 2be9685..dc15fd1 100644 (file)
--- a/conf/04_vnf.conf
+++ b/conf/04_vnf.conf
@@ -47,19 +47,19 @@ GUEST_TIMEOUT = [180, 180]
 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 = '.* 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'
@@ -74,11 +74,14 @@ LOG_FILE_GUEST_CMDS = 'guest-cmds.log'
 
 QEMU_BIN = os.path.join(QEMU_DIR, 'x86_64-softmmu/qemu-system-x86_64')
 
+# For 2 VNFs you may use ['eth0', 'eth2']
+GUEST_NIC1_NAME = ['eth0', 'eth0']
+GUEST_NIC2_NAME = ['eth1', 'eth1']
+
 # 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']
 
-
 # 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']
@@ -115,9 +118,6 @@ 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_NAME = ['eth1', 'eth3']
-VANILLA_NIC2_NAME = ['eth2', 'eth4']
-
 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']