6 files changed, 41 insertions, 5 deletions
diff --git a/conf/02_vswitch.conf b/conf/02_vswitch.conf
index 79f0afbd..81632d56 100644
--- a/conf/02_vswitch.conf
+++ b/conf/02_vswitch.conf
@@ -100,6 +100,11 @@ VSWITCH_BRIDGE_NAME = 'br0'
 # directory where hugepages will be mounted on system init
 HUGEPAGE_DIR = '/dev/hugepages'
 
+# If no hugepages are available, try to allocate HUGEPAGE_RAM_ALLOCATION.
+# Default is 10 GB.
+# 10 GB (10485760 kB) or more is recommended for PVP & PVVP testing scenarios.
+HUGEPAGE_RAM_ALLOCATION = 10485760
+
 # Sets OVS PMDs core mask to 30 for affinitization to 5th and 6th CPU core.
 # Note that the '0x' notation should not be used.
 VSWITCH_PMD_CPU_MASK = '30'
diff --git a/conf/03_traffic.conf b/conf/03_traffic.conf
index 01e3e5cf..fd0f589d 100644
--- a/conf/03_traffic.conf
+++ b/conf/03_traffic.conf
@@ -28,7 +28,7 @@ TRAFFICGEN = 'Dummy'
 #TRAFFICGEN = 'IxNet'
 #TRAFFICGEN = 'Ixia'
 #TRAFFICGEN = 'Xena'
-#TRAFFICGEN = 'MoonGen'
+#TRAFFICGEN = 'Moongen'
 
 # List of packet sizes to send.
 # Expand like this: (64, 128, 256, 512, 1024)
@@ -179,13 +179,26 @@ TRAFFICGEN_XENA_PORT1_IP = '192.168.199.11'
 TRAFFICGEN_XENA_PORT1_CIDR = 24
 TRAFFICGEN_XENA_PORT1_GATEWAY = '192.168.199.1'
 
+# Xena RFC 2544 options
+# Please reference xena documentation before making changes to these settings
+TRAFFICGEN_XENA_2544_TPUT_INIT_VALUE = '10.0'
+TRAFFICGEN_XENA_2544_TPUT_MIN_VALUE = '0.1'
+TRAFFICGEN_XENA_2544_TPUT_MAX_VALUE = '100.0'
+TRAFFICGEN_XENA_2544_TPUT_VALUE_RESOLUTION = '0.5'
+TRAFFICGEN_XENA_2544_TPUT_USEPASS_THRESHHOLD = 'false'
+TRAFFICGEN_XENA_2544_TPUT_PASS_THRESHHOLD = '0.0'
+
 ###################################################
 # MoonGen Configuration and Connection Info-- BEGIN
 
+# Ex: TRAFFICGEN_MOONGEN_HOST_IP_ADDR = "192.10.1.1"
 TRAFFICGEN_MOONGEN_HOST_IP_ADDR = ''
 TRAFFICGEN_MOONGEN_USER = ''
 TRAFFICGEN_MOONGEN_BASE_DIR = ''
 TRAFFICGEN_MOONGEN_PORTS = ''
+# Ex. 10 Gbps: TRAFFICGEN_MOONGEN_LINE_SPEED_GBPS = '10'
+# Today only 10 Gbps is supported
+TRAFFICGEN_MOONGEN_LINE_SPEED_GBPS = ''
 
 # MoonGen Configuration and Connection Info-- END
 ###################################################
diff --git a/conf/04_vnf.conf b/conf/04_vnf.conf
index 0a80c1af..ff110d93 100644
--- a/conf/04_vnf.conf
+++ b/conf/04_vnf.conf
@@ -35,7 +35,10 @@ GUEST_IMAGE = ['', '']
 # 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
+# packet forwarding mode supported by testpmd; Please see DPDK documentation
+# for comprehensive list of modes supported by your version.
+# e.g. io|mac|mac_retry|macswap|flowgen|rxonly|txonly|csum|icmpecho|...
+# Note: Option "mac_retry" has been changed to "mac retry" since DPDK v16.07
 GUEST_TESTPMD_FWD_MODE = 'csum'
 
 # guest loopback application method; supported options are:
