diff options
Diffstat (limited to 'conf')
| -rw-r--r-- | conf/02_vswitch.conf | 2 | ||||
| -rw-r--r-- | conf/04_vnf.conf | 21 |
2 files changed, 19 insertions, 4 deletions
diff --git a/conf/02_vswitch.conf b/conf/02_vswitch.conf index 2335b1f1..8085f3ca 100644 --- a/conf/02_vswitch.conf +++ b/conf/02_vswitch.conf @@ -71,7 +71,7 @@ VSWITCHD_VANILLA_ARGS = ['--pidfile'] VSWITCH_VANILLA_PHY_PORT_NAMES = ['', ''] # use full module path to load module matching OVS version built from the source -VSWITCH_VANILLA_KERNEL_MODULES = [os.path.join(ROOT_DIR, 'datapath/linux/openvswitch.ko')] +VSWITCH_VANILLA_KERNEL_MODULES = [os.path.join(OVS_DIR_VANILLA, 'datapath/linux/openvswitch.ko')] # Bridge name to be used by VSWTICH VSWITCH_BRIDGE_NAME = 'br0' diff --git a/conf/04_vnf.conf b/conf/04_vnf.conf index 1059482e..2be96859 100644 --- a/conf/04_vnf.conf +++ b/conf/04_vnf.conf @@ -31,6 +31,21 @@ GUEST_SHARE_DIR = ['/tmp/qemu0_share', '/tmp/qemu1_share'] # 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] + +# 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-param "guest_loopback=l2fwd" +# For 2 VNFs you may use ['testpmd', 'l2fwd'] +GUEST_LOOPBACK = ['testpmd', 'testpmd'] + # username for guest image GUEST_USERNAME = '' @@ -38,7 +53,7 @@ GUEST_USERNAME = '' GUEST_PASSWORD = '' # login username prompt for guest image -GUEST_PROMPT_LOGIN = '' +GUEST_PROMPT_LOGIN = '.* login:' # login password prompt for guest image GUEST_PROMPT_PASSWORD = '' @@ -100,8 +115,8 @@ 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 = ['eth0', 'eth2'] -VANILLA_NIC2_NAME = ['eth1', 'eth3'] +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'] |