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>

4 files changed, 47 insertions, 10 deletions

diff --git a/resources/libraries/python/IPv4Setup.py b/resources/libraries/python/IPv4Setup.py
index 0720e730a8..d4be4c602a 100644
--- a/resources/libraries/python/IPv4Setup.py
+++ b/resources/libraries/python/IPv4Setup.py
@@ -173,19 +173,23 @@ class Dut(IPv4Node):
         # TODO: check return value
         VatExecutor.cmd_from_template(self.node_info, script, **args)
 
-    def set_arp(self, iface_key, ip_address, mac_address):
+    def set_arp(self, iface_key, ip_address, mac_address, vrf=None):
         """Set entry in ARP cache.
 
         :param iface_key: Interface key.
         :param ip_address: IP address.
         :param mac_address: MAC address.
+        :param vrf: VRF table ID (Optional).
         :type iface_key: str
         :type ip_address: str
         :type mac_address: str
+        :type vrf: int
         """
+        vrf = "vrf {}".format(vrf) if vrf else ''
         self.exec_vat('add_ip_neighbor.vat',
                       sw_if_index=self.get_sw_if_index(iface_key),
-                      ip_address=ip_address, mac_address=mac_address)
+                      ip_address=ip_address, mac_address=mac_address,
+                      vrf=vrf)
 
     def set_ip(self, interface, address, prefix_length):
         self.exec_vat('add_ip_address.vat',
@@ -316,16 +320,18 @@ class IPv4Setup(object):
                 get_node(node).set_arp(iface_key, ip_address, mac_address)
 
     @staticmethod
-    def add_arp_on_dut(node, iface_key, ip_address, mac_address):
+    def add_arp_on_dut(node, iface_key, ip_address, mac_address, vrf=None):
         """Set ARP cache entree on DUT node.
 
         :param node: VPP Node in the topology.
         :param iface_key: Interface key.
         :param ip_address: IP address of the interface.
         :param mac_address: MAC address of the interface.
+        :param vrf: VRF table ID (Optional).
         :type node: dict
         :type iface_key: str
         :type ip_address: str
         :type mac_address: str
+        :type vrf: int
         """
-        get_node(node).set_arp(iface_key, ip_address, mac_address)
+        get_node(node).set_arp(iface_key, ip_address, mac_address, vrf)
diff --git a/resources/libraries/python/IPv6Util.py b/resources/libraries/python/IPv6Util.py
index 437a7c0cbb..54196ebf52 100644
--- a/resources/libraries/python/IPv6Util.py
+++ b/resources/libraries/python/IPv6Util.py
@@ -111,18 +111,22 @@ class IPv6Util(object):
             n=node['host'], p=interface))
 
     @staticmethod
-    def add_ip_neighbor(node, interface, ip_address, mac_address):
+    def add_ip_neighbor(node, interface, ip_address, mac_address, vrf=None):
         """Add IP neighbor.
 
         :param node: VPP node to add ip neighbor.
         :param interface: Interface name or sw_if_index.
         :param ip_address: IP address.
         :param mac_address: MAC address.
+        :param vrf: VRF table ID (Optional).
         :type node: dict
         :type interface: str or int
         :type ip_address: str
         :type mac_address: str
+        :type vrf: int
         """
+        vrf = "vrf {}".format(vrf) if vrf else ''
+
         if isinstance(interface, basestring):
             sw_if_index = Topology.get_interface_sw_index(node, interface)
         else:
@@ -132,4 +136,5 @@ class IPv6Util(object):
             vat.vat_terminal_exec_cmd_from_template("add_ip_neighbor.vat",
                                                     sw_if_index=sw_if_index,
                                                     ip_address=ip_address,
-                                                    mac_address=mac_address)
+                                                    mac_address=mac_address,
+                                                    vrf=vrf)
diff --git a/resources/libraries/python/InterfaceUtil.py b/resources/libraries/python/InterfaceUtil.py
index 008d42435c..a16a02fbe8 100644
--- a/resources/libraries/python/InterfaceUtil.py
+++ b/resources/libraries/python/InterfaceUtil.py
@@ -793,3 +793,24 @@ class InterfaceUtil(object):
         with VatTerminal(node) as vat:
             vat.vat_terminal_exec_cmd_from_template("ip_source_check.vat",
                                                     interface_name=interface)
+
+    @staticmethod
+    def assign_interface_to_fib_table(node, interface, table_id):
+        """Assign VPP interface to specific VRF/FIB table.
+
+        :param node: VPP node where the FIB and interface are located.
+        :param interface: Interface to be assigned to FIB.
+        :param table_id: VRF table ID.
+        :type node: dict
+        :type interface: str or int
+        :type table_id: int
+        """
+        if isinstance(interface, basestring):
+            sw_if_index = Topology.get_interface_sw_index(node, interface)
+        else:
+            sw_if_index = interface
+
+        with VatTerminal(node) as vat:
+            vat.vat_terminal_exec_cmd_from_template("set_fib_to_interface.vat",
+                                                    sw_index=sw_if_index,
+                                                    vrf=table_id)
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)