diff --git a/conf/06_pktfwd.conf b/conf/06_pktfwd.conf
index d6a83d07..6175aa6a 100644
--- a/conf/06_pktfwd.conf
+++ b/conf/06_pktfwd.conf
@@ -24,7 +24,10 @@ PKTFWD = 'TestPMD'
 # ############################
 
 TESTPMD_ARGS = []
-# packet forwarding mode: io|mac|mac_retry|macswap|flowgen|rxonly|txonly|csum|icmpecho
+# packet forwarding mode supported by testpmd; Please see DPDK documentation
+# for comprehensive list of modes supported by your version.
+# e.g. io|mac|mac_retry|macswap|flowgen|rxonly|txonly|csum|icmpecho|...
+# Note: Option "mac_retry" has been changed to "mac retry" since DPDK v16.07
 TESTPMD_FWD_MODE = 'csum'
 # checksum calculation layer: ip|udp|tcp|sctp|outer-ip
 TESTPMD_CSUM_LAYER = 'ip'
diff --git a/conf/10_custom.conf b/conf/10_custom.conf
index 4ffe470e..b3707149 100644
--- a/conf/10_custom.conf
+++ b/conf/10_custom.conf
@@ -20,7 +20,7 @@ TRAFFICGEN = 'Dummy'
 #TRAFFICGEN = 'IxNet'
 #TRAFFICGEN = 'Ixia'
 #TRAFFICGEN = 'Xena'
-#TRAFFICGEN = 'MoonGen'
+#TRAFFICGEN = 'Moongen'
 
 ###########################################
 # Spirent TestCenter Configuration -- BEGIN
@@ -79,6 +79,15 @@ TRAFFICGEN_XENA_PORT1_IP = '192.168.199.11'
 TRAFFICGEN_XENA_PORT1_CIDR = 24
 TRAFFICGEN_XENA_PORT1_GATEWAY = '192.168.199.1'
 
+# Xena RFC 2544 options
+# Please reference xena documentation before making changes to these settings
+TRAFFICGEN_XENA_2544_TPUT_INIT_VALUE = '10.0'
+TRAFFICGEN_XENA_2544_TPUT_MIN_VALUE = '0.1'
+TRAFFICGEN_XENA_2544_TPUT_MAX_VALUE = '100.0'
+TRAFFICGEN_XENA_2544_TPUT_VALUE_RESOLUTION = '0.5'
+TRAFFICGEN_XENA_2544_TPUT_USEPASS_THRESHHOLD = 'false'
+TRAFFICGEN_XENA_2544_TPUT_PASS_THRESHHOLD = '0.0'
+
 ###################################################
 # MoonGen Configuration and Connection Info-- BEGIN
 
@@ -87,6 +96,9 @@ TRAFFICGEN_MOONGEN_HOST_IP_ADDR = ""
 TRAFFICGEN_MOONGEN_USER = "root"
 TRAFFICGEN_MOONGEN_BASE_DIR = "/root/MoonGen"
 TRAFFICGEN_MOONGEN_PORTS = "{0,1}"
+# Ex. 10 Gbps: TRAFFICGEN_MOONGEN_LINE_SPEED_GBPS = '10'
+# Today only 10 Gbps is supported
+TRAFFICGEN_MOONGEN_LINE_SPEED_GBPS = '10'
 
 # MoonGen Configuration and Connection Info-- END
 ###################################################
diff --git a/conf/integration/01_testcases.conf b/conf/integration/01_testcases.conf
index 2edbe08b..e050e358 100644
--- a/conf/integration/01_testcases.conf
+++ b/conf/integration/01_testcases.conf
@@ -430,7 +430,7 @@ INTEGRATION_TESTS = [
 #        "vSwitch" : "OvsVanilla",
 #        "VNF" : "QemuVirtioNet",
 #        "Trafficgen": "IxNet",
-#        "Test Parameters": {"guest_loopback" : "linux_bridge"},
+#        "Parameters": {"guest_loopback" : "linux_bridge"},
 #        "TestSteps": STEP_VSWITCH_PVP_FLOWS_INIT +
 #                     [
 #                        ['vnf', 'start'],