X-Git-Url: https://gerrit.fd.io/r/gitweb?p=csit.git;a=blobdiff_plain;f=resources%2Flibraries%2Fpython%2FIPUtil.py;h=4d5753ea9267488729223fed3ab34c9a89636b66;hp=e91cd7df820df91b067b0ac8d33c06900bf4da71;hb=6b40a760505ae11c896deb68f92775cdf04ba965;hpb=ee33baa6d09b759876441ecde725da95f604fedd

diff --git a/resources/libraries/python/IPUtil.py b/resources/libraries/python/IPUtil.py
index e91cd7df82..4d5753ea92 100644
--- a/resources/libraries/python/IPUtil.py
+++ b/resources/libraries/python/IPUtil.py
@@ -65,6 +65,31 @@ class FibPathNhProto(IntEnum):
     FIB_PATH_NH_PROTO_BIER = 4
 
 
+class IpDscp(IntEnum):
+    """DSCP code points."""
+    IP_API_DSCP_CS0 = 0,
+    IP_API_DSCP_CS1 = 8,
+    IP_API_DSCP_AF11 = 10,
+    IP_API_DSCP_AF12 = 12,
+    IP_API_DSCP_AF13 = 14,
+    IP_API_DSCP_CS2 = 16,
+    IP_API_DSCP_AF21 = 18,
+    IP_API_DSCP_AF22 = 20,
+    IP_API_DSCP_AF23 = 22,
+    IP_API_DSCP_CS3 = 24,
+    IP_API_DSCP_AF31 = 26,
+    IP_API_DSCP_AF32 = 28,
+    IP_API_DSCP_AF33 = 30,
+    IP_API_DSCP_CS4 = 32,
+    IP_API_DSCP_AF41 = 34,
+    IP_API_DSCP_AF42 = 36,
+    IP_API_DSCP_AF43 = 38,
+    IP_API_DSCP_CS5 = 40,
+    IP_API_DSCP_EF = 46,
+    IP_API_DSCP_CS6 = 48,
+    IP_API_DSCP_CS7 = 50
+
+
 class IPUtil:
     """Common IP utilities"""
 
@@ -139,6 +164,24 @@ class IPUtil:
         PapiSocketExecutor.run_cli_cmd(node, u"show ip6 fib")
         PapiSocketExecutor.run_cli_cmd(node, u"show ip6 fib summary")
 
+    @staticmethod
+    def vpp_get_ip_table_summary(node):
+        """Get IPv4 FIB table summary on a VPP node.
+
+        :param node: VPP node.
+        :type node: dict
+        """
+        PapiSocketExecutor.run_cli_cmd(node, u"show ip fib summary")
+
+    @staticmethod
+    def vpp_get_ip_table(node):
+        """Get IPv4 FIB table on a VPP node.
+
+        :param node: VPP node.
+        :type node: dict
+        """
+        PapiSocketExecutor.run_cli_cmd(node, u"show ip fib")
+
     @staticmethod
     def vpp_get_ip_tables_prefix(node, address):
         """Get dump of all IP FIB tables on a VPP node.
@@ -308,18 +351,24 @@ class IPUtil:
         return None
 
     @staticmethod
-    def set_linux_interface_up(node, interface):
+    def set_linux_interface_up(
+            node, interface, namespace=None):
         """Set the specified interface up.
-
         :param node: VPP/TG node.
         :param interface: Interface in namespace.
+        :param namespace: Execute command in namespace. Optional
         :type node: dict
         :type interface: str
+        :type namespace: str
         :raises RuntimeError: If the interface could not be set up.
         """
-        cmd = f"ip link set {interface} up"
+        if namespace is not None:
+            cmd = f"ip netns exec {namespace} ip link set dev {interface} up"
+        else:
+            cmd = f"ip link set dev {interface} up"
         exec_cmd_no_error(node, cmd, timeout=30, sudo=True)
 
+
     @staticmethod
     def set_linux_interface_ip(
             node, interface, ip_addr, prefix, namespace=None):
@@ -512,7 +561,7 @@ class IPUtil:
         """Create prefix object.
 
         :param ip_addr: IPv4 or IPv6 address.
-        :para, addr_len: Length of IP address.
+        :param addr_len: Length of IP address.
         :type ip_addr: IPv4Address or IPv6Address
         :type addr_len: int
         :returns: Prefix object.