X-Git-Url: https://gerrit.fd.io/r/gitweb?p=csit.git;a=blobdiff_plain;f=resources%2Flibraries%2Fpython%2FRouting.py;h=2da7c1ac8d5038ee77b094548ef66e1bebbf82df;hp=2097734af18dfff39fcfcf928a928ea204c179ed;hb=21702fb09c470511cc3ed7b34ca5ab0f8d30b68f;hpb=ad0966f6296812a10eb6c8ba6f6725f4a3450ec6

diff --git a/resources/libraries/python/Routing.py b/resources/libraries/python/Routing.py
index 2097734af1..2da7c1ac8d 100644
--- a/resources/libraries/python/Routing.py
+++ b/resources/libraries/python/Routing.py
@@ -15,14 +15,17 @@
 
 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):
+    def vpp_route_add(node, network, prefix_len, gateway=None,
+                      interface=None, use_sw_index=True, resolve_attempts=10,
+                      count=1, vrf=None, lookup_vrf=None, multipath=False,
+                      weight=None):
         """Add route to the VPP node.
 
         :param node: Node to add route on.
@@ -30,9 +33,14 @@ class Routing(object):
         :param prefix_len: Route destination network prefix length.
         :param gateway: Route gateway address.
         :param interface: Route interface.
+        :param vrf: VRF table ID (Optional).
         :param use_sw_index: Use sw_if_index in VAT command.
         :param resolve_attempts: Resolve attempts IP route add parameter.
-        If None, then is not used.
+        :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.
+        :param multipath: Enable multipath routing.
+        :param weight: Weight value for unequal cost multipath routing.
         :type node: dict
         :type network: str
         :type prefix_len: int
@@ -40,6 +48,11 @@ class Routing(object):
         :type interface: str
         :type use_sw_index: bool
         :type resolve_attempts: int
+        :type count: int
+        :type vrf: int
+        :type lookup_vrf: int
+        :type multipath: bool
+        :type weight: int
         """
         if use_sw_index:
             int_cmd = ('sw_if_index {}'.
@@ -52,13 +65,29 @@ class Routing(object):
 
         via = 'via {}'.format(gateway) if gateway else ''
 
-        with VatTerminal(node) as vat:
+        cnt = 'count {}'.format(count) \
+            if count else ''
+
+        vrf = 'vrf {}'.format(vrf) if vrf else ''
+
+        lookup_vrf = 'lookup-in-vrf {}'.format(lookup_vrf) if lookup_vrf else ''
+
+        multipath = 'multipath' if multipath else ''
+
+        weight = 'weight {}'.format(weight) if weight else ''
+
+        with VatTerminal(node, json_param=False) as vat:
             vat.vat_terminal_exec_cmd_from_template('add_route.vat',
                                                     network=network,
                                                     prefix_length=prefix_len,
                                                     via=via,
+                                                    vrf=vrf,
                                                     interface=int_cmd,
-                                                    resolve_attempts=rap)
+                                                    resolve_attempts=rap,
+                                                    count=cnt,
+                                                    lookup_vrf=lookup_vrf,
+                                                    multipath=multipath,
+                                                    weight=weight)
 
     @staticmethod
     def add_fib_table(node, network, prefix_len, fib_id, place):
@@ -81,3 +110,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)