CSIT-191 Add API count option to ip_add_del_route

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

diff --git a/resources/libraries/python/Routing.py b/resources/libraries/python/Routing.py
index 1cbbf6b..ad1a46b 100644 (file)
--- a/resources/libraries/python/Routing.py
+++ b/resources/libraries/python/Routing.py
@@ -21,7 +21,8 @@ class Routing(object):
     """Routing utilities."""
 
     @staticmethod
-    def vpp_route_add(node, network, prefix_len, gateway, interface):
+    def vpp_route_add(node, network, prefix_len, gateway=None, interface=None,
+                      use_sw_index=True, resolve_attempts=10, count=1):
         """Add route to the VPP node.
 
         :param node: Node to add route on.
@@ -29,16 +30,61 @@ class Routing(object):
         :param prefix_len: Route destination network prefix length.
         :param gateway: Route gateway address.
         :param interface: Route interface.
+        :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
+            with same prefix (increment is 1)
+        If None, then is not used.
         :type node: dict
         :type network: str
         :type prefix_len: int
         :type gateway: str
         :type interface: str
+        :type use_sw_index: bool
+        :type resolve_attempts: int
+        :type count: int
         """
-        sw_if_index = Topology.get_interface_sw_index(node, interface)
-        with VatTerminal(node) as vat:
+        if use_sw_index:
+            int_cmd = ('sw_if_index {}'.
+                       format(Topology.get_interface_sw_index(node, interface)))
+        else:
+            int_cmd = interface
+
+        rap = 'resolve-attempts {}'.format(resolve_attempts) \
+            if resolve_attempts else ''
+
+        via = 'via {}'.format(gateway) if gateway else ''
+
+        cnt = 'count {}'.format(count) \
+            if count 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,
-                                                    gateway=gateway,
-                                                    sw_if_index=sw_if_index)
+                                                    via=via,
+                                                    interface=int_cmd,
+                                                    resolve_attempts=rap,
+                                                    count=cnt)
+
+    @staticmethod
+    def add_fib_table(node, network, prefix_len, fib_id, place):
+        """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.
+        :type node: dict
+        :type network: str
+        :type prefix_len: int
+        :type fib_id: int
+        :type place: str
+        """
+        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)