CSIT-360: Parallel test sets run

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

diff --git a/resources/libraries/python/Routing.py b/resources/libraries/python/Routing.py
index 199b6de..fbe7b60 100644 (file)
--- a/resources/libraries/python/Routing.py
+++ b/resources/libraries/python/Routing.py
@@ -15,15 +15,16 @@
 
 from resources.libraries.python.VatExecutor import VatTerminal
 from resources.libraries.python.topology import Topology
-
+from resources.libraries.python.ssh import exec_cmd_no_error
 
 class Routing(object):
+
     """Routing utilities."""
 
     @staticmethod
     def vpp_route_add(node, network, prefix_len, gateway=None,
                       interface=None, use_sw_index=True, resolve_attempts=10,
-                      count=1, vrf=None):
+                      count=1, vrf=None, lookup_vrf=None):
         """Add route to the VPP node.
 
         :param node: Node to add route on.
@@ -36,6 +37,7 @@ class Routing(object):
         :param resolve_attempts: Resolve attempts IP route add parameter.
         :param count: number of IP addresses to add starting from network IP
         with same prefix (increment is 1). If None, then is not used.
+        :param lookup_vrf: VRF table ID for lookup.
         :type node: dict
         :type network: str
         :type prefix_len: int
@@ -45,6 +47,7 @@ class Routing(object):
         :type resolve_attempts: int
         :type count: int
         :type vrf: int
+        :type lookup_vrf: int
         """
         if use_sw_index:
             int_cmd = ('sw_if_index {}'.
@@ -62,6 +65,8 @@ class Routing(object):
 
         vrf = 'vrf {}'.format(vrf) if vrf else ''
 
+        lookup_vrf = 'lookup-in-vrf {}'.format(lookup_vrf) if lookup_vrf else ''
+
         with VatTerminal(node, json_param=False) as vat:
             vat.vat_terminal_exec_cmd_from_template('add_route.vat',
                                                     network=network,
@@ -70,7 +75,8 @@ class Routing(object):
                                                     vrf=vrf,
                                                     interface=int_cmd,
                                                     resolve_attempts=rap,
-                                                    count=cnt)
+                                                    count=cnt,
+                                                    lookup_vrf=lookup_vrf)
 
     @staticmethod
     def add_fib_table(node, network, prefix_len, fib_id, place):
@@ -93,3 +99,25 @@ class Routing(object):
                                                     prefix_length=prefix_len,
                                                     fib_number=fib_id,
                                                     where=place)
+
+    @staticmethod
+    def add_route(node, ip, prefix, gw, namespace=None):
+        """Add route in namespace.
+
+        :param node: Node where to execute command.
+        :param ip: Route destination IP.
+        :param prefix: IP prefix.
+        :param namespace: Execute command in namespace. Optional
+        :param gw: Gateway.
+        :type node: dict
+        :type ip: str
+        :type prefix: int
+        :type gw: str
+        :type namespace: str
+        """
+        if namespace is not None:
+            cmd = 'ip netns exec {} ip route add {}/{} via {}'.format(
+                namespace, ip, prefix, gw)
+        else:
+            cmd = 'ip route add {}/{} via {}'.format(ip, prefix, gw)
+        exec_cmd_no_error(node, cmd, sudo=True)