aboutsummaryrefslogtreecommitdiffstats
path: root/resources
diff options
context:
space:
mode:
Diffstat (limited to 'resources')
-rw-r--r--resources/libraries/python/IPv4Setup.py14
-rw-r--r--resources/libraries/python/IPv6Util.py9
-rw-r--r--resources/libraries/python/InterfaceUtil.py21
-rw-r--r--resources/libraries/python/Routing.py13
-rw-r--r--resources/libraries/robot/testing_path.robot165
-rw-r--r--resources/templates/vat/add_ip_neighbor.vat2
-rw-r--r--resources/templates/vat/add_route.vat2
-rw-r--r--resources/templates/vat/set_fib_to_interface.vat1
8 files changed, 213 insertions, 14 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)
diff --git a/resources/libraries/robot/testing_path.robot b/resources/libraries/robot/testing_path.robot
index 763b34e18a..e31ebd5214 100644
--- a/resources/libraries/robot/testing_path.robot
+++ b/resources/libraries/robot/testing_path.robot
@@ -164,8 +164,9 @@
| | Set Test Variable | ${dut2_node}
| Interfaces in 3-node path are up
-| | [Documentation] | Set UP state on interfaces in 3-node path on nodes and
-| | ... | wait for all interfaces are ready.
+| | [Documentation]
+| | ... | Set UP state on interfaces in 3-node path on nodes and \
+| | ... | wait until all interfaces are ready.
| | ...
| | ... | *Arguments:*
| | ... | - No arguments.
@@ -190,3 +191,163 @@
| | Set Interface State | ${dut2_node} | ${dut2_to_dut1} | up
| | Vpp Node Interfaces Ready Wait | ${dut1_node}
| | Vpp Node Interfaces Ready Wait | ${dut2_node}
+
+| Path for Double-Link 3-node testing is set
+| | [Documentation]
+| | ... | Compute path for testing on three given nodes in circular \
+| | ... | topology with double link and set corresponding \
+| | ... | test case variables.
+| | ...
+| | ... | *Arguments:*
+| | ... | - ${tg_node} - TG node. Type: dictionary
+| | ... | - ${dut1_node} - DUT1 node. Type: dictionary
+| | ... | - ${dut2_node} - DUT2 node. Type: dictionary
+| | ... | - ${tg2_node} - Node where the path ends. Must be the same as TG node
+| | ... | parameter in circular topology. Type: dictionary
+| | ...
+| | ... | *Return:*
+| | ... | - No value returned.
+| | ... |
+| | ... | _NOTE:_ This KW sets following test case variables:
+| | ... | - ${tg_node} - TG node.
+| | ... | - ${tg_to_dut1_if1} - TG interface towards DUT1 interface 1.
+| | ... | - ${tg_to_dut1_if2} - TG interface towards DUT1 interface 2.
+| | ... | - ${tg_to_dut1_mac_if1} - TG towards DUT1 MAC address interface 1.
+| | ... | - ${tg_to_dut1_mac_if2} - TG towards DUT1 MAC address interface 2.
+| | ... | - ${tg_to_dut2_if1} - TG interface towards DUT2 interface 1.
+| | ... | - ${tg_to_dut2_if2} - TG interface towards DUT2 interface 2.
+| | ... | - ${tg_to_dut2_mac_if1} - TG towards DUT2 MAC address interface 1.
+| | ... | - ${tg_to_dut2_mac_if2} - TG towards DUT2 MAC address interface 2.
+| | ... | - ${dut1_node} - DUT1 node.
+| | ... | - ${dut1_to_tg_if1} - DUT1 interface towards TG interface 1.
+| | ... | - ${dut1_to_tg_if2} - DUT1 interface towards TG interface 2.
+| | ... | - ${dut1_to_tg_mac_if1} - DUT1 towards TG MAC address interface 1.
+| | ... | - ${dut1_to_tg_mac_if2} - DUT1 towards TG MAC address interface 2.
+| | ... | - ${dut1_to_dut2_if1} - DUT1 interface towards DUT2 interface 1.
+| | ... | - ${dut1_to_dut2_if2} - DUT1 interface towards DUT2 interface 2.
+| | ... | - ${dut1_to_dut2_mac_if1} - DUT1 towards DUT2 MAC address interface 1.
+| | ... | - ${dut1_to_dut2_mac_if2} - DUT1 towards DUT2 MAC address interface 2.
+| | ... | - ${dut2_node} - DUT2 node.
+| | ... | - ${dut2_to_tg_if1} - DUT2 interface towards TG interface 1.
+| | ... | - ${dut2_to_tg_if2} - DUT2 interface towards TG interface 2.
+| | ... | - ${dut2_to_tg_mac_if1} - DUT2 towards TG MAC address interface 1.
+| | ... | - ${dut2_to_tg_mac_if2} - DUT2 towards TG MAC address interface 2.
+| | ... | - ${dut2_to_dut1_if1} - DUT2 interface towards DUT1 interface 1.
+| | ... | - ${dut2_to_dut1_if2} - DUT2 interface towards DUT1 interface 2.
+| | ... | - ${dut2_to_dut1_mac_if1} - DUT2 towards DUT1 MAC address interface 1.
+| | ... | - ${dut2_to_dut1_mac_if2} - DUT2 towards DUT1 MAC address interface 2.
+| | ...
+| | ... | *Example:*
+| | ...
+| | ... | \| Path for Double-Link 3-node testing is set \| ${nodes['TG']} \
+| | ... | \| ${nodes['DUT1']} \| ${nodes['DUT2']} \| ${nodes['TG']} \|
+| | ...
+| | [Arguments] | ${tg_node} | ${dut1_node} | ${dut2_node} | ${tg2_node}
+| | Should Be Equal | ${tg_node} | ${tg2_node}
+| | # Compute path TG - DUT1 with two links in between
+| | Append Nodes | ${tg_node} | ${dut1_node} | ${tg_node}
+| | Compute Path | always_same_link=${FALSE}
+| | ${tg_to_dut1_if1} | ${tmp}= | First Interface
+| | ${tg_to_dut1_if2} | ${tmp}= | Last Interface
+| | ${dut1_to_tg_if1} | ${tmp}= | First Ingress Interface
+| | ${dut1_to_tg_if2} | ${tmp}= | Last Egress Interface
+| | # Compute path TG - DUT2 with two links in between
+| | Clear Path
+| | Append Nodes | ${tg_node} | ${dut2_node} | ${tg_node}
+| | Compute Path | always_same_link=${FALSE}
+| | ${tg_to_dut2_if1} | ${tmp}= | First Interface
+| | ${tg_to_dut2_if2} | ${tmp}= | Last Interface
+| | ${dut2_to_tg_if1} | ${tmp}= | First Ingress Interface
+| | ${dut2_to_tg_if2} | ${tmp}= | Last Egress Interface
+| | # Compute path DUT1 - DUT2 with one link in between
+| | Clear Path
+| | Append Nodes | ${dut1_node} | ${dut2_node} | ${dut1_node}
+| | Compute Path | always_same_link=${FALSE}
+| | ${dut1_to_dut2_if1} | ${tmp}= | First Interface
+| | ${dut1_to_dut2_if2} | ${tmp}= | Last Interface
+| | ${dut2_to_dut1_if1} | ${tmp}= | First Ingress Interface
+| | ${dut2_to_dut1_if2} | ${tmp}= | Last Egress Interface
+| | # Set test variables
+| | Set Test Variable | ${tg_to_dut1_if1}
+| | Set Test Variable | ${tg_to_dut1_if2}
+| | Set Test Variable | ${tg_to_dut2_if1}
+| | Set Test Variable | ${tg_to_dut2_if2}
+| | Set Test Variable | ${dut1_to_tg_if1}
+| | Set Test Variable | ${dut1_to_tg_if2}
+| | Set Test Variable | ${dut2_to_tg_if1}
+| | Set Test Variable | ${dut2_to_tg_if2}
+| | Set Test Variable | ${dut1_to_dut2_if1}
+| | Set Test Variable | ${dut1_to_dut2_if2}
+| | Set Test Variable | ${dut2_to_dut1_if1}
+| | Set Test Variable | ${dut2_to_dut1_if2}
+| | Set Test Variable | ${tg_node}
+| | Set Test Variable | ${dut1_node}
+| | Set Test Variable | ${dut2_node}
+| | # Set Mac Addresses
+| | ${tg_to_dut1_if1_mac}= | Get interface mac | ${tg_node} | ${tg_to_dut1_if1}
+| | ${tg_to_dut1_if2_mac}= | Get interface mac | ${tg_node} | ${tg_to_dut1_if2}
+| | ${tg_to_dut2_if1_mac}= | Get interface mac | ${tg_node} | ${tg_to_dut2_if1}
+| | ${tg_to_dut2_if2_mac}= | Get interface mac | ${tg_node} | ${tg_to_dut2_if2}
+| | ${dut1_to_tg_if1_mac}= | Get interface mac | ${dut1_node}
+| | ... | ${dut1_to_tg_if1}
+| | ${dut1_to_tg_if2_mac}= | Get interface mac | ${dut1_node}
+| | ... | ${dut1_to_tg_if2}
+| | ${dut1_to_dut2_if1_mac}= | Get interface mac | ${dut1_node}
+| | ... | ${dut1_to_dut2_if1}
+| | ${dut1_to_dut2_if2_mac}= | Get interface mac | ${dut1_node}
+| | ... | ${dut1_to_dut2_if2}
+| | ${dut2_to_tg_if1_mac}= | Get interface mac | ${dut2_node}
+| | ... | ${dut2_to_tg_if1}
+| | ${dut2_to_tg_if2_mac}= | Get interface mac | ${dut2_node}
+| | ... | ${dut2_to_tg_if2}
+| | ${dut2_to_dut1_if1_mac}= | Get interface mac | ${dut2_node}
+| | ... | ${dut2_to_dut1_if1}
+| | ${dut2_to_dut1_if2_mac}= | Get interface mac | ${dut2_node}
+| | ... | ${dut2_to_dut1_if2}
+| | Set Test Variable | ${tg_to_dut1_if1_mac}
+| | Set Test Variable | ${tg_to_dut1_if2_mac}
+| | Set Test Variable | ${tg_to_dut2_if1_mac}
+| | Set Test Variable | ${tg_to_dut2_if2_mac}
+| | Set Test Variable | ${dut1_to_tg_if1_mac}
+| | Set Test Variable | ${dut1_to_tg_if2_mac}
+| | Set Test Variable | ${dut1_to_dut2_if1_mac}
+| | Set Test Variable | ${dut1_to_dut2_if2_mac}
+| | Set Test Variable | ${dut2_to_tg_if1_mac}
+| | Set Test Variable | ${dut2_to_tg_if2_mac}
+| | Set Test Variable | ${dut2_to_dut1_if1_mac}
+| | Set Test Variable | ${dut2_to_dut1_if2_mac}
+
+| Interfaces in Double-Link 3-node path are UP
+| | [Documentation]
+| | ... | Set UP state on interfaces in 3-node double link path \
+| | ... | wait until all interfaces are ready.
+| | ...
+| | ... | *Arguments:*
+| | ... | - No arguments.
+| | ...
+| | ... | *Return:*
+| | ... | - No value returned.
+| | ...
+| | ... | _NOTE:_ This KW uses test variables sets in
+| | ... | "Path for Double-Link 3-node testing is set" KW.
+| | ...
+| | ... | *Example:*
+| | ...
+| | ... | \| Path for Double-Link 3-node testing is set \| ${nodes['TG']} \
+| | ... | \| ${nodes['DUT1']} \| ${nodes['TG']} \|
+| | ... | \| Interfaces in Double-Link 3-node testing are UP \|
+| | ...
+| | Set Interface State | ${tg_node} | ${tg_to_dut1_if1} | up
+| | Set Interface State | ${tg_node} | ${tg_to_dut1_if2} | up
+| | Set Interface State | ${tg_node} | ${tg_to_dut2_if1} | up
+| | Set Interface State | ${tg_node} | ${tg_to_dut2_if2} | up
+| | Set Interface State | ${dut1_node} | ${dut1_to_tg_if1} | up
+| | Set Interface State | ${dut1_node} | ${dut1_to_tg_if2} | up
+| | Set Interface State | ${dut2_node} | ${dut2_to_tg_if1} | up
+| | Set Interface State | ${dut2_node} | ${dut2_to_tg_if2} | up
+| | Set Interface State | ${dut1_node} | ${dut1_to_dut2_if1} | up
+| | Set Interface State | ${dut1_node} | ${dut1_to_dut2_if2} | up
+| | Set Interface State | ${dut2_node} | ${dut2_to_dut1_if1} | up
+| | Set Interface State | ${dut2_node} | ${dut2_to_dut1_if2} | up
+| | Vpp Node Interfaces Ready Wait | ${dut1_node}
+| | Vpp Node Interfaces Ready Wait | ${dut2_node} \ No newline at end of file
diff --git a/resources/templates/vat/add_ip_neighbor.vat b/resources/templates/vat/add_ip_neighbor.vat
index cbea0e14a6..de868e1de7 100644
--- a/resources/templates/vat/add_ip_neighbor.vat
+++ b/resources/templates/vat/add_ip_neighbor.vat
@@ -1 +1 @@
-ip_neighbor_add_del sw_if_index {sw_if_index} dst {ip_address} mac {mac_address}
+ip_neighbor_add_del sw_if_index {sw_if_index} dst {ip_address} mac {mac_address} {vrf}
diff --git a/resources/templates/vat/add_route.vat b/resources/templates/vat/add_route.vat
index 9877a3ac46..6c7dfb09f0 100644
--- 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} {count}
+ip_add_del_route {network}/{prefix_length} {via} {vrf} {interface} {resolve_attempts} {count}
diff --git a/resources/templates/vat/set_fib_to_interface.vat b/resources/templates/vat/set_fib_to_interface.vat
new file mode 100644
index 0000000000..f0850c900b
--- /dev/null
+++ b/resources/templates/vat/set_fib_to_interface.vat
@@ -0,0 +1 @@
+sw_interface_set_table sw_if_index {sw_index} vrf {vrf} \ No newline at end of file