X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=resources%2Flibraries%2Fpython%2FVPPUtil.py;h=26c2109117ed21cc71989acc147614ab8805653c;hb=115cf4fdd4604424306624cf534ad563fee4991d;hp=17043aa599e83c48345aa8028a4ddc0c8f57c509;hpb=a33b52ae0f255021d89307ebc694f6e907906151;p=csit.git

diff --git a/resources/libraries/python/VPPUtil.py b/resources/libraries/python/VPPUtil.py
index 17043aa599..26c2109117 100644
--- a/resources/libraries/python/VPPUtil.py
+++ b/resources/libraries/python/VPPUtil.py
@@ -1,4 +1,4 @@
-# Copyright (c) 2020 Cisco and/or its affiliates.
+# Copyright (c) 2023 Cisco and/or its affiliates.
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
 # You may obtain a copy of the License at:
@@ -18,6 +18,9 @@ from robot.api import logger
 from resources.libraries.python.Constants import Constants
 from resources.libraries.python.DUTSetup import DUTSetup
 from resources.libraries.python.PapiExecutor import PapiSocketExecutor
+from resources.libraries.python.model.ExportResult import (
+    export_dut_type_and_version
+)
 from resources.libraries.python.ssh import exec_cmd_no_error, exec_cmd
 from resources.libraries.python.topology import Topology, SocketType, NodeType
 
@@ -25,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.
@@ -69,6 +43,8 @@ class VPPUtil:
         PapiSocketExecutor.disconnect_all_sockets_by_node(node)
         DUTSetup.restart_service(node, Constants.VPP_UNIT)
         if node_key:
+            Topology.add_new_socket(
+                node, SocketType.CLI, node_key, Constants.SOCKCLI_PATH)
             Topology.add_new_socket(
                 node, SocketType.PAPI, node_key, Constants.SOCKSVR_PATH)
             Topology.add_new_socket(
@@ -197,6 +173,7 @@ class VPPUtil:
         """Run "show_version" PAPI command.
 
         Socket is configurable, so VPP inside container can be accessed.
+        The result is exported to JSON UTI output as "dut-version".
 
         :param node: Node to run command on.
         :param remote_vpp_socket: Path to remote socket to target VPP.
@@ -214,7 +191,9 @@ class VPPUtil:
             reply = papi_exec.add(cmd).get_reply()
         if log:
             logger.info(f"VPP version: {reply[u'version']}\n")
-        return f"{reply[u'version']}"
+        version = f"{reply[u'version']}"
+        export_dut_type_and_version(u"VPP", version)
+        return version
 
     @staticmethod
     def show_vpp_version_on_all_duts(nodes):
@@ -390,7 +369,7 @@ class VPPUtil:
         :type node: dict
         :type graph_node_name: str
         :type graph_next_name: str
-        :returns: The index of the next node.
+        :returns: The index of the next graph node.
         :rtype: int
         """
         cmd = u"add_node_next"
@@ -402,3 +381,20 @@ class VPPUtil:
             reply = papi_exec.add(cmd, **args).get_reply()
 
         return reply[u"next_index"]
+
+    @staticmethod
+    def vpp_set_neighbor_limit_on_all_duts(nodes, count):
+        """VPP set neighbor count limit on all DUTs in the given topology.
+
+        :param nodes: Nodes in the topology.
+        :param count: Neighbor count need to set.
+        :type nodes: dict
+        :type count: int
+        """
+        for node in nodes.values():
+            if node[u"type"] == NodeType.DUT:
+                cmd = f"set ip neighbor-config ip4 limit {count}"
+                PapiSocketExecutor.run_cli_cmd(node, cmd)
+
+                cmd = f"set ip neighbor-config ip6 limit {count}"
+                PapiSocketExecutor.run_cli_cmd(node, cmd)