X-Git-Url: https://gerrit.fd.io/r/gitweb?p=csit.git;a=blobdiff_plain;f=resources%2Flibraries%2Fpython%2FRouting.py;h=2da7c1ac8d5038ee77b094548ef66e1bebbf82df;hp=767fb3aff035e5a8a7b7550bdf205adad7fd67b7;hb=1813672eb9f6988046bc65167235ae37b088298c;hpb=7c3e0cc41f55327d6eeb04fe757c6e80064ab28a

diff --git a/resources/libraries/python/Routing.py b/resources/libraries/python/Routing.py
index 767fb3aff0..2da7c1ac8d 100644
--- a/resources/libraries/python/Routing.py
+++ b/resources/libraries/python/Routing.py
@@ -17,14 +17,15 @@ 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):
 
+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, multipath=False,
+                      weight=None):
         """Add route to the VPP node.
 
         :param node: Node to add route on.
@@ -37,6 +38,9 @@ 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.
+        :param multipath: Enable multipath routing.
+        :param weight: Weight value for unequal cost multipath routing.
         :type node: dict
         :type network: str
         :type prefix_len: int
@@ -46,6 +50,9 @@ class Routing(object):
         :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 {}'.
@@ -63,6 +70,12 @@ class Routing(object):
 
         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,
@@ -71,7 +84,10 @@ class Routing(object):
                                                     vrf=vrf,
                                                     interface=int_cmd,
                                                     resolve_attempts=rap,
-                                                    count=cnt)
+                                                    count=cnt,
+                                                    lookup_vrf=lookup_vrf,
+                                                    multipath=multipath,
+                                                    weight=weight)
 
     @staticmethod
     def add_fib_table(node, network, prefix_len, fib_id, place):
@@ -96,23 +112,23 @@ class Routing(object):
                                                     where=place)
 
     @staticmethod
-    def add_route(node, ip, prefix, gw, namespace=None):
+    def add_route(node, ip_addr, prefix, gateway, namespace=None):
         """Add route in namespace.
 
         :param node: Node where to execute command.
-        :param ip: Route destination IP.
+        :param ip_addr: Route destination IP address.
         :param prefix: IP prefix.
-        :param namespace: Execute command in namespace. Optional
-        :param gw: Gateway.
+        :param namespace: Execute command in namespace. Optional.
+        :param gateway: Gateway address.
         :type node: dict
-        :type ip: str
+        :type ip_addr: str
         :type prefix: int
-        :type gw: str
+        :type gateway: str
         :type namespace: str
         """
         if namespace is not None:
             cmd = 'ip netns exec {} ip route add {}/{} via {}'.format(
-                namespace, ip, prefix, gw)
+                namespace, ip_addr, prefix, gateway)
         else:
-            cmd = 'ip route add {}/{} via {}'.format(ip, prefix, gw)
+            cmd = 'ip route add {}/{} via {}'.format(ip_addr, prefix, gateway)
         exec_cmd_no_error(node, cmd, sudo=True)