X-Git-Url: https://gerrit.fd.io/r/gitweb?p=csit.git;a=blobdiff_plain;f=resources%2Flibraries%2Fpython%2FVPPUtil.py;h=e343d38d2ffbacd2583d97944318fc2faedfa72d;hp=0c603616a2d9458f3f7acdd38c659d0fccd8c44d;hb=HEAD;hpb=334e9005b0c8a0c7cdd37f1c267981b46057dc6a

diff --git a/resources/libraries/python/VPPUtil.py b/resources/libraries/python/VPPUtil.py
index 0c603616a2..1ede76cdd4 100644
--- a/resources/libraries/python/VPPUtil.py
+++ b/resources/libraries/python/VPPUtil.py
@@ -28,35 +28,6 @@ from resources.libraries.python.topology import Topology, SocketType, NodeType
 class VPPUtil:
     """General class for any VPP related methods/functions."""
 
-    @staticmethod
-    def show_vpp_settings(node, *additional_cmds):
-        """Print default VPP settings. In case others are needed, can be
-        accepted as next parameters (each setting one parameter), preferably
-        in form of a string.
-
-        :param node: VPP node.
-        :param additional_cmds: Additional commands that the vpp should print
-            settings for.
-        :type node: dict
-        :type additional_cmds: tuple
-        """
-        def_setting_tb_displayed = {
-            u"IPv6 FIB": u"ip6 fib",
-            u"IPv4 FIB": u"ip fib",
-            u"Interface IP": u"int addr",
-            u"Interfaces": u"int",
-            u"ARP": u"ip arp",
-            u"Errors": u"err"
-        }
-
-        if additional_cmds:
-            for cmd in additional_cmds:
-                def_setting_tb_displayed[f"Custom Setting: {cmd}"] = cmd
-
-        for _, cmd in def_setting_tb_displayed.items():
-            command = f"vppctl sh {cmd}"
-            exec_cmd_no_error(node, command, timeout=30, sudo=True)
-
     @staticmethod
     def restart_vpp_service(node, node_key=None):
         """Restart VPP service on the specified topology node.
@@ -70,7 +41,14 @@ class VPPUtil:
         """
         # Containers have a separate lifecycle, but better be safe.
         PapiSocketExecutor.disconnect_all_sockets_by_node(node)
-        DUTSetup.restart_service(node, Constants.VPP_UNIT)
+
+        VPPUtil.stop_vpp_service(node)
+        command = "/usr/bin/vpp -c /etc/vpp/startup.conf"
+        message = f"Node {node[u'host']} failed to start VPP!"
+        exec_cmd_no_error(
+            node, command, timeout=180, sudo=True, message=message
+        )
+
         if node_key:
             Topology.add_new_socket(
                 node, SocketType.CLI, node_key, Constants.SOCKCLI_PATH)
@@ -101,12 +79,19 @@ class VPPUtil:
         :type node: dict
         :type node_key: str
         """
-        # Containers have a separate lifecycle, but better be safe.
         PapiSocketExecutor.disconnect_all_sockets_by_node(node)
-        DUTSetup.stop_service(node, Constants.VPP_UNIT)
+        command = "pkill -9 vpp; sleep 1"
+        exec_cmd(node, command, timeout=180, sudo=True)
+        command = (
+            "/bin/rm -f /dev/shm/db /dev/shm/global_vm /dev/shm/vpe-api"
+        )
+        exec_cmd(node, command, timeout=180, sudo=True)
+
         if node_key:
-            Topology.del_node_socket_id(node, SocketType.PAPI, node_key)
-            Topology.del_node_socket_id(node, SocketType.STATS, node_key)
+            if Topology.get_node_sockets(node, socket_type=SocketType.PAPI):
+                Topology.del_node_socket_id(node, SocketType.PAPI, node_key)
+            if Topology.get_node_sockets(node, socket_type=SocketType.STATS):
+                Topology.del_node_socket_id(node, SocketType.STATS, node_key)
 
     @staticmethod
     def stop_vpp_service_on_all_duts(nodes):
@@ -119,6 +104,39 @@ class VPPUtil:
             if node[u"type"] == NodeType.DUT:
                 VPPUtil.stop_vpp_service(node, node_key)
 
+    @staticmethod
+    def install_vpp_on_all_duts(nodes, vpp_pkg_dir):
+        """Install VPP on all DUT nodes.
+
+        :param nodes: Nodes in the topology.
+        :param vpp_pkg_dir: Path to directory where VPP packages are stored.
+        :type nodes: dict
+        :type vpp_pkg_dir: str
+        """
+        VPPUtil.stop_vpp_service_on_all_duts(nodes)
+        for node in nodes.values():
+            message = f"Failed to install VPP on host {node['host']}!"
+            if node["type"] == NodeType.DUT:
+                command = "mkdir -p /var/log/vpp/"
+                exec_cmd(node, command, sudo=True)
+
+                command = "ln -s /dev/null /etc/systemd/system/vpp.service"
+                exec_cmd(node, command, sudo=True)
+
+                command = "ln -s /dev/null /etc/sysctl.d/80-vpp.conf"
+                exec_cmd(node, command, sudo=True)
+
+                command = "apt-get purge -y '*vpp*' || true"
+                exec_cmd_no_error(node, command, timeout=120, sudo=True)
+
+                command = f"dpkg -i --force-all {vpp_pkg_dir}*.deb"
+                exec_cmd_no_error(
+                    node, command, timeout=120, sudo=True, message=message
+                )
+
+                command = "dpkg -l | grep vpp"
+                exec_cmd_no_error(node, command, sudo=True)
+
     @staticmethod
     def verify_vpp_installed(node):
         """Verify that VPP is installed on the specified topology node.