From: Yichen Wang <yicwang@cisco.com>
Date: Tue, 27 Feb 2018 00:27:53 +0000 (-0800)
Subject: [NFVBENCH-70] Update nfvbenchvm to 0.6
X-Git-Tag: 1.2.6~1
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=54365002e932743f693af28d3f568c20a9e18513;p=nfvbench.git

[NFVBENCH-70] Update nfvbenchvm to 0.6

1. Update kernel to 4.4.118-1.el7.elrepo.x86_64;
2. Update to build testpmd off DPDK 18.02;
3. Update txd/rxd of testpmd to 256/1024;
4. Update VPP to 17.10-9~gd594711~b55.x86_64;

Change-Id: I1321b306143d1daf81f8a984ad7739a980c5cfb9
Signed-off-by: Yichen Wang <yicwang@cisco.com>
---

diff --git a/nfvbenchvm/dib/build-image.sh b/nfvbenchvm/dib/build-image.sh
index 88cf2e5..d9ab20e 100755
--- a/nfvbenchvm/dib/build-image.sh
+++ b/nfvbenchvm/dib/build-image.sh
@@ -11,7 +11,7 @@ set -e
 gs_url=artifacts.opnfv.org/nfvbench/images
 
 # image version number
-__version__=0.5
+__version__=0.6
 image_name=nfvbenchvm_centos-$__version__
 
 # if image exists skip building
diff --git a/nfvbenchvm/dib/elements/nfvbenchvm/post-install.d/02-testpmd-script b/nfvbenchvm/dib/elements/nfvbenchvm/post-install.d/02-testpmd-script
index 2136c3a..6f133d1 100755
--- a/nfvbenchvm/dib/elements/nfvbenchvm/post-install.d/02-testpmd-script
+++ b/nfvbenchvm/dib/elements/nfvbenchvm/post-install.d/02-testpmd-script
@@ -1,7 +1,7 @@
 #!/bin/bash
 
-DPDK=dpdk-17.08
-DPDK_UNTAR=dpdk-17.08
+DPDK=dpdk-18.02
+DPDK_UNTAR=dpdk-18.02
 
 # pick up the kernel version for the target image
 kernel_version=`ls -t /lib/modules | awk 'NR==1 {print}'`
diff --git a/nfvbenchvm/dib/elements/nfvbenchvm/static/etc/rc.d/rc.local b/nfvbenchvm/dib/elements/nfvbenchvm/static/etc/rc.d/rc.local
index dddc787..caf3142 100644
--- a/nfvbenchvm/dib/elements/nfvbenchvm/static/etc/rc.d/rc.local
+++ b/nfvbenchvm/dib/elements/nfvbenchvm/static/etc/rc.d/rc.local
@@ -71,10 +71,8 @@ if [ "$FORWARDER" == "testpmd" ]; then
                          -n 4 \
                          -- \
                              --burst=32 \
-                             --txd=2048 \
-                             --rxd=2048 \
-                             --txqflags=0xf00 \
-                             --disable-hw-vlan \
+                             --txd=256 \
+                             --rxd=1024 \
                              --eth-peer=0,$TG_MAC1 \
                              --eth-peer=1,$TG_MAC2 \
                              --forward-mode=mac \