X-Git-Url: https://gerrit.fd.io/r/gitweb?p=csit.git;a=blobdiff_plain;f=resources%2Flibraries%2Fpython%2FRouting.py;h=f72d211a6b91cb8239d2559ba61a0e3b14e68d79;hp=fbe7b60183a11969dbc17e8b195db930be46bbe1;hb=9a261ea61549fc6a5c23369d2e236b002dc35038;hpb=1942363fa62b6a079ae5552d20c90eb55f0033d9

diff --git a/resources/libraries/python/Routing.py b/resources/libraries/python/Routing.py
index fbe7b60183..f72d211a6b 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, lookup_vrf=None):
+                      count=1, vrf=None, lookup_vrf=None, multipath=False,
+                      weight=None, local=False):
         """Add route to the VPP node.
 
         :param node: Node to add route on.
@@ -36,8 +37,11 @@ class Routing(object):
         :param use_sw_index: Use sw_if_index in VAT command.
         :param resolve_attempts: Resolve attempts IP route add parameter.
         :param count: number of IP addresses to add starting from network IP
+        :param local: The route is local
         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
@@ -48,12 +52,18 @@ class Routing(object):
         :type count: int
         :type vrf: int
         :type lookup_vrf: int
+        :type multipath: bool
+        :type weight: int
+        :type local: bool
         """
-        if use_sw_index:
-            int_cmd = ('sw_if_index {}'.
-                       format(Topology.get_interface_sw_index(node, interface)))
+        if interface:
+            if use_sw_index:
+                int_cmd = ('sw_if_index {}'.
+                           format(Topology.get_interface_sw_index(node, interface)))
+            else:
+                int_cmd = interface
         else:
-            int_cmd = interface
+            int_cmd = ''
 
         rap = 'resolve-attempts {}'.format(resolve_attempts) \
             if resolve_attempts else ''
@@ -67,6 +77,12 @@ class Routing(object):
 
         lookup_vrf = 'lookup-in-vrf {}'.format(lookup_vrf) if lookup_vrf else ''
 
+        multipath = 'multipath' if multipath else ''
+
+        weight = 'weight {}'.format(weight) if weight else ''
+
+        local = 'local' if local else ''
+
         with VatTerminal(node, json_param=False) as vat:
             vat.vat_terminal_exec_cmd_from_template('add_route.vat',
                                                     network=network,
@@ -76,48 +92,45 @@ class Routing(object):
                                                     interface=int_cmd,
                                                     resolve_attempts=rap,
                                                     count=cnt,
-                                                    lookup_vrf=lookup_vrf)
+                                                    lookup_vrf=lookup_vrf,
+                                                    multipath=multipath,
+                                                    weight=weight,
+                                                    local=local)
 
     @staticmethod
-    def add_fib_table(node, network, prefix_len, fib_id, place):
+    def add_fib_table(node, table_id, ipv6=False):
         """Create new FIB table according to ID.
 
         :param node: Node to add FIB on.
-        :param network: IP address to add to the FIB table.
-        :param prefix_len: IP address prefix length.
-        :param fib_id: FIB table ID.
-        :param place: Possible variants are local, drop.
+        :param table_id: FIB table ID.
+        :param ipv6: Is this an IPv6 table
         :type node: dict
-        :type network: str
-        :type prefix_len: int
-        :type fib_id: int
-        :type place: str
+        :type table_id: int
+        :type ipv6: bool
         """
         with VatTerminal(node) as vat:
             vat.vat_terminal_exec_cmd_from_template('add_fib_table.vat',
-                                                    network=network,
-                                                    prefix_length=prefix_len,
-                                                    fib_number=fib_id,
-                                                    where=place)
+                                                    table_id=table_id,
+                                                    ipv6="ipv6" if ipv6 else "")
 
     @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)