FIX: VM startup after socket move

+ Still workaround for VPP bug not creating dir at startup

Signed-off-by: Peter Mikus <pmikus@cisco.com>
Change-Id: I8b87ac70e5f85d538a25058dcb5453f89e21498f

diff --git a/resources/libraries/python/QemuUtils.py b/resources/libraries/python/QemuUtils.py
index 41b5f54..a4d8533 100644 (file)
--- a/resources/libraries/python/QemuUtils.py
+++ b/resources/libraries/python/QemuUtils.py
@@ -235,7 +235,6 @@ class QemuUtils(object):
             vpp_config.add_dpdk_no_tx_checksum_offload()
         vpp_config.add_plugin('disable', 'default')
         vpp_config.add_plugin('enable', 'dpdk_plugin.so')
             vpp_config.add_dpdk_no_tx_checksum_offload()
         vpp_config.add_plugin('disable', 'default')
         vpp_config.add_plugin('enable', 'dpdk_plugin.so')

-        vpp_config.add_plugin('enable', 'memif_plugin.so')

         vpp_config.write_config(startup)
 
         # Create VPP running configuration.
         vpp_config.write_config(startup)
 
         # Create VPP running configuration.

diff --git a/resources/templates/vm/init.sh b/resources/templates/vm/init.sh
index 446b499..0600693 100644 (file)
--- a/resources/templates/vm/init.sh
+++ b/resources/templates/vm/init.sh
@@ -9,5 +9,6 @@ echo 0000:00:06.0 > /sys/bus/pci/devices/0000:00:06.0/driver/unbind
 echo 0000:00:07.0 > /sys/bus/pci/devices/0000:00:07.0/driver/unbind
 echo vfio-pci > /sys/bus/pci/devices/0000:00:06.0/driver_override
 echo vfio-pci > /sys/bus/pci/devices/0000:00:07.0/driver_override
 echo 0000:00:07.0 > /sys/bus/pci/devices/0000:00:07.0/driver/unbind
 echo vfio-pci > /sys/bus/pci/devices/0000:00:06.0/driver_override
 echo vfio-pci > /sys/bus/pci/devices/0000:00:07.0/driver_override

+mkdir -p /var/run/vpp

 $vnf_bin
 poweroff -f
 $vnf_bin
 poweroff -f