X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;ds=sidebyside;f=resources%2Flibraries%2Fpython%2FRouting.py;h=ff675f39a99c0e234ce150619f0d1d607ebd3c91;hb=a912d105f3a1d8fed0b4cf6b18e0ef7789be81bf;hp=199b6de8d593ad12ddeb4138a86ec304566eb159;hpb=80532e03b9d223407c4b9d2245449dbdc4c03c1b;p=csit.git

diff --git a/resources/libraries/python/Routing.py b/resources/libraries/python/Routing.py
index 199b6de8d5..ff675f39a9 100644
--- a/resources/libraries/python/Routing.py
+++ b/resources/libraries/python/Routing.py
@@ -15,15 +15,18 @@
 
 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."""
 
+    # pylint: disable=too-many-arguments
     @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 +39,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 +49,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 +67,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 +77,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 +101,25 @@ class Routing(object):
                                                     prefix_length=prefix_len,
                                                     fib_number=fib_id,
                                                     where=place)
+
+    @staticmethod
+    def add_route(node, ip_addr, prefix, gateway, namespace=None):
+        """Add route in namespace.
+
+        :param node: Node where to execute command.
+        :param ip_addr: Route destination IP address.
+        :param prefix: IP prefix.
+        :param namespace: Execute command in namespace. Optional.
+        :param gateway: Gateway address.
+        :type node: dict
+        :type ip_addr: str
+        :type prefix: int
+        :type gateway: str
+        :type namespace: str
+        """
+        if namespace is not None:
+            cmd = 'ip netns exec {} ip route add {}/{} via {}'.format(
+                namespace, ip_addr, prefix, gateway)
+        else:
+            cmd = 'ip route add {}/{} via {}'.format(ip_addr, prefix, gateway)
+        exec_cmd_no_error(node, cmd, sudo=True)