CSIT-191 Add API count option to ip_add_del_route

Add API count option to ip_add_del_route to be able to add more than 1
route

Change-Id: I3440579f960366a99f68ceeabea540f1a2ed4516
Signed-off-by: pmikus <pmikus@cisco.com>

diff --git a/resources/libraries/python/IPv4Setup.py b/resources/libraries/python/IPv4Setup.py
index d89eeed..0720e73 100644 (file)
--- a/resources/libraries/python/IPv4Setup.py
+++ b/resources/libraries/python/IPv4Setup.py
@@ -192,10 +192,10 @@ class Dut(IPv4Node):
                       sw_if_index=self.get_sw_if_index(interface),
                       address=address, prefix_length=prefix_length)
 
-    def set_route(self, network, prefix_length, gateway, interface):
+    def set_route(self, network, prefix_length, gateway, interface, count=1):
         Routing.vpp_route_add(self.node_info,
                               network=network, prefix_len=prefix_length,
-                              gateway=gateway, interface=interface)
+                              gateway=gateway, interface=interface, count=count)
 
     def unset_route(self, network, prefix_length, gateway, interface):
         self.exec_vat('del_route.vat', network=network,

diff --git a/resources/libraries/python/Routing.py b/resources/libraries/python/Routing.py
index 2097734..ad1a46b 100644 (file)
--- a/resources/libraries/python/Routing.py
+++ b/resources/libraries/python/Routing.py
@@ -22,7 +22,7 @@ class Routing(object):
 
     @staticmethod
     def vpp_route_add(node, network, prefix_len, gateway=None, interface=None,
-                      use_sw_index=True, resolve_attempts=10):
+                      use_sw_index=True, resolve_attempts=10, count=1):
         """Add route to the VPP node.
 
         :param node: Node to add route on.
@@ -32,6 +32,8 @@ class Routing(object):
         :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
@@ -40,6 +42,7 @@ class Routing(object):
         :type interface: str
         :type use_sw_index: bool
         :type resolve_attempts: int
+        :type count: int
         """
         if use_sw_index:
             int_cmd = ('sw_if_index {}'.
@@ -52,13 +55,17 @@ class Routing(object):
 
         via = 'via {}'.format(gateway) if gateway else ''
 
-        with VatTerminal(node) as vat:
+        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,
                                                     via=via,
                                                     interface=int_cmd,
-                                                    resolve_attempts=rap)
+                                                    resolve_attempts=rap,
+                                                    count=cnt)
 
     @staticmethod
     def add_fib_table(node, network, prefix_len, fib_id, place):

diff --git a/resources/templates/vat/add_route.vat b/resources/templates/vat/add_route.vat
index 96e39ba..9877a3a 100644 (file)
--- a/resources/templates/vat/add_route.vat
+++ b/resources/templates/vat/add_route.vat
@@ -1 +1 @@
-ip_add_del_route {network}/{prefix_length} {via} {interface} {resolve_attempts}
+ip_add_del_route {network}/{prefix_length} {via} {interface} {resolve_attempts} {count}