VPP: Add Default paths for VPP.

This modification supports the use of Userspace CNI plugin with VPP.

Signed-off-by: Sridhar K. N. Rao <sridhar.rao@spirent.com>
Change-Id: I4b85d855f84686534b5167e182dacd1b01f5fb13

diff --git a/conf/02_vswitch.conf b/conf/02_vswitch.conf
index 283da27..4eca1a5 100644 (file)
--- a/conf/02_vswitch.conf
+++ b/conf/02_vswitch.conf
@@ -224,7 +224,7 @@ OVS_ROUTING_TABLES = False
 #########################
 # Set of arguments used for startup of VPP
 # NOTE: DPDK socket mem allocation is driven by parameter DPDK_SOCKET_MEM
-VSWITCH_VPP_CLI_SOCK = ''
+VSWITCH_VPP_CLI_SOCK = '/run/vpp/cli.sock'
 VSWITCH_VPP_ARGS = {
     'unix' : [
         'interactive',      # required by VSPERF to detect successful VPP startup
@@ -236,6 +236,9 @@ VSWITCH_VPP_ARGS = {
         'workers 2',
         'corelist-workers 4,5',
     ],
+    'socksvr' : [
+        'socket-name /run/vpp-api.sock',
+    ],
 }
 
 # log file for VPP

diff --git a/requirements.txt b/requirements.txt
index 03049fd..afd6325 100644 (file)
--- a/requirements.txt
+++ b/requirements.txt
@@ -16,7 +16,7 @@ pylint==1.8.2
 pyzmq==14.5.0
 distro
 stcrestclient
-matplotlib==2.2.2
+matplotlib
 numpy
 pycrypto
 tabulate

diff --git a/systems/README.md b/systems/README.md
index d72aae6..ca6557e 100644 (file)
--- a/systems/README.md
+++ b/systems/README.md
@@ -12,3 +12,7 @@ On a freshly built system, run the following with a super user privilege
 or with password less sudo access.
 
 ./build_base_machine.sh
+
+If you want to use vsperf in trafficgen-mode ONLY, then add a parameter.
+
+./build_base_machine.sh trafficgen