NFVBENCH-211 Fix VPP driver for loop VM

Change-Id: I6e55b4c0ad41d773b5303b8dc8c09cee8482c646
Signed-off-by: fmenguy <francoisregis.menguy@orange.com>

diff --git a/nfvbenchvm/dib/elements/nfvbenchvm/static/etc/rc.d/rc.local.loopvm b/nfvbenchvm/dib/elements/nfvbenchvm/static/etc/rc.d/rc.local.loopvm
index bc14902..ecc8b05 100644 (file)
--- a/nfvbenchvm/dib/elements/nfvbenchvm/static/etc/rc.d/rc.local.loopvm
+++ b/nfvbenchvm/dib/elements/nfvbenchvm/static/etc/rc.d/rc.local.loopvm
@@ -167,10 +167,11 @@ fi
 if [ $PCI_ADDRESS_1 ] && [ $PCI_ADDRESS_2 ]; then
     logger "NFVBENCHVM: Using pci $PCI_ADDRESS_1 ($INTF_MAC1)"
     logger "NFVBENCHVM: Using pci $PCI_ADDRESS_2 ($INTF_MAC2)"
+    # active uio_pci_generic driver
+    modprobe uio_pci_generic
     # Configure the forwarder
     if [ "$FORWARDER" == "testpmd" ]; then
         echo "Configuring testpmd..."
-        modprobe uio_pci_generic
         mkdir /dpdk
         echo "set promisc all off" > /dpdk/testpmd_cmd.txt
         # Binding ports to DPDK VFIO or UIO

diff --git a/nfvbenchvm/dib/elements/nfvbenchvm/static/vpp/startup.conf b/nfvbenchvm/dib/elements/nfvbenchvm/static/vpp/startup.conf
index d174299..874f6cb 100644 (file)
--- a/nfvbenchvm/dib/elements/nfvbenchvm/static/vpp/startup.conf
+++ b/nfvbenchvm/dib/elements/nfvbenchvm/static/vpp/startup.conf
@@ -19,7 +19,7 @@ dpdk {
   socket-mem 1024
   dev {{PCI_ADDRESS_1}}
   dev {{PCI_ADDRESS_2}}
-  uio-driver igb_uio
+  uio-driver uio_pci_generic
   num-mbufs {{NUM_MBUFS}}
 }