CSIT-183: Vpn baseline routed forwarding (VRF)

- Setup 2 VRF tables on each DUT
- Test traffic - each port accessible within one vrf
- Test traffic - ports inaccessible to different vrf

Change-Id: I34256a683039734608509a38857dbdcbdd15bcf9
Signed-off-by: Zdeno Olsovsky <zolsovsk@cisco.com>
Signed-off-by: Matej Klotton <mklotton@cisco.com>

1 files changed, 9 insertions, 4 deletions

diff --git a/resources/libraries/python/Routing.py b/resources/libraries/python/Routing.py
index ad1a46b3d4..199b6de8d5 100644
--- a/resources/libraries/python/Routing.py
+++ b/resources/libraries/python/Routing.py
@@ -21,8 +21,9 @@ 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):
+    def vpp_route_add(node, network, prefix_len, gateway=None,
+                      interface=None, use_sw_index=True, resolve_attempts=10,
+                      count=1, vrf=None):
         """Add route to the VPP node.
 
         :param node: Node to add route on.
@@ -30,11 +31,11 @@ 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.
         :param count: number of IP addresses to add starting from network IP
-            with same prefix (increment is 1)
-        If None, then is not used.
+        with same prefix (increment is 1). If None, then is not used.
         :type node: dict
         :type network: str
         :type prefix_len: int
@@ -43,6 +44,7 @@ class Routing(object):
         :type use_sw_index: bool
         :type resolve_attempts: int
         :type count: int
+        :type vrf: int
         """
         if use_sw_index:
             int_cmd = ('sw_if_index {}'.
@@ -58,11 +60,14 @@ class Routing(object):
         cnt = 'count {}'.format(count) \
             if count else ''
 
+        vrf = 'vrf {}'.format(vrf) if vrf 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,
                                                     count=cnt)