Using no-pci option rather than removing the dpdk-plugin in vpp. Removed starting and stopping of vpp in the host to add the uio devices in the containers. Added executable option in the TextFile resource. vICN now deploy the vppctl_wrapper command in every container runing vpp. Several bugfixes on the cicn plugin.

Change-Id: I395bf92771bf27cf25324d208b847b640ccc475c
Signed-off-by: Alberto Compagno <acompagn+fdio@cisco.com>

1 files changed, 2 insertions, 16 deletions

diff --git a/vicn/resource/vpp/vpp_host.py b/vicn/resource/vpp/vpp_host.py
index 29094451..60fdfd47 100644
--- a/vicn/resource/vpp/vpp_host.py
+++ b/vicn/resource/vpp/vpp_host.py
@@ -96,11 +96,7 @@ class VPPHost(LinuxApplication):
                 filename = FN_APPARMOR_DPDK_SCRIPT,
                 content = TPL_APPARMOR_DPDK_SCRIPT,
                 overwrite = True)
-        startup_conf = TextFile(node = self.node,
-                filename = FN_VPP_DPDK_SCRIPT,
-                content = TPL_VPP_DPDK_DAEMON_SCRIPT,
-                overwrite = True)
-        return app_armor_file | startup_conf
+        return app_armor_file
 
     @inherit_parent
     @task
@@ -118,23 +114,13 @@ class VPPHost(LinuxApplication):
         sysctl_hugepages = BashTask(self.node, CMD_SYSCTL_HUGEPAGES,
                 {'nb_hp': DEFAULT_NB_HUGEPAGES})
 
-        # Hook
-        # The following is needed to create uio devices in /dev. They are
-        # required to let vpp to use dpdk (or other compatibles) nics. From a
-        # container, vpp cannot create those devices, therefore we need to
-        # create them in the host and then mount them on each container running
-        # vpp (and using a physical nic)
-        stop_vpp = BashTask(self.node, CMD_VPP_STOP_SERVICE + " || true")
-        disable_vpp = BashTask(self.node, CMD_VPP_DISABLE + " || true")
-        disable_vpp = stop_vpp > disable_vpp
-
         create_uio = EmptyTask()
         for device in self.dpdk_devices:
             create_uio = create_uio > BashTask(self.node,
                     CMD_CREATE_UIO_DEVICES, {'pci_address' : device})
 
         return ((modules | app_armor_reload) | sysctl_hugepages) > \
-            (disable_vpp > create_uio)
+            create_uio
 
     #--------------------------------------------------------------------------
     # Attributes