CSIT-237: VPN routed forwarding (VRF) - baseline for IPv6

[csit.git] / resources / libraries / python / InterfaceUtil.py

diff --git a/resources/libraries/python/InterfaceUtil.py b/resources/libraries/python/InterfaceUtil.py
index 9537b2b..f5f1ce3 100644 (file)
--- a/resources/libraries/python/InterfaceUtil.py
+++ b/resources/libraries/python/InterfaceUtil.py
@@ -427,7 +427,26 @@ class InterfaceUtil(object):
         InterfaceUtil.tg_set_interfaces_udev_rules(node)
 
     @staticmethod
-    def update_all_interface_data_on_all_nodes(nodes, skip_tg=False):
+    def iface_update_numa_node(node):
+        """For all interfaces from topology file update numa node based on
+           information from the node.
+
+        :param node: Node from topology.
+        :type node: dict
+        :return: nothing
+        """
+        ssh = SSH()
+        for if_key in Topology.get_node_interfaces(node):
+            if_pci = Topology.get_interface_pci_addr(node, if_key)
+            ssh.connect(node)
+            cmd = "cat /sys/bus/pci/devices/{}/numa_node".format(if_pci)
+            (ret, out, _) = ssh.exec_command(cmd)
+            if ret == 0:
+                Topology.set_interface_numa_node(node, if_key, int(out))
+
+    @staticmethod
+    def update_all_interface_data_on_all_nodes(nodes, skip_tg=False,
+                                               numa_node=False):
         """Update interface names on all nodes in DICT__nodes.
 
         This method updates the topology dictionary by querying interface lists
@@ -435,8 +454,10 @@ class InterfaceUtil(object):
 
         :param nodes: Nodes in the topology.
         :param skip_tg: Skip TG node
+        :param numa_node: Retrieve numa_node location.
         :type nodes: dict
         :type skip_tg: bool
+        :type numa_node: bool
         """
         for node_data in nodes.values():
             if node_data['type'] == NodeType.DUT:
@@ -444,6 +465,12 @@ class InterfaceUtil(object):
             elif node_data['type'] == NodeType.TG and not skip_tg:
                 InterfaceUtil.update_tg_interface_data_on_node(node_data)
 
+            if numa_node:
+                if node_data['type'] == NodeType.DUT:
+                    InterfaceUtil.iface_update_numa_node(node_data)
+                elif node_data['type'] == NodeType.TG and not skip_tg:
+                    InterfaceUtil.iface_update_numa_node(node_data)
+
     @staticmethod
     def create_vlan_subinterface(node, interface, vlan):
         """Create VLAN subinterface on node.
@@ -820,25 +847,30 @@ class InterfaceUtil(object):
                                                     interface_name=interface)
 
     @staticmethod
-    def assign_interface_to_fib_table(node, interface, table_id):
+    def assign_interface_to_fib_table(node, interface, table_id, ipv6=False):
         """Assign VPP interface to specific VRF/FIB table.
 
         :param node: VPP node where the FIB and interface are located.
         :param interface: Interface to be assigned to FIB.
         :param table_id: VRF table ID.
+        :param ipv6: Assign to IPv6 table. Default False.
         :type node: dict
         :type interface: str or int
         :type table_id: int
+        :type ipv6: bool
         """
         if isinstance(interface, basestring):
             sw_if_index = Topology.get_interface_sw_index(node, interface)
         else:
             sw_if_index = interface
 
+        ipv6 = 'ipv6' if ipv6 else ''
+
         with VatTerminal(node) as vat:
             vat.vat_terminal_exec_cmd_from_template("set_fib_to_interface.vat",
                                                     sw_index=sw_if_index,
-                                                    vrf=table_id)
+                                                    vrf=table_id,
+                                                    ipv6=ipv6)
 
     @staticmethod
     def set_linux_interface_mac(node, interface, mac, namespace=None):