aboutsummaryrefslogtreecommitdiffstats
path: root/tests/vpp
diff options
context:
space:
mode:
authorJan Gelety <jgelety@cisco.com>2018-08-27 13:13:27 +0200
committerJan Gelety <jgelety@cisco.com>2018-08-27 13:13:27 +0200
commit9dc5c3a6b16f63fb6a2e00400d419a6a5e34cde8 (patch)
treedf4ee88476bdb3abef60eabdcfa7cf32e0bab775 /tests/vpp
parent7afd133d67400a062b0d3ae2ecf8b6ab380077fe (diff)
FIX: Correction of ACL perf test suite documentation
Change-Id: I01cc87f5f5409346566ded52da9d384fdd3fa2c4 Signed-off-by: Jan Gelety <jgelety@cisco.com>
Diffstat (limited to 'tests/vpp')
-rw-r--r--tests/vpp/perf/ip4/10ge2p1x520-ethip4udp-ip4base-iacl10sf-100flows-mrr.robot21
-rw-r--r--tests/vpp/perf/ip4/10ge2p1x520-ethip4udp-ip4base-iacl10sf-100flows-ndrpdr.robot29
-rw-r--r--tests/vpp/perf/ip4/10ge2p1x520-ethip4udp-ip4base-iacl10sf-100kflows-mrr.robot21
-rw-r--r--tests/vpp/perf/ip4/10ge2p1x520-ethip4udp-ip4base-iacl10sf-100kflows-ndrpdr.robot29
-rw-r--r--tests/vpp/perf/ip4/10ge2p1x520-ethip4udp-ip4base-iacl10sf-10kflows-mrr.robot21
-rw-r--r--tests/vpp/perf/ip4/10ge2p1x520-ethip4udp-ip4base-iacl10sf-10kflows-ndrpdr.robot29
-rw-r--r--tests/vpp/perf/ip4/10ge2p1x520-ethip4udp-ip4base-iacl10sl-100flows-mrr.robot21
-rw-r--r--tests/vpp/perf/ip4/10ge2p1x520-ethip4udp-ip4base-iacl10sl-100flows-ndrpdr.robot29
-rw-r--r--tests/vpp/perf/ip4/10ge2p1x520-ethip4udp-ip4base-iacl10sl-100kflows-mrr.robot21
-rw-r--r--tests/vpp/perf/ip4/10ge2p1x520-ethip4udp-ip4base-iacl10sl-100kflows-ndrpdr.robot29
-rw-r--r--tests/vpp/perf/ip4/10ge2p1x520-ethip4udp-ip4base-iacl10sl-10kflows-mrr.robot21
-rw-r--r--tests/vpp/perf/ip4/10ge2p1x520-ethip4udp-ip4base-iacl10sl-10kflows-ndrpdr.robot29
-rw-r--r--tests/vpp/perf/ip4/10ge2p1x520-ethip4udp-ip4base-iacl1sf-100flows-mrr.robot21
-rw-r--r--tests/vpp/perf/ip4/10ge2p1x520-ethip4udp-ip4base-iacl1sf-100flows-ndrpdr.robot29
-rw-r--r--tests/vpp/perf/ip4/10ge2p1x520-ethip4udp-ip4base-iacl1sf-100kflows-mrr.robot21
-rw-r--r--tests/vpp/perf/ip4/10ge2p1x520-ethip4udp-ip4base-iacl1sf-100kflows-ndrpdr.robot29
-rw-r--r--tests/vpp/perf/ip4/10ge2p1x520-ethip4udp-ip4base-iacl1sf-10kflows-mrr.robot18
-rw-r--r--tests/vpp/perf/ip4/10ge2p1x520-ethip4udp-ip4base-iacl1sf-10kflows-ndrpdr.robot18
-rw-r--r--tests/vpp/perf/ip4/10ge2p1x520-ethip4udp-ip4base-iacl1sl-100flows-mrr.robot21
-rw-r--r--tests/vpp/perf/ip4/10ge2p1x520-ethip4udp-ip4base-iacl1sl-100flows-ndrpdr.robot29
-rw-r--r--tests/vpp/perf/ip4/10ge2p1x520-ethip4udp-ip4base-iacl1sl-100kflows-mrr.robot21
-rw-r--r--tests/vpp/perf/ip4/10ge2p1x520-ethip4udp-ip4base-iacl1sl-100kflows-ndrpdr.robot29
-rw-r--r--tests/vpp/perf/ip4/10ge2p1x520-ethip4udp-ip4base-iacl1sl-10kflows-mrr.robot18
-rw-r--r--tests/vpp/perf/ip4/10ge2p1x520-ethip4udp-ip4base-iacl1sl-10kflows-ndrpdr.robot18
-rw-r--r--tests/vpp/perf/ip4/10ge2p1x520-ethip4udp-ip4base-iacl50sf-100flows-mrr.robot21
-rw-r--r--tests/vpp/perf/ip4/10ge2p1x520-ethip4udp-ip4base-iacl50sf-100flows-ndrpdr.robot29
-rw-r--r--tests/vpp/perf/ip4/10ge2p1x520-ethip4udp-ip4base-iacl50sf-100kflows-mrr.robot21
-rw-r--r--tests/vpp/perf/ip4/10ge2p1x520-ethip4udp-ip4base-iacl50sf-100kflows-ndrpdr.robot29
-rw-r--r--tests/vpp/perf/ip4/10ge2p1x520-ethip4udp-ip4base-iacl50sf-10kflows-mrr.robot18
-rw-r--r--tests/vpp/perf/ip4/10ge2p1x520-ethip4udp-ip4base-iacl50sf-10kflows-ndrpdr.robot18
-rw-r--r--tests/vpp/perf/ip4/10ge2p1x520-ethip4udp-ip4base-iacl50sl-100flows-mrr.robot21
-rw-r--r--tests/vpp/perf/ip4/10ge2p1x520-ethip4udp-ip4base-iacl50sl-100flows-ndrpdr.robot29
-rw-r--r--tests/vpp/perf/ip4/10ge2p1x520-ethip4udp-ip4base-iacl50sl-100kflows-mrr.robot21
-rw-r--r--tests/vpp/perf/ip4/10ge2p1x520-ethip4udp-ip4base-iacl50sl-100kflows-ndrpdr.robot29
-rw-r--r--tests/vpp/perf/ip4/10ge2p1x520-ethip4udp-ip4base-iacl50sl-10kflows-mrr.robot18
-rw-r--r--tests/vpp/perf/ip4/10ge2p1x520-ethip4udp-ip4base-iacl50sl-10kflows-ndrpdr.robot18
-rw-r--r--tests/vpp/perf/ip4/10ge2p1x520-ethip4udp-ip4base-oacl10sf-100flows-mrr.robot21
-rw-r--r--tests/vpp/perf/ip4/10ge2p1x520-ethip4udp-ip4base-oacl10sf-100flows-ndrpdr.robot29
-rw-r--r--tests/vpp/perf/ip4/10ge2p1x520-ethip4udp-ip4base-oacl10sf-100kflows-mrr.robot21
-rw-r--r--tests/vpp/perf/ip4/10ge2p1x520-ethip4udp-ip4base-oacl10sf-100kflows-ndrpdr.robot29
-rw-r--r--tests/vpp/perf/ip4/10ge2p1x520-ethip4udp-ip4base-oacl10sf-10kflows-mrr.robot21
-rw-r--r--tests/vpp/perf/ip4/10ge2p1x520-ethip4udp-ip4base-oacl10sf-10kflows-ndrpdr.robot29
-rw-r--r--tests/vpp/perf/ip4/10ge2p1x520-ethip4udp-ip4base-oacl10sl-100flows-mrr.robot21
-rw-r--r--tests/vpp/perf/ip4/10ge2p1x520-ethip4udp-ip4base-oacl10sl-100flows-ndrpdr.robot29
-rw-r--r--tests/vpp/perf/ip4/10ge2p1x520-ethip4udp-ip4base-oacl10sl-100kflows-mrr.robot21
-rw-r--r--tests/vpp/perf/ip4/10ge2p1x520-ethip4udp-ip4base-oacl10sl-100kflows-ndrpdr.robot29
-rw-r--r--tests/vpp/perf/ip4/10ge2p1x520-ethip4udp-ip4base-oacl10sl-10kflows-mrr.robot21
-rw-r--r--tests/vpp/perf/ip4/10ge2p1x520-ethip4udp-ip4base-oacl10sl-10kflows-ndrpdr.robot29
-rw-r--r--tests/vpp/perf/ip4/10ge2p1x520-ethip4udp-ip4base-oacl1sf-100flows-mrr.robot22
-rw-r--r--tests/vpp/perf/ip4/10ge2p1x520-ethip4udp-ip4base-oacl1sf-100flows-ndrpdr.robot29
-rw-r--r--tests/vpp/perf/ip4/10ge2p1x520-ethip4udp-ip4base-oacl1sf-100kflows-mrr.robot21
-rw-r--r--tests/vpp/perf/ip4/10ge2p1x520-ethip4udp-ip4base-oacl1sf-100kflows-ndrpdr.robot29
-rw-r--r--tests/vpp/perf/ip4/10ge2p1x520-ethip4udp-ip4base-oacl1sf-10kflows-mrr.robot21
-rw-r--r--tests/vpp/perf/ip4/10ge2p1x520-ethip4udp-ip4base-oacl1sf-10kflows-ndrpdr.robot29
-rw-r--r--tests/vpp/perf/ip4/10ge2p1x520-ethip4udp-ip4base-oacl1sl-100flows-mrr.robot21
-rw-r--r--tests/vpp/perf/ip4/10ge2p1x520-ethip4udp-ip4base-oacl1sl-100flows-ndrpdr.robot29
-rw-r--r--tests/vpp/perf/ip4/10ge2p1x520-ethip4udp-ip4base-oacl1sl-100kflows-mrr.robot21
-rw-r--r--tests/vpp/perf/ip4/10ge2p1x520-ethip4udp-ip4base-oacl1sl-100kflows-ndrpdr.robot29
-rw-r--r--tests/vpp/perf/ip4/10ge2p1x520-ethip4udp-ip4base-oacl1sl-10kflows-mrr.robot21
-rw-r--r--tests/vpp/perf/ip4/10ge2p1x520-ethip4udp-ip4base-oacl1sl-10kflows-ndrpdr.robot29
-rw-r--r--tests/vpp/perf/ip4/10ge2p1x520-ethip4udp-ip4base-oacl50sf-100flows-mrr.robot21
-rw-r--r--tests/vpp/perf/ip4/10ge2p1x520-ethip4udp-ip4base-oacl50sf-100flows-ndrpdr.robot29
-rw-r--r--tests/vpp/perf/ip4/10ge2p1x520-ethip4udp-ip4base-oacl50sf-100kflows-mrr.robot21
-rw-r--r--tests/vpp/perf/ip4/10ge2p1x520-ethip4udp-ip4base-oacl50sf-100kflows-ndrpdr.robot29
-rw-r--r--tests/vpp/perf/ip4/10ge2p1x520-ethip4udp-ip4base-oacl50sf-10kflows-mrr.robot21
-rw-r--r--tests/vpp/perf/ip4/10ge2p1x520-ethip4udp-ip4base-oacl50sf-10kflows-ndrpdr.robot29
-rw-r--r--tests/vpp/perf/ip4/10ge2p1x520-ethip4udp-ip4base-oacl50sl-100flows-mrr.robot21
-rw-r--r--tests/vpp/perf/ip4/10ge2p1x520-ethip4udp-ip4base-oacl50sl-100flows-ndrpdr.robot29
-rw-r--r--tests/vpp/perf/ip4/10ge2p1x520-ethip4udp-ip4base-oacl50sl-100kflows-mrr.robot21
-rw-r--r--tests/vpp/perf/ip4/10ge2p1x520-ethip4udp-ip4base-oacl50sl-100kflows-ndrpdr.robot29
-rw-r--r--tests/vpp/perf/ip4/10ge2p1x520-ethip4udp-ip4base-oacl50sl-10kflows-mrr.robot21
-rw-r--r--tests/vpp/perf/ip4/10ge2p1x520-ethip4udp-ip4base-oacl50sl-10kflows-ndrpdr.robot29
72 files changed, 840 insertions, 905 deletions
diff --git a/tests/vpp/perf/ip4/10ge2p1x520-ethip4udp-ip4base-iacl10sf-100flows-mrr.robot b/tests/vpp/perf/ip4/10ge2p1x520-ethip4udp-ip4base-iacl10sf-100flows-mrr.robot
index b3a1aef99a..e7199fc611 100644
--- a/tests/vpp/perf/ip4/10ge2p1x520-ethip4udp-ip4base-iacl10sf-100flows-mrr.robot
+++ b/tests/vpp/perf/ip4/10ge2p1x520-ethip4udp-ip4base-iacl10sf-100flows-mrr.robot
@@ -34,19 +34,18 @@
| ...
| ... | *[Top] Network Topologies:* TG-DUT1-DUT2-TG 3-node circular topology\
| ... | with single links between nodes.
-| ... | *[Enc] Packet Encapsulations:* Eth-IPv4-UDP for L2 switching of IPv4.
-| ... | *[Cfg] DUT configuration:* DUT1 is configured with L2 bridge domain\
-| ... | and MAC learning enabled. DUT2 is configured with L2 cross-connects.\
-| ... | Required ACL rules are applied to input paths of both DUT1 intefaces.\
-| ... | DUT1 and DUT2 are tested with 2p10GE NIC X520 Niantic by Intel.\
+| ... | *[Enc] Packet Encapsulations:* Eth-IPv4-UDP for IPv4 routing.
+| ... | *[Cfg] DUT configuration:* DUT1 and DUT2 are configured with IPv4\
+| ... | routing and one static IPv4 /24 route entries. Required ACL rules are\
+| ... | applied to input paths of both DUT1 intefaces. DUT1 and DUT2 are tested\
+| ... | with 2p10GE NIC X520 Niantic by Intel.\
| ... | *[Ver] TG verification:* In MaxReceivedRate test TG sends traffic
| ... | at line rate and reports total received/sent packets over trial period.
-| ... | Test packets are generated by TG on\
-| ... | links to DUTs. TG traffic profile contains two L3 flow-groups\
-| ... | (flow-group per direction, ${flows_per_dir} flows per flow-group) with\
-| ... | all packets containing Ethernet header, IPv4 header with UDP header and\
-| ... | static payload. MAC addresses are matching MAC addresses of the TG node\
-| ... | interfaces.
+| ... | Test packets are generated by TG on links to DUTs. TG traffic profile
+| ... | contains two L3 flow-groups (flow-group per direction, ${flows_per_dir}
+| ... | flows per flow-group) with all packets containing Ethernet header, IPv4
+| ... | header with IP protocol=61 and static payload. MAC addresses are
+| ... | matching MAC addresses of the TG node interfaces.
| ... | *[Ref] Applicable standard specifications:* RFC2544.
*** Variables ***
diff --git a/tests/vpp/perf/ip4/10ge2p1x520-ethip4udp-ip4base-iacl10sf-100flows-ndrpdr.robot b/tests/vpp/perf/ip4/10ge2p1x520-ethip4udp-ip4base-iacl10sf-100flows-ndrpdr.robot
index 28bdd66fd8..8e8739c81b 100644
--- a/tests/vpp/perf/ip4/10ge2p1x520-ethip4udp-ip4base-iacl10sf-100flows-ndrpdr.robot
+++ b/tests/vpp/perf/ip4/10ge2p1x520-ethip4udp-ip4base-iacl10sf-100flows-ndrpdr.robot
@@ -35,22 +35,21 @@
| ...
| ... | *[Top] Network Topologies:* TG-DUT1-DUT2-TG 3-node circular topology\
| ... | with single links between nodes.
-| ... | *[Enc] Packet Encapsulations:* Eth-IPv4-UDP for L2 switching of IPv4.
-| ... | *[Cfg] DUT configuration:* DUT1 is configured with L2 bridge domain\
-| ... | and MAC learning enabled. DUT2 is configured with L2 cross-connects.\
-| ... | Required ACL rules are applied to input paths of both DUT1 intefaces.\
-| ... | DUT1 and DUT2 are tested with 2p10GE NIC X520 Niantic by Intel.\
-| ... | *[Ver] TG verification:* TG finds and reports throughput NDR (Non Drop\
-| ... | Rate) with zero packet loss tolerance or throughput PDR (Partial Drop\
-| ... | Rate) with non-zero packet loss tolerance (LT) expressed in percentage\
-| ... | of packets transmitted. NDR and PDR are discovered for different\
+| ... | *[Enc] Packet Encapsulations:* Eth-IPv4-UDP for IPv4 routing.
+| ... | *[Cfg] DUT configuration:* DUT1 and DUT2 are configured with IPv4\
+| ... | routing and one static IPv4 /24 route entries. Required ACL rules are\
+| ... | applied to input paths of both DUT1 intefaces. DUT1 and DUT2 are tested\
+| ... | with 2p10GE NIC X520 Niantic by Intel.\
+| ... | *[Ver] TG verification:* TG finds and reports throughput NDR (Non Drop
+| ... | Rate) with zero packet loss tolerance or throughput PDR (Partial Drop
+| ... | Rate) with non-zero packet loss tolerance (LT) expressed in percentage
+| ... | of packets transmitted. NDR and PDR are discovered for different
| ... | Ethernet L2 frame sizes using MLRsearch library.
-| ... | Test packets are generated by TG on\
-| ... | links to DUTs. TG traffic profile contains two L3 flow-groups\
-| ... | (flow-group per direction, ${flows_per_dir} flows per flow-group) with\
-| ... | all packets containing Ethernet header, IPv4 header with UDP header and\
-| ... | static payload. MAC addresses are matching MAC addresses of the TG node\
-| ... | interfaces.
+| ... | Test packets are generated by TG on links to DUTs. TG traffic profile
+| ... | contains two L3 flow-groups (flow-group per direction, ${flows_per_dir}
+| ... | flows per flow-group) with all packets containing Ethernet header, IPv4
+| ... | header with IP protocol=61 and static payload. MAC addresses are
+| ... | matching MAC addresses of the TG node interfaces.
| ... | *[Ref] Applicable standard specifications:* RFC2544.
*** Variables ***
diff --git a/tests/vpp/perf/ip4/10ge2p1x520-ethip4udp-ip4base-iacl10sf-100kflows-mrr.robot b/tests/vpp/perf/ip4/10ge2p1x520-ethip4udp-ip4base-iacl10sf-100kflows-mrr.robot
index 5e54ef3511..60d99320ce 100644
--- a/tests/vpp/perf/ip4/10ge2p1x520-ethip4udp-ip4base-iacl10sf-100kflows-mrr.robot
+++ b/tests/vpp/perf/ip4/10ge2p1x520-ethip4udp-ip4base-iacl10sf-100kflows-mrr.robot
@@ -34,19 +34,18 @@
| ...
| ... | *[Top] Network Topologies:* TG-DUT1-DUT2-TG 3-node circular topology\
| ... | with single links between nodes.
-| ... | *[Enc] Packet Encapsulations:* Eth-IPv4-UDP for L2 switching of IPv4.
-| ... | *[Cfg] DUT configuration:* DUT1 is configured with L2 bridge domain\
-| ... | and MAC learning enabled. DUT2 is configured with L2 cross-connects.\
-| ... | Required ACL rules are applied to input paths of both DUT1 intefaces.\
-| ... | DUT1 and DUT2 are tested with 2p10GE NIC X520 Niantic by Intel.\
+| ... | *[Enc] Packet Encapsulations:* Eth-IPv4-UDP for IPv4 routing.
+| ... | *[Cfg] DUT configuration:* DUT1 and DUT2 are configured with IPv4\
+| ... | routing and one static IPv4 /24 route entries. Required ACL rules are\
+| ... | applied to input paths of both DUT1 intefaces. DUT1 and DUT2 are tested\
+| ... | with 2p10GE NIC X520 Niantic by Intel.\
| ... | *[Ver] TG verification:* In MaxReceivedRate test TG sends traffic
| ... | at line rate and reports total received/sent packets over trial period.
-| ... | Test packets are generated by TG on\
-| ... | links to DUTs. TG traffic profile contains two L3 flow-groups\
-| ... | (flow-group per direction, ${flows_per_dir} flows per flow-group) with\
-| ... | all packets containing Ethernet header, IPv4 header with UDP header and\
-| ... | static payload. MAC addresses are matching MAC addresses of the TG node\
-| ... | interfaces.
+| ... | Test packets are generated by TG on links to DUTs. TG traffic profile
+| ... | contains two L3 flow-groups (flow-group per direction, ${flows_per_dir}
+| ... | flows per flow-group) with all packets containing Ethernet header, IPv4
+| ... | header with IP protocol=61 and static payload. MAC addresses are
+| ... | matching MAC addresses of the TG node interfaces.
| ... | *[Ref] Applicable standard specifications:* RFC2544.
*** Variables ***
diff --git a/tests/vpp/perf/ip4/10ge2p1x520-ethip4udp-ip4base-iacl10sf-100kflows-ndrpdr.robot b/tests/vpp/perf/ip4/10ge2p1x520-ethip4udp-ip4base-iacl10sf-100kflows-ndrpdr.robot
index 3dc8dd9957..3e52303258 100644
--- a/tests/vpp/perf/ip4/10ge2p1x520-ethip4udp-ip4base-iacl10sf-100kflows-ndrpdr.robot
+++ b/tests/vpp/perf/ip4/10ge2p1x520-ethip4udp-ip4base-iacl10sf-100kflows-ndrpdr.robot
@@ -35,22 +35,21 @@
| ...
| ... | *[Top] Network Topologies:* TG-DUT1-DUT2-TG 3-node circular topology\
| ... | with single links between nodes.
-| ... | *[Enc] Packet Encapsulations:* Eth-IPv4-UDP for L2 switching of IPv4.
-| ... | *[Cfg] DUT configuration:* DUT1 is configured with L2 bridge domain\
-| ... | and MAC learning enabled. DUT2 is configured with L2 cross-connects.\
-| ... | Required ACL rules are applied to input paths of both DUT1 intefaces.\
-| ... | DUT1 and DUT2 are tested with 2p10GE NIC X520 Niantic by Intel.\
-| ... | *[Ver] TG verification:* TG finds and reports throughput NDR (Non Drop\
-| ... | Rate) with zero packet loss tolerance or throughput PDR (Partial Drop\
-| ... | Rate) with non-zero packet loss tolerance (LT) expressed in percentage\
-| ... | of packets transmitted. NDR and PDR are discovered for different\
+| ... | *[Enc] Packet Encapsulations:* Eth-IPv4-UDP for IPv4 routing.
+| ... | *[Cfg] DUT configuration:* DUT1 and DUT2 are configured with IPv4\
+| ... | routing and one static IPv4 /24 route entries. Required ACL rules are\
+| ... | applied to input paths of both DUT1 intefaces. DUT1 and DUT2 are tested\
+| ... | with 2p10GE NIC X520 Niantic by Intel.\
+| ... | *[Ver] TG verification:* TG finds and reports throughput NDR (Non Drop
+| ... | Rate) with zero packet loss tolerance or throughput PDR (Partial Drop
+| ... | Rate) with non-zero packet loss tolerance (LT) expressed in percentage
+| ... | of packets transmitted. NDR and PDR are discovered for different
| ... | Ethernet L2 frame sizes using MLRsearch library.
-| ... | Test packets are generated by TG on\
-| ... | links to DUTs. TG traffic profile contains two L3 flow-groups\
-| ... | (flow-group per direction, ${flows_per_dir} flows per flow-group) with\
-| ... | all packets containing Ethernet header, IPv4 header with UDP header and\
-| ... | static payload. MAC addresses are matching MAC addresses of the TG node\
-| ... | interfaces.
+| ... | Test packets are generated by TG on links to DUTs. TG traffic profile
+| ... | contains two L3 flow-groups (flow-group per direction, ${flows_per_dir}
+| ... | flows per flow-group) with all packets containing Ethernet header, IPv4
+| ... | header with IP protocol=61 and static payload. MAC addresses are
+| ... | matching MAC addresses of the TG node interfaces.
| ... | *[Ref] Applicable standard specifications:* RFC2544.
*** Variables ***
diff --git a/tests/vpp/perf/ip4/10ge2p1x520-ethip4udp-ip4base-iacl10sf-10kflows-mrr.robot b/tests/vpp/perf/ip4/10ge2p1x520-ethip4udp-ip4base-iacl10sf-10kflows-mrr.robot
index 46a507a270..e6ff69e387 100644
--- a/tests/vpp/perf/ip4/10ge2p1x520-ethip4udp-ip4base-iacl10sf-10kflows-mrr.robot
+++ b/tests/vpp/perf/ip4/10ge2p1x520-ethip4udp-ip4base-iacl10sf-10kflows-mrr.robot
@@ -34,19 +34,18 @@
| ...
| ... | *[Top] Network Topologies:* TG-DUT1-DUT2-TG 3-node circular topology\
| ... | with single links between nodes.
-| ... | *[Enc] Packet Encapsulations:* Eth-IPv4-UDP for L2 switching of IPv4.
-| ... | *[Cfg] DUT configuration:* DUT1 is configured with L2 bridge domain\
-| ... | and MAC learning enabled. DUT2 is configured with L2 cross-connects.\
-| ... | Required ACL rules are applied to input paths of both DUT1 intefaces.\
-| ... | DUT1 and DUT2 are tested with 2p10GE NIC X520 Niantic by Intel.\
+| ... | *[Enc] Packet Encapsulations:* Eth-IPv4-UDP for IPv4 routing.
+| ... | *[Cfg] DUT configuration:* DUT1 and DUT2 are configured with IPv4\
+| ... | routing and one static IPv4 /24 route entries. Required ACL rules are\
+| ... | applied to input paths of both DUT1 intefaces. DUT1 and DUT2 are tested\
+| ... | with 2p10GE NIC X520 Niantic by Intel.\
| ... | *[Ver] TG verification:* In MaxReceivedRate test TG sends traffic
| ... | at line rate and reports total received/sent packets over trial period.
-| ... | Test packets are generated by TG on\
-| ... | links to DUTs. TG traffic profile contains two L3 flow-groups\
-| ... | (flow-group per direction, ${flows_per_dir} flows per flow-group) with\
-| ... | all packets containing Ethernet header, IPv4 header with UDP header and\
-| ... | static payload. MAC addresses are matching MAC addresses of the TG node\
-| ... | interfaces.
+| ... | Test packets are generated by TG on links to DUTs. TG traffic profile
+| ... | contains two L3 flow-groups (flow-group per direction, ${flows_per_dir}
+| ... | flows per flow-group) with all packets containing Ethernet header, IPv4
+| ... | header with IP protocol=61 and static payload. MAC addresses are
+| ... | matching MAC addresses of the TG node interfaces.
| ... | *[Ref] Applicable standard specifications:* RFC2544.
*** Variables ***
diff --git a/tests/vpp/perf/ip4/10ge2p1x520-ethip4udp-ip4base-iacl10sf-10kflows-ndrpdr.robot b/tests/vpp/perf/ip4/10ge2p1x520-ethip4udp-ip4base-iacl10sf-10kflows-ndrpdr.robot
index 68f236b9a2..22a7b75d79 100644
--- a/tests/vpp/perf/ip4/10ge2p1x520-ethip4udp-ip4base-iacl10sf-10kflows-ndrpdr.robot
+++ b/tests/vpp/perf/ip4/10ge2p1x520-ethip4udp-ip4base-iacl10sf-10kflows-ndrpdr.robot
@@ -35,22 +35,21 @@
| ...
| ... | *[Top] Network Topologies:* TG-DUT1-DUT2-TG 3-node circular topology\
| ... | with single links between nodes.
-| ... | *[Enc] Packet Encapsulations:* Eth-IPv4-UDP for L2 switching of IPv4.
-| ... | *[Cfg] DUT configuration:* DUT1 is configured with L2 bridge domain\
-| ... | and MAC learning enabled. DUT2 is configured with L2 cross-connects.\
-| ... | Required ACL rules are applied to input paths of both DUT1 intefaces.\
-| ... | DUT1 and DUT2 are tested with 2p10GE NIC X520 Niantic by Intel.\
-| ... | *[Ver] TG verification:* TG finds and reports throughput NDR (Non Drop\
-| ... | Rate) with zero packet loss tolerance or throughput PDR (Partial Drop\
-| ... | Rate) with non-zero packet loss tolerance (LT) expressed in percentage\
-| ... | of packets transmitted. NDR and PDR are discovered for different\
+| ... | *[Enc] Packet Encapsulations:* Eth-IPv4-UDP for IPv4 routing.
+| ... | *[Cfg] DUT configuration:* DUT1 and DUT2 are configured with IPv4\
+| ... | routing and one static IPv4 /24 route entries. Required ACL rules are\
+| ... | applied to input paths of both DUT1 intefaces. DUT1 and DUT2 are tested\
+| ... | with 2p10GE NIC X520 Niantic by Intel.\
+| ... | *[Ver] TG verification:* TG finds and reports throughput NDR (Non Drop
+| ... | Rate) with zero packet loss tolerance or throughput PDR (Partial Drop
+| ... | Rate) with non-zero packet loss tolerance (LT) expressed in percentage
+| ... | of packets transmitted. NDR and PDR are discovered for different
| ... | Ethernet L2 frame sizes using MLRsearch library.
-| ... | Test packets are generated by TG on\
-| ... | links to DUTs. TG traffic profile contains two L3 flow-groups\
-| ... | (flow-group per direction, ${flows_per_dir} flows per flow-group) with\
-| ... | all packets containing Ethernet header, IPv4 header with UDP header and\
-| ... | static payload. MAC addresses are matching MAC addresses of the TG node\
-| ... | interfaces.
+| ... | Test packets are generated by TG on links to DUTs. TG traffic profile
+| ... | contains two L3 flow-groups (flow-group per direction, ${flows_per_dir}
+| ... | flows per flow-group) with all packets containing Ethernet header, IPv4
+| ... | header with IP protocol=61 and static payload. MAC addresses are
+| ... | matching MAC addresses of the TG node interfaces.
| ... | *[Ref] Applicable standard specifications:* RFC2544.
*** Variables ***
diff --git a/tests/vpp/perf/ip4/10ge2p1x520-ethip4udp-ip4base-iacl10sl-100flows-mrr.robot b/tests/vpp/perf/ip4/10ge2p1x520-ethip4udp-ip4base-iacl10sl-100flows-mrr.robot
index d567e3cd43..64353ac6e6 100644
--- a/tests/vpp/perf/ip4/10ge2p1x520-ethip4udp-ip4base-iacl10sl-100flows-mrr.robot
+++ b/tests/vpp/perf/ip4/10ge2p1x520-ethip4udp-ip4base-iacl10sl-100flows-mrr.robot
@@ -34,19 +34,18 @@
| ...
| ... | *[Top] Network Topologies:* TG-DUT1-DUT2-TG 3-node circular topology\
| ... | with single links between nodes.
-| ... | *[Enc] Packet Encapsulations:* Eth-IPv4-UDP for L2 switching of IPv4.
-| ... | *[Cfg] DUT configuration:* DUT1 is configured with L2 bridge domain\
-| ... | and MAC learning enabled. DUT2 is configured with L2 cross-connects.\
-| ... | Required ACL rules are applied to input paths of both DUT1 intefaces.\
-| ... | DUT1 and DUT2 are tested with 2p10GE NIC X520 Niantic by Intel.\
+| ... | *[Enc] Packet Encapsulations:* Eth-IPv4-UDP for IPv4 routing.
+| ... | *[Cfg] DUT configuration:* DUT1 and DUT2 are configured with IPv4\
+| ... | routing and one static IPv4 /24 route entries. Required ACL rules are\
+| ... | applied to input paths of both DUT1 intefaces. DUT1 and DUT2 are tested\
+| ... | with 2p10GE NIC X520 Niantic by Intel.\
| ... | *[Ver] TG verification:* In MaxReceivedRate test TG sends traffic
| ... | at line rate and reports total received/sent packets over trial period.
-| ... | Test packets are generated by TG on\
-| ... | links to DUTs. TG traffic profile contains two L3 flow-groups\
-| ... | (flow-group per direction, ${flows_per_dir} flows per flow-group) with\
-| ... | all packets containing Ethernet header, IPv4 header with UDP header and\
-| ... | static payload. MAC addresses are matching MAC addresses of the TG node\
-| ... | interfaces.
+| ... | Test packets are generated by TG on links to DUTs. TG traffic profile
+| ... | contains two L3 flow-groups (flow-group per direction, ${flows_per_dir}
+| ... | flows per flow-group) with all packets containing Ethernet header, IPv4
+| ... | header with IP protocol=61 and static payload. MAC addresses are
+| ... | matching MAC addresses of the TG node interfaces.
| ... | *[Ref] Applicable standard specifications:* RFC2544.
*** Variables ***
diff --git a/tests/vpp/perf/ip4/10ge2p1x520-ethip4udp-ip4base-iacl10sl-100flows-ndrpdr.robot b/tests/vpp/perf/ip4/10ge2p1x520-ethip4udp-ip4base-iacl10sl-100flows-ndrpdr.robot
index 0c9b0bd213..e783e63770 100644
--- a/tests/vpp/perf/ip4/10ge2p1x520-ethip4udp-ip4base-iacl10sl-100flows-ndrpdr.robot
+++ b/tests/vpp/perf/ip4/10ge2p1x520-ethip4udp-ip4base-iacl10sl-100flows-ndrpdr.robot
@@ -35,22 +35,21 @@
| ...
| ... | *[Top] Network Topologies:* TG-DUT1-DUT2-TG 3-node circular topology\
| ... | with single links between nodes.
-| ... | *[Enc] Packet Encapsulations:* Eth-IPv4-UDP for L2 switching of IPv4.
-| ... | *[Cfg] DUT configuration:* DUT1 is configured with L2 bridge domain\
-| ... | and MAC learning enabled. DUT2 is configured with L2 cross-connects.\
-| ... | Required ACL rules are applied to input paths of both DUT1 intefaces.\
-| ... | DUT1 and DUT2 are tested with 2p10GE NIC X520 Niantic by Intel.\
-| ... | *[Ver] TG verification:* TG finds and reports throughput NDR (Non Drop\
-| ... | Rate) with zero packet loss tolerance or throughput PDR (Partial Drop\
-| ... | Rate) with non-zero packet loss tolerance (LT) expressed in percentage\
-| ... | of packets transmitted. NDR and PDR are discovered for different\
+| ... | *[Enc] Packet Encapsulations:* Eth-IPv4-UDP for IPv4 routing.
+| ... | *[Cfg] DUT configuration:* DUT1 and DUT2 are configured with IPv4\
+| ... | routing and one static IPv4 /24 route entries. Required ACL rules are\
+| ... | applied to input paths of both DUT1 intefaces. DUT1 and DUT2 are tested\
+| ... | with 2p10GE NIC X520 Niantic by Intel.\
+| ... | *[Ver] TG verification:* TG finds and reports throughput NDR (Non Drop
+| ... | Rate) with zero packet loss tolerance or throughput PDR (Partial Drop
+| ... | Rate) with non-zero packet loss tolerance (LT) expressed in percentage
+| ... | of packets transmitted. NDR and PDR are discovered for different
| ... | Ethernet L2 frame sizes using MLRsearch library.
-| ... | Test packets are generated by TG on\
-| ... | links to DUTs. TG traffic profile contains two L3 flow-groups\
-| ... | (flow-group per direction, ${flows_per_dir} flows per flow-group) with\
-| ... | all packets containing Ethernet header, IPv4 header with UDP header and\
-| ... | static payload. MAC addresses are matching MAC addresses of the TG node\
-| ... | interfaces.
+| ... | Test packets are generated by TG on links to DUTs. TG traffic profile
+| ... | contains two L3 flow-groups (flow-group per direction, ${flows_per_dir}
+| ... | flows per flow-group) with all packets containing Ethernet header, IPv4
+| ... | header with IP protocol=61 and static payload. MAC addresses are
+| ... | matching MAC addresses of the TG node interfaces.
| ... | *[Ref] Applicable standard specifications:* RFC2544.
*** Variables ***
diff --git a/tests/vpp/perf/ip4/10ge2p1x520-ethip4udp-ip4base-iacl10sl-100kflows-mrr.robot b/tests/vpp/perf/ip4/10ge2p1x520-ethip4udp-ip4base-iacl10sl-100kflows-mrr.robot
index a1e9ef8f3f..9939b3c233 100644
--- a/tests/vpp/perf/ip4/10ge2p1x520-ethip4udp-ip4base-iacl10sl-100kflows-mrr.robot
+++ b/tests/vpp/perf/ip4/10ge2p1x520-ethip4udp-ip4base-iacl10sl-100kflows-mrr.robot
@@ -34,19 +34,18 @@
| ...
| ... | *[Top] Network Topologies:* TG-DUT1-DUT2-TG 3-node circular topology\
| ... | with single links between nodes.
-| ... | *[Enc] Packet Encapsulations:* Eth-IPv4-UDP for L2 switching of IPv4.
-| ... | *[Cfg] DUT configuration:* DUT1 is configured with L2 bridge domain\
-| ... | and MAC learning enabled. DUT2 is configured with L2 cross-connects.\
-| ... | Required ACL rules are applied to input paths of both DUT1 intefaces.\
-| ... | DUT1 and DUT2 are tested with 2p10GE NIC X520 Niantic by Intel.\
+| ... | *[Enc] Packet Encapsulations:* Eth-IPv4-UDP for IPv4 routing.
+| ... | *[Cfg] DUT configuration:* DUT1 and DUT2 are configured with IPv4\
+| ... | routing and one static IPv4 /24 route entries. Required ACL rules are\
+| ... | applied to input paths of both DUT1 intefaces. DUT1 and DUT2 are tested\
+| ... | with 2p10GE NIC X520 Niantic by Intel.\
| ... | *[Ver] TG verification:* In MaxReceivedRate test TG sends traffic
| ... | at line rate and reports total received/sent packets over trial period.
-| ... | Test packets are generated by TG on\
-| ... | links to DUTs. TG traffic profile contains two L3 flow-groups\
-| ... | (flow-group per direction, ${flows_per_dir} flows per flow-group) with\
-| ... | all packets containing Ethernet header, IPv4 header with UDP header and\
-| ... | static payload. MAC addresses are matching MAC addresses of the TG node\
-| ... | interfaces.
+| ... | Test packets are generated by TG on links to DUTs. TG traffic profile
+| ... | contains two L3 flow-groups (flow-group per direction, ${flows_per_dir}
+| ... | flows per flow-group) with all packets containing Ethernet header, IPv4
+| ... | header with IP protocol=61 and static payload. MAC addresses are
+| ... | matching MAC addresses of the TG node interfaces.
| ... | *[Ref] Applicable standard specifications:* RFC2544.
*** Variables ***
diff --git a/tests/vpp/perf/ip4/10ge2p1x520-ethip4udp-ip4base-iacl10sl-100kflows-ndrpdr.robot b/tests/vpp/perf/ip4/10ge2p1x520-ethip4udp-ip4base-iacl10sl-100kflows-ndrpdr.robot
index 19657b49fa..5cd87ec4f0 100644
--- a/tests/vpp/perf/ip4/10ge2p1x520-ethip4udp-ip4base-iacl10sl-100kflows-ndrpdr.robot
+++ b/tests/vpp/perf/ip4/10ge2p1x520-ethip4udp-ip4base-iacl10sl-100kflows-ndrpdr.robot
@@ -35,22 +35,21 @@
| ...
| ... | *[Top] Network Topologies:* TG-DUT1-DUT2-TG 3-node circular topology\
| ... | with single links between nodes.
-| ... | *[Enc] Packet Encapsulations:* Eth-IPv4-UDP for L2 switching of IPv4.
-| ... | *[Cfg] DUT configuration:* DUT1 is configured with L2 bridge domain\
-| ... | and MAC learning enabled. DUT2 is configured with L2 cross-connects.\
-| ... | Required ACL rules are applied to input paths of both DUT1 intefaces.\
-| ... | DUT1 and DUT2 are tested with 2p10GE NIC X520 Niantic by Intel.\
-| ... | *[Ver] TG verification:* TG finds and reports throughput NDR (Non Drop\
-| ... | Rate) with zero packet loss tolerance or throughput PDR (Partial Drop\
-| ... | Rate) with non-zero packet loss tolerance (LT) expressed in percentage\
-| ... | of packets transmitted. NDR and PDR are discovered for different\
+| ... | *[Enc] Packet Encapsulations:* Eth-IPv4-UDP for IPv4 routing.
+| ... | *[Cfg] DUT configuration:* DUT1 and DUT2 are configured with IPv4\
+| ... | routing and one static IPv4 /24 route entries. Required ACL rules are\
+| ... | applied to input paths of both DUT1 intefaces. DUT1 and DUT2 are tested\
+| ... | with 2p10GE NIC X520 Niantic by Intel.\
+| ... | *[Ver] TG verification:* TG finds and reports throughput NDR (Non Drop
+| ... | Rate) with zero packet loss tolerance or throughput PDR (Partial Drop
+| ... | Rate) with non-zero packet loss tolerance (LT) expressed in percentage
+| ... | of packets transmitted. NDR and PDR are discovered for different
| ... | Ethernet L2 frame sizes using MLRsearch library.
-| ... | Test packets are generated by TG on\
-| ... | links to DUTs. TG traffic profile contains two L3 flow-groups\
-| ... | (flow-group per direction, ${flows_per_dir} flows per flow-group) with\
-| ... | all packets containing Ethernet header, IPv4 header with UDP header and\
-| ... | static payload. MAC addresses are matching MAC addresses of the TG node\
-| ... | interfaces.
+| ... | Test packets are generated by TG on links to DUTs. TG traffic profile
+| ... | contains two L3 flow-groups (flow-group per direction, ${flows_per_dir}
+| ... | flows per flow-group) with all packets containing Ethernet header, IPv4
+| ... | header with IP protocol=61 and static payload. MAC addresses are
+| ... | matching MAC addresses of the TG node interfaces.
| ... | *[Ref] Applicable standard specifications:* RFC2544.
*** Variables ***
diff --git a/tests/vpp/perf/ip4/10ge2p1x520-ethip4udp-ip4base-iacl10sl-10kflows-mrr.robot b/tests/vpp/perf/ip4/10ge2p1x520-ethip4udp-ip4base-iacl10sl-10kflows-mrr.robot
index e778a47f25..b3f8759854 100644
--- a/tests/vpp/perf/ip4/10ge2p1x520-ethip4udp-ip4base-iacl10sl-10kflows-mrr.robot
+++ b/tests/vpp/perf/ip4/10ge2p1x520-ethip4udp-ip4base-iacl10sl-10kflows-mrr.robot
@@ -34,19 +34,18 @@
| ...
| ... | *[Top] Network Topologies:* TG-DUT1-DUT2-TG 3-node circular topology\
| ... | with single links between nodes.
-| ... | *[Enc] Packet Encapsulations:* Eth-IPv4-UDP for L2 switching of IPv4.
-| ... | *[Cfg] DUT configuration:* DUT1 is configured with L2 bridge domain\
-| ... | and MAC learning enabled. DUT2 is configured with L2 cross-connects.\
-| ... | Required ACL rules are applied to input paths of both DUT1 intefaces.\
-| ... | DUT1 and DUT2 are tested with 2p10GE NIC X520 Niantic by Intel.\
+| ... | *[Enc] Packet Encapsulations:* Eth-IPv4-UDP for IPv4 routing.
+| ... | *[Cfg] DUT configuration:* DUT1 and DUT2 are configured with IPv4\
+| ... | routing and one static IPv4 /24 route entries. Required ACL rules are\
+| ... | applied to input paths of both DUT1 intefaces. DUT1 and DUT2 are tested\
+| ... | with 2p10GE NIC X520 Niantic by Intel.\
| ... | *[Ver] TG verification:* In MaxReceivedRate test TG sends traffic
| ... | at line rate and reports total received/sent packets over trial period.
-| ... | Test packets are generated by TG on\
-| ... | links to DUTs. TG traffic profile contains two L3 flow-groups\
-| ... | (flow-group per direction, ${flows_per_dir} flows per flow-group) with\
-| ... | all packets containing Ethernet header, IPv4 header with UDP header and\
-| ... | static payload. MAC addresses are matching MAC addresses of the TG node\
-| ... | interfaces.
+| ... | Test packets are generated by TG on links to DUTs. TG traffic profile
+| ... | contains two L3 flow-groups (flow-group per direction, ${flows_per_dir}
+| ... | flows per flow-group) with all packets containing Ethernet header, IPv4
+| ... | header with IP protocol=61 and static payload. MAC addresses are
+| ... | matching MAC addresses of the TG node interfaces.
| ... | *[Ref] Applicable standard specifications:* RFC2544.
*** Variables ***
diff --git a/tests/vpp/perf/ip4/10ge2p1x520-ethip4udp-ip4base-iacl10sl-10kflows-ndrpdr.robot b/tests/vpp/perf/ip4/10ge2p1x520-ethip4udp-ip4base-iacl10sl-10kflows-ndrpdr.robot
index 2e26f5be3d..1950784634 100644
--- a/tests/vpp/perf/ip4/10ge2p1x520-ethip4udp-ip4base-iacl10sl-10kflows-ndrpdr.robot
+++ b/tests/vpp/perf/ip4/10ge2p1x520-ethip4udp-ip4base-iacl10sl-10kflows-ndrpdr.robot
@@ -35,22 +35,21 @@
| ...
| ... | *[Top] Network Topologies:* TG-DUT1-DUT2-TG 3-node circular topology\
| ... | with single links between nodes.
-| ... | *[Enc] Packet Encapsulations:* Eth-IPv4-UDP for L2 switching of IPv4.
-| ... | *[Cfg] DUT configuration:* DUT1 is configured with L2 bridge domain\
-| ... | and MAC learning enabled. DUT2 is configured with L2 cross-connects.\
-| ... | Required ACL rules are applied to input paths of both DUT1 intefaces.\
-| ... | DUT1 and DUT2 are tested with 2p10GE NIC X520 Niantic by Intel.\
-| ... | *[Ver] TG verification:* TG finds and reports throughput NDR (Non Drop\
-| ... | Rate) with zero packet loss tolerance or throughput PDR (Partial Drop\
-| ... | Rate) with non-zero packet loss tolerance (LT) expressed in percentage\
-| ... | of packets transmitted. NDR and PDR are discovered for different\
+| ... | *[Enc] Packet Encapsulations:* Eth-IPv4-UDP for IPv4 routing.
+| ... | *[Cfg] DUT configuration:* DUT1 and DUT2 are configured with IPv4\
+| ... | routing and one static IPv4 /24 route entries. Required ACL rules are\
+| ... | applied to input paths of both DUT1 intefaces. DUT1 and DUT2 are tested\
+| ... | with 2p10GE NIC X520 Niantic by Intel.\
+| ... | *[Ver] TG verification:* TG finds and reports throughput NDR (Non Drop
+| ... | Rate) with zero packet loss tolerance or throughput PDR (Partial Drop
+| ... | Rate) with non-zero packet loss tolerance (LT) expressed in percentage
+| ... | of packets transmitted. NDR and PDR are discovered for different
| ... | Ethernet L2 frame sizes using MLRsearch library.
-| ... | Test packets are generated by TG on\
-| ... | links to DUTs. TG traffic profile contains two L3 flow-groups\
-| ... | (flow-group per direction, ${flows_per_dir} flows per flow-group) with\
-| ... | all packets containing Ethernet header, IPv4 header with UDP header and\
-| ... | static payload. MAC addresses are matching MAC addresses of the TG node\
-| ... | interfaces.
+| ... | Test packets are generated by TG on links to DUTs. TG traffic profile
+| ... | contains two L3 flow-groups (flow-group per direction, ${flows_per_dir}
+| ... | flows per flow-group) with all packets containing Ethernet header, IPv4
+| ... | header with IP protocol=61 and static payload. MAC addresses are
+| ... | matching MAC addresses of the TG node interfaces.
| ... | *[Ref] Applicable standard specifications:* RFC2544.
*** Variables ***
diff --git a/tests/vpp/perf/ip4/10ge2p1x520-ethip4udp-ip4base-iacl1sf-100flows-mrr.robot b/tests/vpp/perf/ip4/10ge2p1x520-ethip4udp-ip4base-iacl1sf-100flows-mrr.robot
index 21e03b98a3..a9e0aa9ff3 100644
--- a/tests/vpp/perf/ip4/10ge2p1x520-ethip4udp-ip4base-iacl1sf-100flows-mrr.robot
+++ b/tests/vpp/perf/ip4/10ge2p1x520-ethip4udp-ip4base-iacl1sf-100flows-mrr.robot
@@ -34,19 +34,18 @@
| ...
| ... | *[Top] Network Topologies:* TG-DUT1-DUT2-TG 3-node circular topology\
| ... | with single links between nodes.
-| ... | *[Enc] Packet Encapsulations:* Eth-IPv4-UDP for L2 switching of IPv4.
-| ... | *[Cfg] DUT configuration:* DUT1 is configured with L2 bridge domain\
-| ... | and MAC learning enabled. DUT2 is configured with L2 cross-connects.\
-| ... | Required ACL rules are applied to input paths of both DUT1 intefaces.\
-| ... | DUT1 and DUT2 are tested with 2p10GE NIC X520 Niantic by Intel.\
+| ... | *[Enc] Packet Encapsulations:* Eth-IPv4-UDP for IPv4 routing.
+| ... | *[Cfg] DUT configuration:* DUT1 and DUT2 are configured with IPv4\
+| ... | routing and one static IPv4 /24 route entries. Required ACL rules are\
+| ... | applied to input paths of both DUT1 intefaces. DUT1 and DUT2 are tested\
+| ... | with 2p10GE NIC X520 Niantic by Intel.\
| ... | *[Ver] TG verification:* In MaxReceivedRate test TG sends traffic
| ... | at line rate and reports total received/sent packets over trial period.
-| ... | Test packets are generated by TG on\
-| ... | links to DUTs. TG traffic profile contains two L3 flow-groups\
-| ... | (flow-group per direction, ${flows_per_dir} flows per flow-group) with\
-| ... | all packets containing Ethernet header, IPv4 header with UDP header and\
-| ... | static payload. MAC addresses are matching MAC addresses of the TG node\
-| ... | interfaces.
+| ... | Test packets are generated by TG on links to DUTs. TG traffic profile
+| ... | contains two L3 flow-groups (flow-group per direction, ${flows_per_dir}
+| ... | flows per flow-group) with all packets containing Ethernet header, IPv4
+| ... | header with IP protocol=61 and static payload. MAC addresses are
+| ... | matching MAC addresses of the TG node interfaces.
| ... | *[Ref] Applicable standard specifications:* RFC2544.
*** Variables ***
diff --git a/tests/vpp/perf/ip4/10ge2p1x520-ethip4udp-ip4base-iacl1sf-100flows-ndrpdr.robot b/tests/vpp/perf/ip4/10ge2p1x520-ethip4udp-ip4base-iacl1sf-100flows-ndrpdr.robot
index 2ec8f1c1f7..ba113e2c47 100644
--- a/tests/vpp/perf/ip4/10ge2p1x520-ethip4udp-ip4base-iacl1sf-100flows-ndrpdr.robot
+++ b/tests/vpp/perf/ip4/10ge2p1x520-ethip4udp-ip4base-iacl1sf-100flows-ndrpdr.robot
@@ -35,22 +35,21 @@
| ...
| ... | *[Top] Network Topologies:* TG-DUT1-DUT2-TG 3-node circular topology\
| ... | with single links between nodes.
-| ... | *[Enc] Packet Encapsulations:* Eth-IPv4-UDP for L2 switching of IPv4.
-| ... | *[Cfg] DUT configuration:* DUT1 is configured with L2 bridge domain\
-| ... | and MAC learning enabled. DUT2 is configured with L2 cross-connects.\
-| ... | Required ACL rules are applied to input paths of both DUT1 intefaces.\
-| ... | DUT1 and DUT2 are tested with 2p10GE NIC X520 Niantic by Intel.\
-| ... | *[Ver] TG verification:* TG finds and reports throughput NDR (Non Drop\
-| ... | Rate) with zero packet loss tolerance or throughput PDR (Partial Drop\
-| ... | Rate) with non-zero packet loss tolerance (LT) expressed in percentage\
-| ... | of packets transmitted. NDR and PDR are discovered for different\
+| ... | *[Enc] Packet Encapsulations:* Eth-IPv4-UDP for IPv4 routing.
+| ... | *[Cfg] DUT configuration:* DUT1 and DUT2 are configured with IPv4\
+| ... | routing and one static IPv4 /24 route entries. Required ACL rules are\
+| ... | applied to input paths of both DUT1 intefaces. DUT1 and DUT2 are tested\
+| ... | with 2p10GE NIC X520 Niantic by Intel.\
+| ... | *[Ver] TG verification:* TG finds and reports throughput NDR (Non Drop
+| ... | Rate) with zero packet loss tolerance or throughput PDR (Partial Drop
+| ... | Rate) with non-zero packet loss tolerance (LT) expressed in percentage
+| ... | of packets transmitted. NDR and PDR are discovered for different
| ... | Ethernet L2 frame sizes using MLRsearch library.
-| ... | Test packets are generated by TG on\
-| ... | links to DUTs. TG traffic profile contains two L3 flow-groups\
-| ... | (flow-group per direction, ${flows_per_dir} flows per flow-group) with\
-| ... | all packets containing Ethernet header, IPv4 header with UDP header and\
-| ... | static payload. MAC addresses are matching MAC addresses of the TG node\
-| ... | interfaces.
+| ... | Test packets are generated by TG on links to DUTs. TG traffic profile
+| ... | contains two L3 flow-groups (flow-group per direction, ${flows_per_dir}
+| ... | flows per flow-group) with all packets containing Ethernet header, IPv4
+| ... | header with IP protocol=61 and static payload. MAC addresses are
+| ... | matching MAC addresses of the TG node interfaces.
| ... | *[Ref] Applicable standard specifications:* RFC2544.
*** Variables ***
diff --git a/tests/vpp/perf/ip4/10ge2p1x520-ethip4udp-ip4base-iacl1sf-100kflows-mrr.robot b/tests/vpp/perf/ip4/10ge2p1x520-ethip4udp-ip4base-iacl1sf-100kflows-mrr.robot
index 132e3ed260..c3c3ef2ad5 100644
--- a/tests/vpp/perf/ip4/10ge2p1x520-ethip4udp-ip4base-iacl1sf-100kflows-mrr.robot
+++ b/tests/vpp/perf/ip4/10ge2p1x520-ethip4udp-ip4base-iacl1sf-100kflows-mrr.robot
@@ -34,19 +34,18 @@
| ...
| ... | *[Top] Network Topologies:* TG-DUT1-DUT2-TG 3-node circular topology\
| ... | with single links between nodes.
-| ... | *[Enc] Packet Encapsulations:* Eth-IPv4-UDP for L2 switching of IPv4.
-| ... | *[Cfg] DUT configuration:* DUT1 is configured with L2 bridge domain\
-| ... | and MAC learning enabled. DUT2 is configured with L2 cross-connects.\
-| ... | Required ACL rules are applied to input paths of both DUT1 intefaces.\
-| ... | DUT1 and DUT2 are tested with 2p10GE NIC X520 Niantic by Intel.\
+| ... | *[Enc] Packet Encapsulations:* Eth-IPv4-UDP for IPv4 routing.
+| ... | *[Cfg] DUT configuration:* DUT1 and DUT2 are configured with IPv4\
+| ... | routing and one static IPv4 /24 route entries. Required ACL rules are\
+| ... | applied to input paths of both DUT1 intefaces. DUT1 and DUT2 are tested\
+| ... | with 2p10GE NIC X520 Niantic by Intel.\
| ... | *[Ver] TG verification:* In MaxReceivedRate test TG sends traffic
| ... | at line rate and reports total received/sent packets over trial period.
-| ... | Test packets are generated by TG on\
-| ... | links to DUTs. TG traffic profile contains two L3 flow-groups\
-| ... | (flow-group per direction, ${flows_per_dir} flows per flow-group) with\
-| ... | all packets containing Ethernet header, IPv4 header with UDP header and\
-| ... | static payload. MAC addresses are matching MAC addresses of the TG node\
-| ... | interfaces.
+| ... | Test packets are generated by TG on links to DUTs. TG traffic profile
+| ... | contains two L3 flow-groups (flow-group per direction, ${flows_per_dir}
+| ... | flows per flow-group) with all packets containing Ethernet header, IPv4
+| ... | header with IP protocol=61 and static payload. MAC addresses are
+| ... | matching MAC addresses of the TG node interfaces.
| ... | *[Ref] Applicable standard specifications:* RFC2544.
*** Variables ***
diff --git a/tests/vpp/perf/ip4/10ge2p1x520-ethip4udp-ip4base-iacl1sf-100kflows-ndrpdr.robot b/tests/vpp/perf/ip4/10ge2p1x520-ethip4udp-ip4base-iacl1sf-100kflows-ndrpdr.robot
index f66baff435..4ab48f6806 100644
--- a/tests/vpp/perf/ip4/10ge2p1x520-ethip4udp-ip4base-iacl1sf-100kflows-ndrpdr.robot
+++ b/tests/vpp/perf/ip4/10ge2p1x520-ethip4udp-ip4base-iacl1sf-100kflows-ndrpdr.robot
@@ -35,22 +35,21 @@
| ...
| ... | *[Top] Network Topologies:* TG-DUT1-DUT2-TG 3-node circular topology\
| ... | with single links between nodes.
-| ... | *[Enc] Packet Encapsulations:* Eth-IPv4-UDP for L2 switching of IPv4.
-| ... | *[Cfg] DUT configuration:* DUT1 is configured with L2 bridge domain\
-| ... | and MAC learning enabled. DUT2 is configured with L2 cross-connects.\
-| ... | Required ACL rules are applied to input paths of both DUT1 intefaces.\
-| ... | DUT1 and DUT2 are tested with 2p10GE NIC X520 Niantic by Intel.\
-| ... | *[Ver] TG verification:* TG finds and reports throughput NDR (Non Drop\
-| ... | Rate) with zero packet loss tolerance or throughput PDR (Partial Drop\
-| ... | Rate) with non-zero packet loss tolerance (LT) expressed in percentage\
-| ... | of packets transmitted. NDR and PDR are discovered for different\
+| ... | *[Enc] Packet Encapsulations:* Eth-IPv4-UDP for IPv4 routing.
+| ... | *[Cfg] DUT configuration:* DUT1 and DUT2 are configured with IPv4\
+| ... | routing and one static IPv4 /24 route entries. Required ACL rules are\
+| ... | applied to input paths of both DUT1 intefaces. DUT1 and DUT2 are tested\
+| ... | with 2p10GE NIC X520 Niantic by Intel.\
+| ... | *[Ver] TG verification:* TG finds and reports throughput NDR (Non Drop
+| ... | Rate) with zero packet loss tolerance or throughput PDR (Partial Drop
+| ... | Rate) with non-zero packet loss tolerance (LT) expressed in percentage
+| ... | of packets transmitted. NDR and PDR are discovered for different
| ... | Ethernet L2 frame sizes using MLRsearch library.
-| ... | Test packets are generated by TG on\
-| ... | links to DUTs. TG traffic profile contains two L3 flow-groups\
-| ... | (flow-group per direction, ${flows_per_dir} flows per flow-group) with\
-| ... | all packets containing Ethernet header, IPv4 header with UDP header and\
-| ... | static payload. MAC addresses are matching MAC addresses of the TG node\
-| ... | interfaces.
+| ... | Test packets are generated by TG on links to DUTs. TG traffic profile
+| ... | contains two L3 flow-groups (flow-group per direction, ${flows_per_dir}
+| ... | flows per flow-group) with all packets containing Ethernet header, IPv4
+| ... | header with IP protocol=61 and static payload. MAC addresses are
+| ... | matching MAC addresses of the TG node interfaces.
| ... | *[Ref] Applicable standard specifications:* RFC2544.
*** Variables ***
diff --git a/tests/vpp/perf/ip4/10ge2p1x520-ethip4udp-ip4base-iacl1sf-10kflows-mrr.robot b/tests/vpp/perf/ip4/10ge2p1x520-ethip4udp-ip4base-iacl1sf-10kflows-mrr.robot
index 9553789d58..38bb9a1eaf 100644
--- a/tests/vpp/perf/ip4/10ge2p1x520-ethip4udp-ip4base-iacl1sf-10kflows-mrr.robot
+++ b/tests/vpp/perf/ip4/10ge2p1x520-ethip4udp-ip4base-iacl1sf-10kflows-mrr.robot
@@ -34,18 +34,18 @@
| ...
| ... | *[Top] Network Topologies:* TG-DUT1-DUT2-TG 3-node circular topology\
| ... | with single links between nodes.
-| ... | *[Enc] Packet Encapsulations:* Eth-IPv4-UDP for L2 switching of IPv4.
-| ... | *[Cfg] DUT configuration:* DUT1 is configured with L2 bridge domain\
-| ... | and MAC learning enabled. DUT2 is configured with L2 cross-connects.\
-| ... | Required ACL rules are applied to input paths of both DUT1 intefaces.\
-| ... | DUT1 and DUT2 are tested with 2p10GE NIC X520 Niantic by Intel.\
+| ... | *[Enc] Packet Encapsulations:* Eth-IPv4-UDP for IPv4 routing.
+| ... | *[Cfg] DUT configuration:* DUT1 and DUT2 are configured with IPv4\
+| ... | routing and one static IPv4 /24 route entries. Required ACL rules are\
+| ... | applied to input paths of both DUT1 intefaces. DUT1 and DUT2 are tested\
+| ... | with 2p10GE NIC X520 Niantic by Intel.\
| ... | *[Ver] TG verification:* In MaxReceivedRate test TG sends traffic
| ... | at line rate and reports total received/sent packets over trial period.
| ... | Test packets are generated by TG on links to DUTs. TG traffic profile
-| ... | contains two L3 flow-groups (flow-group per direction, 253 flows per
-| ... | flow-group) with all packets containing Ethernet header, IPv4 header
-| ... | with IP protocol=61 and static payload. MAC addresses are matching MAC
-| ... | addresses of the TG node interfaces.
+| ... | contains two L3 flow-groups (flow-group per direction, ${flows_per_dir}
+| ... | flows per flow-group) with all packets containing Ethernet header, IPv4
+| ... | header with IP protocol=61 and static payload. MAC addresses are
+| ... | matching MAC addresses of the TG node interfaces.
| ... | *[Ref] Applicable standard specifications:* RFC2544.
*** Variables ***
diff --git a/tests/vpp/perf/ip4/10ge2p1x520-ethip4udp-ip4base-iacl1sf-10kflows-ndrpdr.robot b/tests/vpp/perf/ip4/10ge2p1x520-ethip4udp-ip4base-iacl1sf-10kflows-ndrpdr.robot
index cc555eb44b..f2236d77a0 100644
--- a/tests/vpp/perf/ip4/10ge2p1x520-ethip4udp-ip4base-iacl1sf-10kflows-ndrpdr.robot
+++ b/tests/vpp/perf/ip4/10ge2p1x520-ethip4udp-ip4base-iacl1sf-10kflows-ndrpdr.robot
@@ -35,21 +35,21 @@
| ...
| ... | *[Top] Network Topologies:* TG-DUT1-DUT2-TG 3-node circular topology\
| ... | with single links between nodes.
-| ... | *[Enc] Packet Encapsulations:* Eth-IPv4-UDP for L2 switching of IPv4.
-| ... | *[Cfg] DUT configuration:* DUT1 is configured with L2 bridge domain\
-| ... | and MAC learning enabled. DUT2 is configured with L2 cross-connects.\
-| ... | Required ACL rules are applied to input paths of both DUT1 intefaces.\
-| ... | DUT1 and DUT2 are tested with 2p10GE NIC X520 Niantic by Intel.\
+| ... | *[Enc] Packet Encapsulations:* Eth-IPv4-UDP for IPv4 routing.
+| ... | *[Cfg] DUT configuration:* DUT1 and DUT2 are configured with IPv4\
+| ... | routing and one static IPv4 /24 route entries. Required ACL rules are\
+| ... | applied to input paths of both DUT1 intefaces. DUT1 and DUT2 are tested\
+| ... | with 2p10GE NIC X520 Niantic by Intel.\
| ... | *[Ver] TG verification:* TG finds and reports throughput NDR (Non Drop
| ... | Rate) with zero packet loss tolerance or throughput PDR (Partial Drop
| ... | Rate) with non-zero packet loss tolerance (LT) expressed in percentage
| ... | of packets transmitted. NDR and PDR are discovered for different
| ... | Ethernet L2 frame sizes using MLRsearch library.
| ... | Test packets are generated by TG on links to DUTs. TG traffic profile
-| ... | contains two L3 flow-groups (flow-group per direction, 253 flows per
-| ... | flow-group) with all packets containing Ethernet header, IPv4 header
-| ... | with IP protocol=61 and static payload. MAC addresses are matching MAC
-| ... | addresses of the TG node interfaces.
+| ... | contains two L3 flow-groups (flow-group per direction, ${flows_per_dir}
+| ... | flows per flow-group) with all packets containing Ethernet header, IPv4
+| ... | header with IP protocol=61 and static payload. MAC addresses are
+| ... | matching MAC addresses of the TG node interfaces.
| ... | *[Ref] Applicable standard specifications:* RFC2544.
*** Variables ***
diff --git a/tests/vpp/perf/ip4/10ge2p1x520-ethip4udp-ip4base-iacl1sl-100flows-mrr.robot b/tests/vpp/perf/ip4/10ge2p1x520-ethip4udp-ip4base-iacl1sl-100flows-mrr.robot
index 2d82ff8d1e..695a0a525d 100644
--- a/tests/vpp/perf/ip4/10ge2p1x520-ethip4udp-ip4base-iacl1sl-100flows-mrr.robot
+++ b/tests/vpp/perf/ip4/10ge2p1x520-ethip4udp-ip4base-iacl1sl-100flows-mrr.robot
@@ -34,19 +34,18 @@
| ...
| ... | *[Top] Network Topologies:* TG-DUT1-DUT2-TG 3-node circular topology\
| ... | with single links between nodes.
-| ... | *[Enc] Packet Encapsulations:* Eth-IPv4-UDP for L2 switching of IPv4.
-| ... | *[Cfg] DUT configuration:* DUT1 is configured with L2 bridge domain\
-| ... | and MAC learning enabled. DUT2 is configured with L2 cross-connects.\
-| ... | Required ACL rules are applied to input paths of both DUT1 intefaces.\
-| ... | DUT1 and DUT2 are tested with 2p10GE NIC X520 Niantic by Intel.\
+| ... | *[Enc] Packet Encapsulations:* Eth-IPv4-UDP for IPv4 routing.
+| ... | *[Cfg] DUT configuration:* DUT1 and DUT2 are configured with IPv4\
+| ... | routing and one static IPv4 /24 route entries. Required ACL rules are\
+| ... | applied to input paths of both DUT1 intefaces. DUT1 and DUT2 are tested\
+| ... | with 2p10GE NIC X520 Niantic by Intel.\
| ... | *[Ver] TG verification:* In MaxReceivedRate test TG sends traffic
| ... | at line rate and reports total received/sent packets over trial period.
-| ... | Test packets are generated by TG on\
-| ... | links to DUTs. TG traffic profile contains two L3 flow-groups\
-| ... | (flow-group per direction, ${flows_per_dir} flows per flow-group) with\
-| ... | all packets containing Ethernet header, IPv4 header with UDP header and\
-| ... | static payload. MAC addresses are matching MAC addresses of the TG node\
-| ... | interfaces.
+| ... | Test packets are generated by TG on links to DUTs. TG traffic profile
+| ... | contains two L3 flow-groups (flow-group per direction, ${flows_per_dir}
+| ... | flows per flow-group) with all packets containing Ethernet header, IPv4
+| ... | header with IP protocol=61 and static payload. MAC addresses are
+| ... | matching MAC addresses of the TG node interfaces.
| ... | *[Ref] Applicable standard specifications:* RFC2544.
*** Variables ***
diff --git a/tests/vpp/perf/ip4/10ge2p1x520-ethip4udp-ip4base-iacl1sl-100flows-ndrpdr.robot b/tests/vpp/perf/ip4/10ge2p1x520-ethip4udp-ip4base-iacl1sl-100flows-ndrpdr.robot
index e9b16564fa..a13f5dcbba 100644
--- a/tests/vpp/perf/ip4/10ge2p1x520-ethip4udp-ip4base-iacl1sl-100flows-ndrpdr.robot
+++ b/tests/vpp/perf/ip4/10ge2p1x520-ethip4udp-ip4base-iacl1sl-100flows-ndrpdr.robot
@@ -35,22 +35,21 @@
| ...
| ... | *[Top] Network Topologies:* TG-DUT1-DUT2-TG 3-node circular topology\
| ... | with single links between nodes.
-| ... | *[Enc] Packet Encapsulations:* Eth-IPv4-UDP for L2 switching of IPv4.
-| ... | *[Cfg] DUT configuration:* DUT1 is configured with L2 bridge domain\
-| ... | and MAC learning enabled. DUT2 is configured with L2 cross-connects.\
-| ... | Required ACL rules are applied to input paths of both DUT1 intefaces.\
-| ... | DUT1 and DUT2 are tested with 2p10GE NIC X520 Niantic by Intel.\
-| ... | *[Ver] TG verification:* TG finds and reports throughput NDR (Non Drop\
-| ... | Rate) with zero packet loss tolerance or throughput PDR (Partial Drop\
-| ... | Rate) with non-zero packet loss tolerance (LT) expressed in percentage\
-| ... | of packets transmitted. NDR and PDR are discovered for different\
+| ... | *[Enc] Packet Encapsulations:* Eth-IPv4-UDP for IPv4 routing.
+| ... | *[Cfg] DUT configuration:* DUT1 and DUT2 are configured with IPv4\
+| ... | routing and one static IPv4 /24 route entries. Required ACL rules are\
+| ... | applied to input paths of both DUT1 intefaces. DUT1 and DUT2 are tested\
+| ... | with 2p10GE NIC X520 Niantic by Intel.\
+| ... | *[Ver] TG verification:* TG finds and reports throughput NDR (Non Drop
+| ... | Rate) with zero packet loss tolerance or throughput PDR (Partial Drop
+| ... | Rate) with non-zero packet loss tolerance (LT) expressed in percentage
+| ... | of packets transmitted. NDR and PDR are discovered for different
| ... | Ethernet L2 frame sizes using MLRsearch library.
-| ... | Test packets are generated by TG on\
-| ... | links to DUTs. TG traffic profile contains two L3 flow-groups\
-| ... | (flow-group per direction, ${flows_per_dir} flows per flow-group) with\
-| ... | all packets containing Ethernet header, IPv4 header with UDP header and\
-| ... | static payload. MAC addresses are matching MAC addresses of the TG node\
-| ... | interfaces.
+| ... | Test packets are generated by TG on links to DUTs. TG traffic profile
+| ... | contains two L3 flow-groups (flow-group per direction, ${flows_per_dir}
+| ... | flows per flow-group) with all packets containing Ethernet header, IPv4
+| ... | header with IP protocol=61 and static payload. MAC addresses are
+| ... | matching MAC addresses of the TG node interfaces.
| ... | *[Ref] Applicable standard specifications:* RFC2544.
*** Variables ***
diff --git a/tests/vpp/perf/ip4/10ge2p1x520-ethip4udp-ip4base-iacl1sl-100kflows-mrr.robot b/tests/vpp/perf/ip4/10ge2p1x520-ethip4udp-ip4base-iacl1sl-100kflows-mrr.robot
index 0ee32eff23..82e03ff934 100644
--- a/tests/vpp/perf/ip4/10ge2p1x520-ethip4udp-ip4base-iacl1sl-100kflows-mrr.robot
+++ b/tests/vpp/perf/ip4/10ge2p1x520-ethip4udp-ip4base-iacl1sl-100kflows-mrr.robot
@@ -34,19 +34,18 @@
| ...
| ... | *[Top] Network Topologies:* TG-DUT1-DUT2-TG 3-node circular topology\
| ... | with single links between nodes.
-| ... | *[Enc] Packet Encapsulations:* Eth-IPv4-UDP for L2 switching of IPv4.
-| ... | *[Cfg] DUT configuration:* DUT1 is configured with L2 bridge domain\
-| ... | and MAC learning enabled. DUT2 is configured with L2 cross-connects.\
-| ... | Required ACL rules are applied to input paths of both DUT1 intefaces.\
-| ... | DUT1 and DUT2 are tested with 2p10GE NIC X520 Niantic by Intel.\
+| ... | *[Enc] Packet Encapsulations:* Eth-IPv4-UDP for IPv4 routing.
+| ... | *[Cfg] DUT configuration:* DUT1 and DUT2 are configured with IPv4\
+| ... | routing and one static IPv4 /24 route entries. Required ACL rules are\
+| ... | applied to input paths of both DUT1 intefaces. DUT1 and DUT2 are tested\
+| ... | with 2p10GE NIC X520 Niantic by Intel.\
| ... | *[Ver] TG verification:* In MaxReceivedRate test TG sends traffic
| ... | at line rate and reports total received/sent packets over trial period.
-| ... | Test packets are generated by TG on\
-| ... | links to DUTs. TG traffic profile contains two L3 flow-groups\
-| ... | (flow-group per direction, ${flows_per_dir} flows per flow-group) with\
-| ... | all packets containing Ethernet header, IPv4 header with UDP header and\
-| ... | static payload. MAC addresses are matching MAC addresses of the TG node\
-| ... | interfaces.
+| ... | Test packets are generated by TG on links to DUTs. TG traffic profile
+| ... | contains two L3 flow-groups (flow-group per direction, ${flows_per_dir}
+| ... | flows per flow-group) with all packets containing Ethernet header, IPv4
+| ... | header with IP protocol=61 and static payload. MAC addresses are
+| ... | matching MAC addresses of the TG node interfaces.
| ... | *[Ref] Applicable standard specifications:* RFC2544.
*** Variables ***
diff --git a/tests/vpp/perf/ip4/10ge2p1x520-ethip4udp-ip4base-iacl1sl-100kflows-ndrpdr.robot b/tests/vpp/perf/ip4/10ge2p1x520-ethip4udp-ip4base-iacl1sl-100kflows-ndrpdr.robot
index 6b775a5664..e8d845e211 100644
--- a/tests/vpp/perf/ip4/10ge2p1x520-ethip4udp-ip4base-iacl1sl-100kflows-ndrpdr.robot
+++ b/tests/vpp/perf/ip4/10ge2p1x520-ethip4udp-ip4base-iacl1sl-100kflows-ndrpdr.robot
@@ -35,22 +35,21 @@
| ...
| ... | *[Top] Network Topologies:* TG-DUT1-DUT2-TG 3-node circular topology\
| ... | with single links between nodes.
-| ... | *[Enc] Packet Encapsulations:* Eth-IPv4-UDP for L2 switching of IPv4.
-| ... | *[Cfg] DUT configuration:* DUT1 is configured with L2 bridge domain\
-| ... | and MAC learning enabled. DUT2 is configured with L2 cross-connects.\
-| ... | Required ACL rules are applied to input paths of both DUT1 intefaces.\
-| ... | DUT1 and DUT2 are tested with 2p10GE NIC X520 Niantic by Intel.\
-| ... | *[Ver] TG verification:* TG finds and reports throughput NDR (Non Drop\
-| ... | Rate) with zero packet loss tolerance or throughput PDR (Partial Drop\
-| ... | Rate) with non-zero packet loss tolerance (LT) expressed in percentage\
-| ... | of packets transmitted. NDR and PDR are discovered for different\
+| ... | *[Enc] Packet Encapsulations:* Eth-IPv4-UDP for IPv4 routing.
+| ... | *[Cfg] DUT configuration:* DUT1 and DUT2 are configured with IPv4\
+| ... | routing and one static IPv4 /24 route entries. Required ACL rules are\
+| ... | applied to input paths of both DUT1 intefaces. DUT1 and DUT2 are tested\
+| ... | with 2p10GE NIC X520 Niantic by Intel.\
+| ... | *[Ver] TG verification:* TG finds and reports throughput NDR (Non Drop
+| ... | Rate) with zero packet loss tolerance or throughput PDR (Partial Drop
+| ... | Rate) with non-zero packet loss tolerance (LT) expressed in percentage
+| ... | of packets transmitted. NDR and PDR are discovered for different
| ... | Ethernet L2 frame sizes using MLRsearch library.
-| ... | Test packets are generated by TG on\
-| ... | links to DUTs. TG traffic profile contains two L3 flow-groups\
-| ... | (flow-group per direction, ${flows_per_dir} flows per flow-group) with\
-| ... | all packets containing Ethernet header, IPv4 header with UDP header and\
-| ... | static payload. MAC addresses are matching MAC addresses of the TG node\
-| ... | interfaces.
+| ... | Test packets are generated by TG on links to DUTs. TG traffic profile
+| ... | contains two L3 flow-groups (flow-group per direction, ${flows_per_dir}
+| ... | flows per flow-group) with all packets containing Ethernet header, IPv4
+| ... | header with IP protocol=61 and static payload. MAC addresses are
+| ... | matching MAC addresses of the TG node interfaces.
| ... | *[Ref] Applicable standard specifications:* RFC2544.
*** Variables ***
diff --git a/tests/vpp/perf/ip4/10ge2p1x520-ethip4udp-ip4base-iacl1sl-10kflows-mrr.robot b/tests/vpp/perf/ip4/10ge2p1x520-ethip4udp-ip4base-iacl1sl-10kflows-mrr.robot
index e9d8f6e7ca..983c25b5ae 100644
--- a/tests/vpp/perf/ip4/10ge2p1x520-ethip4udp-ip4base-iacl1sl-10kflows-mrr.robot
+++ b/tests/vpp/perf/ip4/10ge2p1x520-ethip4udp-ip4base-iacl1sl-10kflows-mrr.robot
@@ -34,18 +34,18 @@
| ...
| ... | *[Top] Network Topologies:* TG-DUT1-DUT2-TG 3-node circular topology\
| ... | with single links between nodes.
-| ... | *[Enc] Packet Encapsulations:* Eth-IPv4-UDP for L2 switching of IPv4.
-| ... | *[Cfg] DUT configuration:* DUT1 is configured with L2 bridge domain\
-| ... | and MAC learning enabled. DUT2 is configured with L2 cross-connects.\
-| ... | Required ACL rules are applied to input paths of both DUT1 intefaces.\
-| ... | DUT1 and DUT2 are tested with 2p10GE NIC X520 Niantic by Intel.\
+| ... | *[Enc] Packet Encapsulations:* Eth-IPv4-UDP for IPv4 routing.
+| ... | *[Cfg] DUT configuration:* DUT1 and DUT2 are configured with IPv4\
+| ... | routing and one static IPv4 /24 route entries. Required ACL rules are\
+| ... | applied to input paths of both DUT1 intefaces. DUT1 and DUT2 are tested\
+| ... | with 2p10GE NIC X520 Niantic by Intel.\
| ... | *[Ver] TG verification:* In MaxReceivedRate test TG sends traffic
| ... | at line rate and reports total received/sent packets over trial period.
| ... | Test packets are generated by TG on links to DUTs. TG traffic profile
-| ... | contains two L3 flow-groups (flow-group per direction, 253 flows per
-| ... | flow-group) with all packets containing Ethernet header, IPv4 header
-| ... | with IP protocol=61 and static payload. MAC addresses are matching MAC
-| ... | addresses of the TG node interfaces.
+| ... | contains two L3 flow-groups (flow-group per direction, ${flows_per_dir}
+| ... | flows per flow-group) with all packets containing Ethernet header, IPv4
+| ... | header with IP protocol=61 and static payload. MAC addresses are
+| ... | matching MAC addresses of the TG node interfaces.
| ... | *[Ref] Applicable standard specifications:* RFC2544.
*** Variables ***
diff --git a/tests/vpp/perf/ip4/10ge2p1x520-ethip4udp-ip4base-iacl1sl-10kflows-ndrpdr.robot b/tests/vpp/perf/ip4/10ge2p1x520-ethip4udp-ip4base-iacl1sl-10kflows-ndrpdr.robot
index 5a24a74816..6337398b30 100644
--- a/tests/vpp/perf/ip4/10ge2p1x520-ethip4udp-ip4base-iacl1sl-10kflows-ndrpdr.robot
+++ b/tests/vpp/perf/ip4/10ge2p1x520-ethip4udp-ip4base-iacl1sl-10kflows-ndrpdr.robot
@@ -35,21 +35,21 @@
| ...
| ... | *[Top] Network Topologies:* TG-DUT1-DUT2-TG 3-node circular topology\
| ... | with single links between nodes.
-| ... | *[Enc] Packet Encapsulations:* Eth-IPv4-UDP for L2 switching of IPv4.
-| ... | *[Cfg] DUT configuration:* DUT1 is configured with L2 bridge domain\
-| ... | and MAC learning enabled. DUT2 is configured with L2 cross-connects.\
-| ... | Required ACL rules are applied to input paths of both DUT1 intefaces.\
-| ... | DUT1 and DUT2 are tested with 2p10GE NIC X520 Niantic by Intel.\
+| ... | *[Enc] Packet Encapsulations:* Eth-IPv4-UDP for IPv4 routing.
+| ... | *[Cfg] DUT configuration:* DUT1 and DUT2 are configured with IPv4\
+| ... | routing and one static IPv4 /24 route entries. Required ACL rules are\
+| ... | applied to input paths of both DUT1 intefaces. DUT1 and DUT2 are tested\
+| ... | with 2p10GE NIC X520 Niantic by Intel.\
| ... | *[Ver] TG verification:* TG finds and reports throughput NDR (Non Drop
| ... | Rate) with zero packet loss tolerance or throughput PDR (Partial Drop
| ... | Rate) with non-zero packet loss tolerance (LT) expressed in percentage
| ... | of packets transmitted. NDR and PDR are discovered for different
| ... | Ethernet L2 frame sizes using MLRsearch library.
| ... | Test packets are generated by TG on links to DUTs. TG traffic profile
-| ... | contains two L3 flow-groups (flow-group per direction, 253 flows per
-| ... | flow-group) with all packets containing Ethernet header, IPv4 header
-| ... | with IP protocol=61 and static payload. MAC addresses are matching MAC
-| ... | addresses of the TG node interfaces.
+| ... | contains two L3 flow-groups (flow-group per direction, ${flows_per_dir}
+| ... | flows per flow-group) with all packets containing Ethernet header, IPv4
+| ... | header with IP protocol=61 and static payload. MAC addresses are
+| ... | matching MAC addresses of the TG node interfaces.
| ... | *[Ref] Applicable standard specifications:* RFC2544.
*** Variables ***
diff --git a/tests/vpp/perf/ip4/10ge2p1x520-ethip4udp-ip4base-iacl50sf-100flows-mrr.robot b/tests/vpp/perf/ip4/10ge2p1x520-ethip4udp-ip4base-iacl50sf-100flows-mrr.robot
index 647d3454d1..d59700961c 100644
--- a/tests/vpp/perf/ip4/10ge2p1x520-ethip4udp-ip4base-iacl50sf-100flows-mrr.robot
+++ b/tests/vpp/perf/ip4/10ge2p1x520-ethip4udp-ip4base-iacl50sf-100flows-mrr.robot
@@ -34,19 +34,18 @@
| ...
| ... | *[Top] Network Topologies:* TG-DUT1-DUT2-TG 3-node circular topology\
| ... | with single links between nodes.
-| ... | *[Enc] Packet Encapsulations:* Eth-IPv4-UDP for L2 switching of IPv4.
-| ... | *[Cfg] DUT configuration:* DUT1 is configured with L2 bridge domain\
-| ... | and MAC learning enabled. DUT2 is configured with L2 cross-connects.\
-| ... | Required ACL rules are applied to input paths of both DUT1 intefaces.\
-| ... | DUT1 and DUT2 are tested with 2p10GE NIC X520 Niantic by Intel.\
+| ... | *[Enc] Packet Encapsulations:* Eth-IPv4-UDP for IPv4 routing.
+| ... | *[Cfg] DUT configuration:* DUT1 and DUT2 are configured with IPv4\
+| ... | routing and one static IPv4 /24 route entries. Required ACL rules are\
+| ... | applied to input paths of both DUT1 intefaces. DUT1 and DUT2 are tested\
+| ... | with 2p10GE NIC X520 Niantic by Intel.\
| ... | *[Ver] TG verification:* In MaxReceivedRate test TG sends traffic
| ... | at line rate and reports total received/sent packets over trial period.
-| ... | Test packets are generated by TG on\
-| ... | links to DUTs. TG traffic profile contains two L3 flow-groups\
-| ... | (flow-group per direction, ${flows_per_dir} flows per flow-group) with\
-| ... | all packets containing Ethernet header, IPv4 header with UDP header and\
-| ... | static payload. MAC addresses are matching MAC addresses of the TG node\
-| ... | interfaces.
+| ... | Test packets are generated by TG on links to DUTs. TG traffic profile
+| ... | contains two L3 flow-groups (flow-group per direction, ${flows_per_dir}
+| ... | flows per flow-group) with all packets containing Ethernet header, IPv4
+| ... | header with IP protocol=61 and static payload. MAC addresses are
+| ... | matching MAC addresses of the TG node interfaces.
| ... | *[Ref] Applicable standard specifications:* RFC2544.
*** Variables ***
diff --git a/tests/vpp/perf/ip4/10ge2p1x520-ethip4udp-ip4base-iacl50sf-100flows-ndrpdr.robot b/tests/vpp/perf/ip4/10ge2p1x520-ethip4udp-ip4base-iacl50sf-100flows-ndrpdr.robot
index 221d4f79cf..a59fb3f664 100644
--- a/tests/vpp/perf/ip4/10ge2p1x520-ethip4udp-ip4base-iacl50sf-100flows-ndrpdr.robot
+++ b/tests/vpp/perf/ip4/10ge2p1x520-ethip4udp-ip4base-iacl50sf-100flows-ndrpdr.robot
@@ -35,22 +35,21 @@
| ...
| ... | *[Top] Network Topologies:* TG-DUT1-DUT2-TG 3-node circular topology\
| ... | with single links between nodes.
-| ... | *[Enc] Packet Encapsulations:* Eth-IPv4-UDP for L2 switching of IPv4.
-| ... | *[Cfg] DUT configuration:* DUT1 is configured with L2 bridge domain\
-| ... | and MAC learning enabled. DUT2 is configured with L2 cross-connects.\
-| ... | Required ACL rules are applied to input paths of both DUT1 intefaces.\
-| ... | DUT1 and DUT2 are tested with 2p10GE NIC X520 Niantic by Intel.\
-| ... | *[Ver] TG verification:* TG finds and reports throughput NDR (Non Drop\
-| ... | Rate) with zero packet loss tolerance or throughput PDR (Partial Drop\
-| ... | Rate) with non-zero packet loss tolerance (LT) expressed in percentage\
-| ... | of packets transmitted. NDR and PDR are discovered for different\
+| ... | *[Enc] Packet Encapsulations:* Eth-IPv4-UDP for IPv4 routing.
+| ... | *[Cfg] DUT configuration:* DUT1 and DUT2 are configured with IPv4\
+| ... | routing and one static IPv4 /24 route entries. Required ACL rules are\
+| ... | applied to input paths of both DUT1 intefaces. DUT1 and DUT2 are tested\
+| ... | with 2p10GE NIC X520 Niantic by Intel.\
+| ... | *[Ver] TG verification:* TG finds and reports throughput NDR (Non Drop
+| ... | Rate) with zero packet loss tolerance or throughput PDR (Partial Drop
+| ... | Rate) with non-zero packet loss tolerance (LT) expressed in percentage
+| ... | of packets transmitted. NDR and PDR are discovered for different
| ... | Ethernet L2 frame sizes using MLRsearch library.
-| ... | Test packets are generated by TG on\
-| ... | links to DUTs. TG traffic profile contains two L3 flow-groups\
-| ... | (flow-group per direction, ${flows_per_dir} flows per flow-group) with\
-| ... | all packets containing Ethernet header, IPv4 header with UDP header and\
-| ... | static payload. MAC addresses are matching MAC addresses of the TG node\
-| ... | interfaces.
+| ... | Test packets are generated by TG on links to DUTs. TG traffic profile
+| ... | contains two L3 flow-groups (flow-group per direction, ${flows_per_dir}
+| ... | flows per flow-group) with all packets containing Ethernet header, IPv4
+| ... | header with IP protocol=61 and static payload. MAC addresses are
+| ... | matching MAC addresses of the TG node interfaces.
| ... | *[Ref] Applicable standard specifications:* RFC2544.
*** Variables ***
diff --git a/tests/vpp/perf/ip4/10ge2p1x520-ethip4udp-ip4base-iacl50sf-100kflows-mrr.robot b/tests/vpp/perf/ip4/10ge2p1x520-ethip4udp-ip4base-iacl50sf-100kflows-mrr.robot
index 16b158d052..2eae3d3a48 100644
--- a/tests/vpp/perf/ip4/10ge2p1x520-ethip4udp-ip4base-iacl50sf-100kflows-mrr.robot
+++ b/tests/vpp/perf/ip4/10ge2p1x520-ethip4udp-ip4base-iacl50sf-100kflows-mrr.robot
@@ -34,19 +34,18 @@
| ...
| ... | *[Top] Network Topologies:* TG-DUT1-DUT2-TG 3-node circular topology\
| ... | with single links between nodes.
-| ... | *[Enc] Packet Encapsulations:* Eth-IPv4-UDP for L2 switching of IPv4.
-| ... | *[Cfg] DUT configuration:* DUT1 is configured with L2 bridge domain\
-| ... | and MAC learning enabled. DUT2 is configured with L2 cross-connects.\
-| ... | Required ACL rules are applied to input paths of both DUT1 intefaces.\
-| ... | DUT1 and DUT2 are tested with 2p10GE NIC X520 Niantic by Intel.\
+| ... | *[Enc] Packet Encapsulations:* Eth-IPv4-UDP for IPv4 routing.
+| ... | *[Cfg] DUT configuration:* DUT1 and DUT2 are configured with IPv4\
+| ... | routing and one static IPv4 /24 route entries. Required ACL rules are\
+| ... | applied to input paths of both DUT1 intefaces. DUT1 and DUT2 are tested\
+| ... | with 2p10GE NIC X520 Niantic by Intel.\
| ... | *[Ver] TG verification:* In MaxReceivedRate test TG sends traffic
| ... | at line rate and reports total received/sent packets over trial period.
-| ... | Test packets are generated by TG on\
-| ... | links to DUTs. TG traffic profile contains two L3 flow-groups\
-| ... | (flow-group per direction, ${flows_per_dir} flows per flow-group) with\
-| ... | all packets containing Ethernet header, IPv4 header with UDP header and\
-| ... | static payload. MAC addresses are matching MAC addresses of the TG node\
-| ... | interfaces.
+| ... | Test packets are generated by TG on links to DUTs. TG traffic profile
+| ... | contains two L3 flow-groups (flow-group per direction, ${flows_per_dir}
+| ... | flows per flow-group) with all packets containing Ethernet header, IPv4
+| ... | header with IP protocol=61 and static payload. MAC addresses are
+| ... | matching MAC addresses of the TG node interfaces.
| ... | *[Ref] Applicable standard specifications:* RFC2544.
*** Variables ***
diff --git a/tests/vpp/perf/ip4/10ge2p1x520-ethip4udp-ip4base-iacl50sf-100kflows-ndrpdr.robot b/tests/vpp/perf/ip4/10ge2p1x520-ethip4udp-ip4base-iacl50sf-100kflows-ndrpdr.robot
index c7ea5c4c39..b9b9c3ede9 100644
--- a/tests/vpp/perf/ip4/10ge2p1x520-ethip4udp-ip4base-iacl50sf-100kflows-ndrpdr.robot
+++ b/tests/vpp/perf/ip4/10ge2p1x520-ethip4udp-ip4base-iacl50sf-100kflows-ndrpdr.robot
@@ -35,22 +35,21 @@
| ...
| ... | *[Top] Network Topologies:* TG-DUT1-DUT2-TG 3-node circular topology\
| ... | with single links between nodes.
-| ... | *[Enc] Packet Encapsulations:* Eth-IPv4-UDP for L2 switching of IPv4.
-| ... | *[Cfg] DUT configuration:* DUT1 is configured with L2 bridge domain\
-| ... | and MAC learning enabled. DUT2 is configured with L2 cross-connects.\
-| ... | Required ACL rules are applied to input paths of both DUT1 intefaces.\
-| ... | DUT1 and DUT2 are tested with 2p10GE NIC X520 Niantic by Intel.\
-| ... | *[Ver] TG verification:* TG finds and reports throughput NDR (Non Drop\
-| ... | Rate) with zero packet loss tolerance or throughput PDR (Partial Drop\
-| ... | Rate) with non-zero packet loss tolerance (LT) expressed in percentage\
-| ... | of packets transmitted. NDR and PDR are discovered for different\
+| ... | *[Enc] Packet Encapsulations:* Eth-IPv4-UDP for IPv4 routing.
+| ... | *[Cfg] DUT configuration:* DUT1 and DUT2 are configured with IPv4\
+| ... | routing and one static IPv4 /24 route entries. Required ACL rules are\
+| ... | applied to input paths of both DUT1 intefaces. DUT1 and DUT2 are tested\
+| ... | with 2p10GE NIC X520 Niantic by Intel.\
+| ... | *[Ver] TG verification:* TG finds and reports throughput NDR (Non Drop
+| ... | Rate) with zero packet loss tolerance or throughput PDR (Partial Drop
+| ... | Rate) with non-zero packet loss tolerance (LT) expressed in percentage
+| ... | of packets transmitted. NDR and PDR are discovered for different
| ... | Ethernet L2 frame sizes using MLRsearch library.
-| ... | Test packets are generated by TG on\
-| ... | links to DUTs. TG traffic profile contains two L3 flow-groups\
-| ... | (flow-group per direction, ${flows_per_dir} flows per flow-group) with\
-| ... | all packets containing Ethernet header, IPv4 header with UDP header and\
-| ... | static payload. MAC addresses are matching MAC addresses of the TG node\
-| ... | interfaces.
+| ... | Test packets are generated by TG on links to DUTs. TG traffic profile
+| ... | contains two L3 flow-groups (flow-group per direction, ${flows_per_dir}
+| ... | flows per flow-group) with all packets containing Ethernet header, IPv4
+| ... | header with IP protocol=61 and static payload. MAC addresses are
+| ... | matching MAC addresses of the TG node interfaces.
| ... | *[Ref] Applicable standard specifications:* RFC2544.
*** Variables ***
diff --git a/tests/vpp/perf/ip4/10ge2p1x520-ethip4udp-ip4base-iacl50sf-10kflows-mrr.robot b/tests/vpp/perf/ip4/10ge2p1x520-ethip4udp-ip4base-iacl50sf-10kflows-mrr.robot
index bc070f0902..fccc8a0559 100644
--- a/tests/vpp/perf/ip4/10ge2p1x520-ethip4udp-ip4base-iacl50sf-10kflows-mrr.robot
+++ b/tests/vpp/perf/ip4/10ge2p1x520-ethip4udp-ip4base-iacl50sf-10kflows-mrr.robot
@@ -34,18 +34,18 @@
| ...
| ... | *[Top] Network Topologies:* TG-DUT1-DUT2-TG 3-node circular topology\
| ... | with single links between nodes.
-| ... | *[Enc] Packet Encapsulations:* Eth-IPv4-UDP for L2 switching of IPv4.
-| ... | *[Cfg] DUT configuration:* DUT1 is configured with L2 bridge domain\
-| ... | and MAC learning enabled. DUT2 is configured with L2 cross-connects.\
-| ... | Required ACL rules are applied to input paths of both DUT1 intefaces.\
-| ... | DUT1 and DUT2 are tested with 2p10GE NIC X520 Niantic by Intel.\
+| ... | *[Enc] Packet Encapsulations:* Eth-IPv4-UDP for IPv4 routing.
+| ... | *[Cfg] DUT configuration:* DUT1 and DUT2 are configured with IPv4\
+| ... | routing and one static IPv4 /24 route entries. Required ACL rules are\
+| ... | applied to input paths of both DUT1 intefaces. DUT1 and DUT2 are tested\
+| ... | with 2p10GE NIC X520 Niantic by Intel.\
| ... | *[Ver] TG verification:* In MaxReceivedRate test TG sends traffic
| ... | at line rate and reports total received/sent packets over trial period.
| ... | Test packets are generated by TG on links to DUTs. TG traffic profile
-| ... | contains two L3 flow-groups (flow-group per direction, 253 flows per
-| ... | flow-group) with all packets containing Ethernet header, IPv4 header
-| ... | with IP protocol=61 and static payload. MAC addresses are matching MAC
-| ... | addresses of the TG node interfaces.
+| ... | contains two L3 flow-groups (flow-group per direction, ${flows_per_dir}
+| ... | flows per flow-group) with all packets containing Ethernet header, IPv4
+| ... | header with IP protocol=61 and static payload. MAC addresses are
+| ... | matching MAC addresses of the TG node interfaces.
| ... | *[Ref] Applicable standard specifications:* RFC2544.
*** Variables ***
diff --git a/tests/vpp/perf/ip4/10ge2p1x520-ethip4udp-ip4base-iacl50sf-10kflows-ndrpdr.robot b/tests/vpp/perf/ip4/10ge2p1x520-ethip4udp-ip4base-iacl50sf-10kflows-ndrpdr.robot
index 977bbfa591..8e0aae5fae 100644
--- a/tests/vpp/perf/ip4/10ge2p1x520-ethip4udp-ip4base-iacl50sf-10kflows-ndrpdr.robot
+++ b/tests/vpp/perf/ip4/10ge2p1x520-ethip4udp-ip4base-iacl50sf-10kflows-ndrpdr.robot
@@ -35,21 +35,21 @@
| ...
| ... | *[Top] Network Topologies:* TG-DUT1-DUT2-TG 3-node circular topology\
| ... | with single links between nodes.
-| ... | *[Enc] Packet Encapsulations:* Eth-IPv4-UDP for L2 switching of IPv4.
-| ... | *[Cfg] DUT configuration:* DUT1 is configured with L2 bridge domain\
-| ... | and MAC learning enabled. DUT2 is configured with L2 cross-connects.\
-| ... | Required ACL rules are applied to input paths of both DUT1 intefaces.\
-| ... | DUT1 and DUT2 are tested with 2p10GE NIC X520 Niantic by Intel.\
+| ... | *[Enc] Packet Encapsulations:* Eth-IPv4-UDP for IPv4 routing.
+| ... | *[Cfg] DUT configuration:* DUT1 and DUT2 are configured with IPv4\
+| ... | routing and one static IPv4 /24 route entries. Required ACL rules are\
+| ... | applied to input paths of both DUT1 intefaces. DUT1 and DUT2 are tested\
+| ... | with 2p10GE NIC X520 Niantic by Intel.\
| ... | *[Ver] TG verification:* TG finds and reports throughput NDR (Non Drop
| ... | Rate) with zero packet loss tolerance or throughput PDR (Partial Drop
| ... | Rate) with non-zero packet loss tolerance (LT) expressed in percentage
| ... | of packets transmitted. NDR and PDR are discovered for different
| ... | Ethernet L2 frame sizes using MLRsearch library.
| ... | Test packets are generated by TG on links to DUTs. TG traffic profile
-| ... | contains two L3 flow-groups (flow-group per direction, 253 flows per
-| ... | flow-group) with all packets containing Ethernet header, IPv4 header
-| ... | with IP protocol=61 and static payload. MAC addresses are matching MAC
-| ... | addresses of the TG node interfaces.
+| ... | contains two L3 flow-groups (flow-group per direction, ${flows_per_dir}
+| ... | flows per flow-group) with all packets containing Ethernet header, IPv4
+| ... | header with IP protocol=61 and static payload. MAC addresses are
+| ... | matching MAC addresses of the TG node interfaces.
| ... | *[Ref] Applicable standard specifications:* RFC2544.
*** Variables ***
diff --git a/tests/vpp/perf/ip4/10ge2p1x520-ethip4udp-ip4base-iacl50sl-100flows-mrr.robot b/tests/vpp/perf/ip4/10ge2p1x520-ethip4udp-ip4base-iacl50sl-100flows-mrr.robot
index 28177ead2a..6d27f15703 100644
--- a/tests/vpp/perf/ip4/10ge2p1x520-ethip4udp-ip4base-iacl50sl-100flows-mrr.robot
+++ b/tests/vpp/perf/ip4/10ge2p1x520-ethip4udp-ip4base-iacl50sl-100flows-mrr.robot
@@ -34,19 +34,18 @@
| ...
| ... | *[Top] Network Topologies:* TG-DUT1-DUT2-TG 3-node circular topology\
| ... | with single links between nodes.
-| ... | *[Enc] Packet Encapsulations:* Eth-IPv4-UDP for L2 switching of IPv4.
-| ... | *[Cfg] DUT configuration:* DUT1 is configured with L2 bridge domain\
-| ... | and MAC learning enabled. DUT2 is configured with L2 cross-connects.\
-| ... | Required ACL rules are applied to input paths of both DUT1 intefaces.\
-| ... | DUT1 and DUT2 are tested with 2p10GE NIC X520 Niantic by Intel.\
+| ... | *[Enc] Packet Encapsulations:* Eth-IPv4-UDP for IPv4 routing.
+| ... | *[Cfg] DUT configuration:* DUT1 and DUT2 are configured with IPv4\
+| ... | routing and one static IPv4 /24 route entries. Required ACL rules are\
+| ... | applied to input paths of both DUT1 intefaces. DUT1 and DUT2 are tested\
+| ... | with 2p10GE NIC X520 Niantic by Intel.\
| ... | *[Ver] TG verification:* In MaxReceivedRate test TG sends traffic
| ... | at line rate and reports total received/sent packets over trial period.
-| ... | Test packets are generated by TG on\
-| ... | links to DUTs. TG traffic profile contains two L3 flow-groups\
-| ... | (flow-group per direction, ${flows_per_dir} flows per flow-group) with\
-| ... | all packets containing Ethernet header, IPv4 header with UDP header and\
-| ... | static payload. MAC addresses are matching MAC addresses of the TG node\
-| ... | interfaces.
+| ... | Test packets are generated by TG on links to DUTs. TG traffic profile
+| ... | contains two L3 flow-groups (flow-group per direction, ${flows_per_dir}
+| ... | flows per flow-group) with all packets containing Ethernet header, IPv4
+| ... | header with IP protocol=61 and static payload. MAC addresses are
+| ... | matching MAC addresses of the TG node interfaces.
| ... | *[Ref] Applicable standard specifications:* RFC2544.
*** Variables ***
diff --git a/tests/vpp/perf/ip4/10ge2p1x520-ethip4udp-ip4base-iacl50sl-100flows-ndrpdr.robot b/tests/vpp/perf/ip4/10ge2p1x520-ethip4udp-ip4base-iacl50sl-100flows-ndrpdr.robot
index 708ebec8db..a0eb799500 100644
--- a/tests/vpp/perf/ip4/10ge2p1x520-ethip4udp-ip4base-iacl50sl-100flows-ndrpdr.robot
+++ b/tests/vpp/perf/ip4/10ge2p1x520-ethip4udp-ip4base-iacl50sl-100flows-ndrpdr.robot
@@ -35,22 +35,21 @@
| ...
| ... | *[Top] Network Topologies:* TG-DUT1-DUT2-TG 3-node circular topology\
| ... | with single links between nodes.
-| ... | *[Enc] Packet Encapsulations:* Eth-IPv4-UDP for L2 switching of IPv4.
-| ... | *[Cfg] DUT configuration:* DUT1 is configured with L2 bridge domain\
-| ... | and MAC learning enabled. DUT2 is configured with L2 cross-connects.\
-| ... | Required ACL rules are applied to input paths of both DUT1 intefaces.\
-| ... | DUT1 and DUT2 are tested with 2p10GE NIC X520 Niantic by Intel.\
-| ... | *[Ver] TG verification:* TG finds and reports throughput NDR (Non Drop\
-| ... | Rate) with zero packet loss tolerance or throughput PDR (Partial Drop\
-| ... | Rate) with non-zero packet loss tolerance (LT) expressed in percentage\
-| ... | of packets transmitted. NDR and PDR are discovered for different\
+| ... | *[Enc] Packet Encapsulations:* Eth-IPv4-UDP for IPv4 routing.
+| ... | *[Cfg] DUT configuration:* DUT1 and DUT2 are configured with IPv4\
+| ... | routing and one static IPv4 /24 route entries. Required ACL rules are\
+| ... | applied to input paths of both DUT1 intefaces. DUT1 and DUT2 are tested\
+| ... | with 2p10GE NIC X520 Niantic by Intel.\
+| ... | *[Ver] TG verification:* TG finds and reports throughput NDR (Non Drop
+| ... | Rate) with zero packet loss tolerance or throughput PDR (Partial Drop
+| ... | Rate) with non-zero packet loss tolerance (LT) expressed in percentage
+| ... | of packets transmitted. NDR and PDR are discovered for different
| ... | Ethernet L2 frame sizes using MLRsearch library.
-| ... | Test packets are generated by TG on\
-| ... | links to DUTs. TG traffic profile contains two L3 flow-groups\
-| ... | (flow-group per direction, ${flows_per_dir} flows per flow-group) with\
-| ... | all packets containing Ethernet header, IPv4 header with UDP header and\
-| ... | static payload. MAC addresses are matching MAC addresses of the TG node\
-| ... | interfaces.
+| ... | Test packets are generated by TG on links to DUTs. TG traffic profile
+| ... | contains two L3 flow-groups (flow-group per direction, ${flows_per_dir}
+| ... | flows per flow-group) with all packets containing Ethernet header, IPv4
+| ... | header with IP protocol=61 and static payload. MAC addresses are
+| ... | matching MAC addresses of the TG node interfaces.
| ... | *[Ref] Applicable standard specifications:* RFC2544.
*** Variables ***
diff --git a/tests/vpp/perf/ip4/10ge2p1x520-ethip4udp-ip4base-iacl50sl-100kflows-mrr.robot b/tests/vpp/perf/ip4/10ge2p1x520-ethip4udp-ip4base-iacl50sl-100kflows-mrr.robot
index 197cabfa9f..90668f772f 100644
--- a/tests/vpp/perf/ip4/10ge2p1x520-ethip4udp-ip4base-iacl50sl-100kflows-mrr.robot
+++ b/tests/vpp/perf/ip4/10ge2p1x520-ethip4udp-ip4base-iacl50sl-100kflows-mrr.robot
@@ -34,19 +34,18 @@
| ...
| ... | *[Top] Network Topologies:* TG-DUT1-DUT2-TG 3-node circular topology\
| ... | with single links between nodes.
-| ... | *[Enc] Packet Encapsulations:* Eth-IPv4-UDP for L2 switching of IPv4.
-| ... | *[Cfg] DUT configuration:* DUT1 is configured with L2 bridge domain\
-| ... | and MAC learning enabled. DUT2 is configured with L2 cross-connects.\
-| ... | Required ACL rules are applied to input paths of both DUT1 intefaces.\
-| ... | DUT1 and DUT2 are tested with 2p10GE NIC X520 Niantic by Intel.\
+| ... | *[Enc] Packet Encapsulations:* Eth-IPv4-UDP for IPv4 routing.
+| ... | *[Cfg] DUT configuration:* DUT1 and DUT2 are configured with IPv4\
+| ... | routing and one static IPv4 /24 route entries. Required ACL rules are\
+| ... | applied to input paths of both DUT1 intefaces. DUT1 and DUT2 are tested\
+| ... | with 2p10GE NIC X520 Niantic by Intel.\
| ... | *[Ver] TG verification:* In MaxReceivedRate test TG sends traffic
| ... | at line rate and reports total received/sent packets over trial period.
-| ... | Test packets are generated by TG on\
-| ... | links to DUTs. TG traffic profile contains two L3 flow-groups\
-| ... | (flow-group per direction, ${flows_per_dir} flows per flow-group) with\
-| ... | all packets containing Ethernet header, IPv4 header with UDP header and\
-| ... | static payload. MAC addresses are matching MAC addresses of the TG node\
-| ... | interfaces.
+| ... | Test packets are generated by TG on links to DUTs. TG traffic profile
+| ... | contains two L3 flow-groups (flow-group per direction, ${flows_per_dir}
+| ... | flows per flow-group) with all packets containing Ethernet header, IPv4
+| ... | header with IP protocol=61 and static payload. MAC addresses are
+| ... | matching MAC addresses of the TG node interfaces.
| ... | *[Ref] Applicable standard specifications:* RFC2544.
*** Variables ***
diff --git a/tests/vpp/perf/ip4/10ge2p1x520-ethip4udp-ip4base-iacl50sl-100kflows-ndrpdr.robot b/tests/vpp/perf/ip4/10ge2p1x520-ethip4udp-ip4base-iacl50sl-100kflows-ndrpdr.robot
index 715384d6e7..f87eefd0f6 100644
--- a/tests/vpp/perf/ip4/10ge2p1x520-ethip4udp-ip4base-iacl50sl-100kflows-ndrpdr.robot
+++ b/tests/vpp/perf/ip4/10ge2p1x520-ethip4udp-ip4base-iacl50sl-100kflows-ndrpdr.robot
@@ -35,22 +35,21 @@
| ...
| ... | *[Top] Network Topologies:* TG-DUT1-DUT2-TG 3-node circular topology\
| ... | with single links between nodes.
-| ... | *[Enc] Packet Encapsulations:* Eth-IPv4-UDP for L2 switching of IPv4.
-| ... | *[Cfg] DUT configuration:* DUT1 is configured with L2 bridge domain\
-| ... | and MAC learning enabled. DUT2 is configured with L2 cross-connects.\
-| ... | Required ACL rules are applied to input paths of both DUT1 intefaces.\
-| ... | DUT1 and DUT2 are tested with 2p10GE NIC X520 Niantic by Intel.\
-| ... | *[Ver] TG verification:* TG finds and reports throughput NDR (Non Drop\
-| ... | Rate) with zero packet loss tolerance or throughput PDR (Partial Drop\
-| ... | Rate) with non-zero packet loss tolerance (LT) expressed in percentage\
-| ... | of packets transmitted. NDR and PDR are discovered for different\
+| ... | *[Enc] Packet Encapsulations:* Eth-IPv4-UDP for IPv4 routing.
+| ... | *[Cfg] DUT configuration:* DUT1 and DUT2 are configured with IPv4\
+| ... | routing and one static IPv4 /24 route entries. Required ACL rules are\
+| ... | applied to input paths of both DUT1 intefaces. DUT1 and DUT2 are tested\
+| ... | with 2p10GE NIC X520 Niantic by Intel.\
+| ... | *[Ver] TG verification:* TG finds and reports throughput NDR (Non Drop
+| ... | Rate) with zero packet loss tolerance or throughput PDR (Partial Drop
+| ... | Rate) with non-zero packet loss tolerance (LT) expressed in percentage
+| ... | of packets transmitted. NDR and PDR are discovered for different
| ... | Ethernet L2 frame sizes using MLRsearch library.
-| ... | Test packets are generated by TG on\
-| ... | links to DUTs. TG traffic profile contains two L3 flow-groups\
-| ... | (flow-group per direction, ${flows_per_dir} flows per flow-group) with\
-| ... | all packets containing Ethernet header, IPv4 header with UDP header and\
-| ... | static payload. MAC addresses are matching MAC addresses of the TG node\
-| ... | interfaces.
+| ... | Test packets are generated by TG on links to DUTs. TG traffic profile
+| ... | contains two L3 flow-groups (flow-group per direction, ${flows_per_dir}
+| ... | flows per flow-group) with all packets containing Ethernet header, IPv4
+| ... | header with IP protocol=61 and static payload. MAC addresses are
+| ... | matching MAC addresses of the TG node interfaces.
| ... | *[Ref] Applicable standard specifications:* RFC2544.
*** Variables ***
diff --git a/tests/vpp/perf/ip4/10ge2p1x520-ethip4udp-ip4base-iacl50sl-10kflows-mrr.robot b/tests/vpp/perf/ip4/10ge2p1x520-ethip4udp-ip4base-iacl50sl-10kflows-mrr.robot
index bf8d1bd49b..916a5dbe2b 100644
--- a/tests/vpp/perf/ip4/10ge2p1x520-ethip4udp-ip4base-iacl50sl-10kflows-mrr.robot
+++ b/tests/vpp/perf/ip4/10ge2p1x520-ethip4udp-ip4base-iacl50sl-10kflows-mrr.robot
@@ -34,18 +34,18 @@
| ...
| ... | *[Top] Network Topologies:* TG-DUT1-DUT2-TG 3-node circular topology\
| ... | with single links between nodes.
-| ... | *[Enc] Packet Encapsulations:* Eth-IPv4-UDP for L2 switching of IPv4.
-| ... | *[Cfg] DUT configuration:* DUT1 is configured with L2 bridge domain\
-| ... | and MAC learning enabled. DUT2 is configured with L2 cross-connects.\
-| ... | Required ACL rules are applied to input paths of both DUT1 intefaces.\
-| ... | DUT1 and DUT2 are tested with 2p10GE NIC X520 Niantic by Intel.\
+| ... | *[Enc] Packet Encapsulations:* Eth-IPv4-UDP for IPv4 routing.
+| ... | *[Cfg] DUT configuration:* DUT1 and DUT2 are configured with IPv4\
+| ... | routing and one static IPv4 /24 route entries. Required ACL rules are\
+| ... | applied to input paths of both DUT1 intefaces. DUT1 and DUT2 are tested\
+| ... | with 2p10GE NIC X520 Niantic by Intel.\
| ... | *[Ver] TG verification:* In MaxReceivedRate test TG sends traffic
| ... | at line rate and reports total received/sent packets over trial period.
| ... | Test packets are generated by TG on links to DUTs. TG traffic profile
-| ... | contains two L3 flow-groups (flow-group per direction, 253 flows per
-| ... | flow-group) with all packets containing Ethernet header, IPv4 header
-| ... | with IP protocol=61 and static payload. MAC addresses are matching MAC
-| ... | addresses of the TG node interfaces.
+| ... | contains two L3 flow-groups (flow-group per direction, ${flows_per_dir}
+| ... | flows per flow-group) with all packets containing Ethernet header, IPv4
+| ... | header with IP protocol=61 and static payload. MAC addresses are
+| ... | matching MAC addresses of the TG node interfaces.
| ... | *[Ref] Applicable standard specifications:* RFC2544.
*** Variables ***
diff --git a/tests/vpp/perf/ip4/10ge2p1x520-ethip4udp-ip4base-iacl50sl-10kflows-ndrpdr.robot b/tests/vpp/perf/ip4/10ge2p1x520-ethip4udp-ip4base-iacl50sl-10kflows-ndrpdr.robot
index ae10e2c74d..9aa3d3b83e 100644
--- a/tests/vpp/perf/ip4/10ge2p1x520-ethip4udp-ip4base-iacl50sl-10kflows-ndrpdr.robot
+++ b/tests/vpp/perf/ip4/10ge2p1x520-ethip4udp-ip4base-iacl50sl-10kflows-ndrpdr.robot
@@ -35,21 +35,21 @@
| ...
| ... | *[Top] Network Topologies:* TG-DUT1-DUT2-TG 3-node circular topology\
| ... | with single links between nodes.
-| ... | *[Enc] Packet Encapsulations:* Eth-IPv4-UDP for L2 switching of IPv4.
-| ... | *[Cfg] DUT configuration:* DUT1 is configured with L2 bridge domain\
-| ... | and MAC learning enabled. DUT2 is configured with L2 cross-connects.\
-| ... | Required ACL rules are applied to input paths of both DUT1 intefaces.\
-| ... | DUT1 and DUT2 are tested with 2p10GE NIC X520 Niantic by Intel.\
+| ... | *[Enc] Packet Encapsulations:* Eth-IPv4-UDP for IPv4 routing.
+| ... | *[Cfg] DUT configuration:* DUT1 and DUT2 are configured with IPv4\
+| ... | routing and one static IPv4 /24 route entries. Required ACL rules are\
+| ... | applied to input paths of both DUT1 intefaces. DUT1 and DUT2 are tested\
+| ... | with 2p10GE NIC X520 Niantic by Intel.\
| ... | *[Ver] TG verification:* TG finds and reports throughput NDR (Non Drop
| ... | Rate) with zero packet loss tolerance or throughput PDR (Partial Drop
| ... | Rate) with non-zero packet loss tolerance (LT) expressed in percentage
| ... | of packets transmitted. NDR and PDR are discovered for different
| ... | Ethernet L2 frame sizes using MLRsearch library.
| ... | Test packets are generated by TG on links to DUTs. TG traffic profile
-| ... | contains two L3 flow-groups (flow-group per direction, 253 flows per
-| ... | flow-group) with all packets containing Ethernet header, IPv4 header
-| ... | with IP protocol=61 and static payload. MAC addresses are matching MAC
-| ... | addresses of the TG node interfaces.
+| ... | contains two L3 flow-groups (flow-group per direction, ${flows_per_dir}
+| ... | flows per flow-group) with all packets containing Ethernet header, IPv4
+| ... | header with IP protocol=61 and static payload. MAC addresses are
+| ... | matching MAC addresses of the TG node interfaces.
| ... | *[Ref] Applicable standard specifications:* RFC2544.
*** Variables ***
diff --git a/tests/vpp/perf/ip4/10ge2p1x520-ethip4udp-ip4base-oacl10sf-100flows-mrr.robot b/tests/vpp/perf/ip4/10ge2p1x520-ethip4udp-ip4base-oacl10sf-100flows-mrr.robot
index 441c6bbc8e..ea56b9e48a 100644
--- a/tests/vpp/perf/ip4/10ge2p1x520-ethip4udp-ip4base-oacl10sf-100flows-mrr.robot
+++ b/tests/vpp/perf/ip4/10ge2p1x520-ethip4udp-ip4base-oacl10sf-100flows-mrr.robot
@@ -34,19 +34,18 @@
| ...
| ... | *[Top] Network Topologies:* TG-DUT1-DUT2-TG 3-node circular topology\
| ... | with single links between nodes.
-| ... | *[Enc] Packet Encapsulations:* Eth-IPv4-UDP for L2 switching of IPv4.
-| ... | *[Cfg] DUT configuration:* DUT1 is configured with L2 bridge domain\
-| ... | and MAC learning enabled. DUT2 is configured with L2 cross-connects.\
-| ... | Required ACL rules are applied to input paths of both DUT1 intefaces.\
-| ... | DUT1 and DUT2 are tested with 2p10GE NIC X520 Niantic by Intel.\
+| ... | *[Enc] Packet Encapsulations:* Eth-IPv4-UDP for IPv4 routing.
+| ... | *[Cfg] DUT configuration:* DUT1 and DUT2 are configured with IPv4\
+| ... | routing and one static IPv4 /24 route entries. Required ACL rules are\
+| ... | applied to output paths of both DUT1 intefaces. DUT1 and DUT2 are tested\
+| ... | with 2p10GE NIC X520 Niantic by Intel.\
| ... | *[Ver] TG verification:* In MaxReceivedRate test TG sends traffic
| ... | at line rate and reports total received/sent packets over trial period.
-| ... | Test packets are generated by TG on\
-| ... | links to DUTs. TG traffic profile contains two L3 flow-groups\
-| ... | (flow-group per direction, ${flows_per_dir} flows per flow-group) with\
-| ... | all packets containing Ethernet header, IPv4 header with UDP header and\
-| ... | static payload. MAC addresses are matching MAC addresses of the TG node\
-| ... | interfaces.
+| ... | Test packets are generated by TG on links to DUTs. TG traffic profile
+| ... | contains two L3 flow-groups (flow-group per direction, ${flows_per_dir}
+| ... | flows per flow-group) with all packets containing Ethernet header, IPv4
+| ... | header with IP protocol=61 and static payload. MAC addresses are
+| ... | matching MAC addresses of the TG node interfaces.
| ... | *[Ref] Applicable standard specifications:* RFC2544.
*** Variables ***
diff --git a/tests/vpp/perf/ip4/10ge2p1x520-ethip4udp-ip4base-oacl10sf-100flows-ndrpdr.robot b/tests/vpp/perf/ip4/10ge2p1x520-ethip4udp-ip4base-oacl10sf-100flows-ndrpdr.robot
index d7be49236b..14b029f3a5 100644
--- a/tests/vpp/perf/ip4/10ge2p1x520-ethip4udp-ip4base-oacl10sf-100flows-ndrpdr.robot
+++ b/tests/vpp/perf/ip4/10ge2p1x520-ethip4udp-ip4base-oacl10sf-100flows-ndrpdr.robot
@@ -35,22 +35,21 @@
| ...
| ... | *[Top] Network Topologies:* TG-DUT1-DUT2-TG 3-node circular topology\
| ... | with single links between nodes.
-| ... | *[Enc] Packet Encapsulations:* Eth-IPv4-UDP for L2 switching of IPv4.
-| ... | *[Cfg] DUT configuration:* DUT1 is configured with L2 bridge domain\
-| ... | and MAC learning enabled. DUT2 is configured with L2 cross-connects.\
-| ... | Required ACL rules are applied to input paths of both DUT1 intefaces.\
-| ... | DUT1 and DUT2 are tested with 2p10GE NIC X520 Niantic by Intel.\
-| ... | *[Ver] TG verification:* TG finds and reports throughput NDR (Non Drop\
-| ... | Rate) with zero packet loss tolerance or throughput PDR (Partial Drop\
-| ... | Rate) with non-zero packet loss tolerance (LT) expressed in percentage\
-| ... | of packets transmitted. NDR and PDR are discovered for different\
+| ... | *[Enc] Packet Encapsulations:* Eth-IPv4-UDP for IPv4 routing.
+| ... | *[Cfg] DUT configuration:* DUT1 and DUT2 are configured with IPv4\
+| ... | routing and one static IPv4 /24 route entries. Required ACL rules are\
+| ... | applied to output paths of both DUT1 intefaces. DUT1 and DUT2 are tested\
+| ... | with 2p10GE NIC X520 Niantic by Intel.\
+| ... | *[Ver] TG verification:* TG finds and reports throughput NDR (Non Drop
+| ... | Rate) with zero packet loss tolerance or throughput PDR (Partial Drop
+| ... | Rate) with non-zero packet loss tolerance (LT) expressed in percentage
+| ... | of packets transmitted. NDR and PDR are discovered for different
| ... | Ethernet L2 frame sizes using MLRsearch library.
-| ... | Test packets are generated by TG on\
-| ... | links to DUTs. TG traffic profile contains two L3 flow-groups\
-| ... | (flow-group per direction, ${flows_per_dir} flows per flow-group) with\
-| ... | all packets containing Ethernet header, IPv4 header with UDP header and\
-| ... | static payload. MAC addresses are matching MAC addresses of the TG node\
-| ... | interfaces.
+| ... | Test packets are generated by TG on links to DUTs. TG traffic profile
+| ... | contains two L3 flow-groups (flow-group per direction, ${flows_per_dir}
+| ... | flows per flow-group) with all packets containing Ethernet header, IPv4
+| ... | header with IP protocol=61 and static payload. MAC addresses are
+| ... | matching MAC addresses of the TG node interfaces.
| ... | *[Ref] Applicable standard specifications:* RFC2544.
*** Variables ***
diff --git a/tests/vpp/perf/ip4/10ge2p1x520-ethip4udp-ip4base-oacl10sf-100kflows-mrr.robot b/tests/vpp/perf/ip4/10ge2p1x520-ethip4udp-ip4base-oacl10sf-100kflows-mrr.robot
index b11f56748b..5f7c312748 100644
--- a/tests/vpp/perf/ip4/10ge2p1x520-ethip4udp-ip4base-oacl10sf-100kflows-mrr.robot
+++ b/tests/vpp/perf/ip4/10ge2p1x520-ethip4udp-ip4base-oacl10sf-100kflows-mrr.robot
@@ -34,19 +34,18 @@
| ...
| ... | *[Top] Network Topologies:* TG-DUT1-DUT2-TG 3-node circular topology\
| ... | with single links between nodes.
-| ... | *[Enc] Packet Encapsulations:* Eth-IPv4-UDP for L2 switching of IPv4.
-| ... | *[Cfg] DUT configuration:* DUT1 is configured with L2 bridge domain\
-| ... | and MAC learning enabled. DUT2 is configured with L2 cross-connects.\
-| ... | Required ACL rules are applied to input paths of both DUT1 intefaces.\
-| ... | DUT1 and DUT2 are tested with 2p10GE NIC X520 Niantic by Intel.\
+| ... | *[Enc] Packet Encapsulations:* Eth-IPv4-UDP for IPv4 routing.
+| ... | *[Cfg] DUT configuration:* DUT1 and DUT2 are configured with IPv4\
+| ... | routing and one static IPv4 /24 route entries. Required ACL rules are\
+| ... | applied to output paths of both DUT1 intefaces. DUT1 and DUT2 are tested\
+| ... | with 2p10GE NIC X520 Niantic by Intel.\
| ... | *[Ver] TG verification:* In MaxReceivedRate test TG sends traffic
| ... | at line rate and reports total received/sent packets over trial period.
-| ... | Test packets are generated by TG on\
-| ... | links to DUTs. TG traffic profile contains two L3 flow-groups\
-| ... | (flow-group per direction, ${flows_per_dir} flows per flow-group) with\
-| ... | all packets containing Ethernet header, IPv4 header with UDP header and\
-| ... | static payload. MAC addresses are matching MAC addresses of the TG node\
-| ... | interfaces.
+| ... | Test packets are generated by TG on links to DUTs. TG traffic profile
+| ... | contains two L3 flow-groups (flow-group per direction, ${flows_per_dir}
+| ... | flows per flow-group) with all packets containing Ethernet header, IPv4
+| ... | header with IP protocol=61 and static payload. MAC addresses are
+| ... | matching MAC addresses of the TG node interfaces.
| ... | *[Ref] Applicable standard specifications:* RFC2544.
*** Variables ***
diff --git a/tests/vpp/perf/ip4/10ge2p1x520-ethip4udp-ip4base-oacl10sf-100kflows-ndrpdr.robot b/tests/vpp/perf/ip4/10ge2p1x520-ethip4udp-ip4base-oacl10sf-100kflows-ndrpdr.robot
index 815585dba6..2b4fa1cc46 100644
--- a/tests/vpp/perf/ip4/10ge2p1x520-ethip4udp-ip4base-oacl10sf-100kflows-ndrpdr.robot
+++ b/tests/vpp/perf/ip4/10ge2p1x520-ethip4udp-ip4base-oacl10sf-100kflows-ndrpdr.robot
@@ -35,22 +35,21 @@
| ...
| ... | *[Top] Network Topologies:* TG-DUT1-DUT2-TG 3-node circular topology\
| ... | with single links between nodes.
-| ... | *[Enc] Packet Encapsulations:* Eth-IPv4-UDP for L2 switching of IPv4.
-| ... | *[Cfg] DUT configuration:* DUT1 is configured with L2 bridge domain\
-| ... | and MAC learning enabled. DUT2 is configured with L2 cross-connects.\
-| ... | Required ACL rules are applied to input paths of both DUT1 intefaces.\
-| ... | DUT1 and DUT2 are tested with 2p10GE NIC X520 Niantic by Intel.\
-| ... | *[Ver] TG verification:* TG finds and reports throughput NDR (Non Drop\
-| ... | Rate) with zero packet loss tolerance or throughput PDR (Partial Drop\
-| ... | Rate) with non-zero packet loss tolerance (LT) expressed in percentage\
-| ... | of packets transmitted. NDR and PDR are discovered for different\
+| ... | *[Enc] Packet Encapsulations:* Eth-IPv4-UDP for IPv4 routing.
+| ... | *[Cfg] DUT configuration:* DUT1 and DUT2 are configured with IPv4\
+| ... | routing and one static IPv4 /24 route entries. Required ACL rules are\
+| ... | applied to output paths of both DUT1 intefaces. DUT1 and DUT2 are tested\
+| ... | with 2p10GE NIC X520 Niantic by Intel.\
+| ... | *[Ver] TG verification:* TG finds and reports throughput NDR (Non Drop
+| ... | Rate) with zero packet loss tolerance or throughput PDR (Partial Drop
+| ... | Rate) with non-zero packet loss tolerance (LT) expressed in percentage
+| ... | of packets transmitted. NDR and PDR are discovered for different
| ... | Ethernet L2 frame sizes using MLRsearch library.
-| ... | Test packets are generated by TG on\
-| ... | links to DUTs. TG traffic profile contains two L3 flow-groups\
-| ... | (flow-group per direction, ${flows_per_dir} flows per flow-group) with\
-| ... | all packets containing Ethernet header, IPv4 header with UDP header and\
-| ... | static payload. MAC addresses are matching MAC addresses of the TG node\
-| ... | interfaces.
+| ... | Test packets are generated by TG on links to DUTs. TG traffic profile
+| ... | contains two L3 flow-groups (flow-group per direction, ${flows_per_dir}
+| ... | flows per flow-group) with all packets containing Ethernet header, IPv4
+| ... | header with IP protocol=61 and static payload. MAC addresses are
+| ... | matching MAC addresses of the TG node interfaces.
| ... | *[Ref] Applicable standard specifications:* RFC2544.
*** Variables ***
diff --git a/tests/vpp/perf/ip4/10ge2p1x520-ethip4udp-ip4base-oacl10sf-10kflows-mrr.robot b/tests/vpp/perf/ip4/10ge2p1x520-ethip4udp-ip4base-oacl10sf-10kflows-mrr.robot
index c654bef291..c2c237542d 100644
--- a/tests/vpp/perf/ip4/10ge2p1x520-ethip4udp-ip4base-oacl10sf-10kflows-mrr.robot
+++ b/tests/vpp/perf/ip4/10ge2p1x520-ethip4udp-ip4base-oacl10sf-10kflows-mrr.robot
@@ -34,19 +34,18 @@
| ...
| ... | *[Top] Network Topologies:* TG-DUT1-DUT2-TG 3-node circular topology\
| ... | with single links between nodes.
-| ... | *[Enc] Packet Encapsulations:* Eth-IPv4-UDP for L2 switching of IPv4.
-| ... | *[Cfg] DUT configuration:* DUT1 is configured with L2 bridge domain\
-| ... | and MAC learning enabled. DUT2 is configured with L2 cross-connects.\
-| ... | Required ACL rules are applied to input paths of both DUT1 intefaces.\
-| ... | DUT1 and DUT2 are tested with 2p10GE NIC X520 Niantic by Intel.\
+| ... | *[Enc] Packet Encapsulations:* Eth-IPv4-UDP for IPv4 routing.
+| ... | *[Cfg] DUT configuration:* DUT1 and DUT2 are configured with IPv4\
+| ... | routing and one static IPv4 /24 route entries. Required ACL rules are\
+| ... | applied to output paths of both DUT1 intefaces. DUT1 and DUT2 are tested\
+| ... | with 2p10GE NIC X520 Niantic by Intel.\
| ... | *[Ver] TG verification:* In MaxReceivedRate test TG sends traffic
| ... | at line rate and reports total received/sent packets over trial period.
-| ... | Test packets are generated by TG on\
-| ... | links to DUTs. TG traffic profile contains two L3 flow-groups\
-| ... | (flow-group per direction, ${flows_per_dir} flows per flow-group) with\
-| ... | all packets containing Ethernet header, IPv4 header with UDP header and\
-| ... | static payload. MAC addresses are matching MAC addresses of the TG node\
-| ... | interfaces.
+| ... | Test packets are generated by TG on links to DUTs. TG traffic profile
+| ... | contains two L3 flow-groups (flow-group per direction, ${flows_per_dir}
+| ... | flows per flow-group) with all packets containing Ethernet header, IPv4
+| ... | header with IP protocol=61 and static payload. MAC addresses are
+| ... | matching MAC addresses of the TG node interfaces.
| ... | *[Ref] Applicable standard specifications:* RFC2544.
*** Variables ***
diff --git a/tests/vpp/perf/ip4/10ge2p1x520-ethip4udp-ip4base-oacl10sf-10kflows-ndrpdr.robot b/tests/vpp/perf/ip4/10ge2p1x520-ethip4udp-ip4base-oacl10sf-10kflows-ndrpdr.robot
index 92f7461527..82b562c488 100644
--- a/tests/vpp/perf/ip4/10ge2p1x520-ethip4udp-ip4base-oacl10sf-10kflows-ndrpdr.robot
+++ b/tests/vpp/perf/ip4/10ge2p1x520-ethip4udp-ip4base-oacl10sf-10kflows-ndrpdr.robot
@@ -35,22 +35,21 @@
| ...
| ... | *[Top] Network Topologies:* TG-DUT1-DUT2-TG 3-node circular topology\
| ... | with single links between nodes.
-| ... | *[Enc] Packet Encapsulations:* Eth-IPv4-UDP for L2 switching of IPv4.
-| ... | *[Cfg] DUT configuration:* DUT1 is configured with L2 bridge domain\
-| ... | and MAC learning enabled. DUT2 is configured with L2 cross-connects.\
-| ... | Required ACL rules are applied to input paths of both DUT1 intefaces.\
-| ... | DUT1 and DUT2 are tested with 2p10GE NIC X520 Niantic by Intel.\
-| ... | *[Ver] TG verification:* TG finds and reports throughput NDR (Non Drop\
-| ... | Rate) with zero packet loss tolerance or throughput PDR (Partial Drop\
-| ... | Rate) with non-zero packet loss tolerance (LT) expressed in percentage\
-| ... | of packets transmitted. NDR and PDR are discovered for different\
+| ... | *[Enc] Packet Encapsulations:* Eth-IPv4-UDP for IPv4 routing.
+| ... | *[Cfg] DUT configuration:* DUT1 and DUT2 are configured with IPv4\
+| ... | routing and one static IPv4 /24 route entries. Required ACL rules are\
+| ... | applied to output paths of both DUT1 intefaces. DUT1 and DUT2 are tested\
+| ... | with 2p10GE NIC X520 Niantic by Intel.\
+| ... | *[Ver] TG verification:* TG finds and reports throughput NDR (Non Drop
+| ... | Rate) with zero packet loss tolerance or throughput PDR (Partial Drop
+| ... | Rate) with non-zero packet loss tolerance (LT) expressed in percentage
+| ... | of packets transmitted. NDR and PDR are discovered for different
| ... | Ethernet L2 frame sizes using MLRsearch library.
-| ... | Test packets are generated by TG on\
-| ... | links to DUTs. TG traffic profile contains two L3 flow-groups\
-| ... | (flow-group per direction, ${flows_per_dir} flows per flow-group) with\
-| ... | all packets containing Ethernet header, IPv4 header with UDP header and\
-| ... | static payload. MAC addresses are matching MAC addresses of the TG node\
-| ... | interfaces.
+| ... | Test packets are generated by TG on links to DUTs. TG traffic profile
+| ... | contains two L3 flow-groups (flow-group per direction, ${flows_per_dir}
+| ... | flows per flow-group) with all packets containing Ethernet header, IPv4
+| ... | header with IP protocol=61 and static payload. MAC addresses are
+| ... | matching MAC addresses of the TG node interfaces.
| ... | *[Ref] Applicable standard specifications:* RFC2544.
*** Variables ***
diff --git a/tests/vpp/perf/ip4/10ge2p1x520-ethip4udp-ip4base-oacl10sl-100flows-mrr.robot b/tests/vpp/perf/ip4/10ge2p1x520-ethip4udp-ip4base-oacl10sl-100flows-mrr.robot
index cf2bdece39..f896100337 100644
--- a/tests/vpp/perf/ip4/10ge2p1x520-ethip4udp-ip4base-oacl10sl-100flows-mrr.robot
+++ b/tests/vpp/perf/ip4/10ge2p1x520-ethip4udp-ip4base-oacl10sl-100flows-mrr.robot
@@ -34,19 +34,18 @@
| ...
| ... | *[Top] Network Topologies:* TG-DUT1-DUT2-TG 3-node circular topology\
| ... | with single links between nodes.
-| ... | *[Enc] Packet Encapsulations:* Eth-IPv4-UDP for L2 switching of IPv4.
-| ... | *[Cfg] DUT configuration:* DUT1 is configured with L2 bridge domain\
-| ... | and MAC learning enabled. DUT2 is configured with L2 cross-connects.\
-| ... | Required ACL rules are applied to input paths of both DUT1 intefaces.\
-| ... | DUT1 and DUT2 are tested with 2p10GE NIC X520 Niantic by Intel.\
+| ... | *[Enc] Packet Encapsulations:* Eth-IPv4-UDP for IPv4 routing.
+| ... | *[Cfg] DUT configuration:* DUT1 and DUT2 are configured with IPv4\
+| ... | routing and one static IPv4 /24 route entries. Required ACL rules are\
+| ... | applied to output paths of both DUT1 intefaces. DUT1 and DUT2 are tested\
+| ... | with 2p10GE NIC X520 Niantic by Intel.\
| ... | *[Ver] TG verification:* In MaxReceivedRate test TG sends traffic
| ... | at line rate and reports total received/sent packets over trial period.
-| ... | Test packets are generated by TG on\
-| ... | links to DUTs. TG traffic profile contains two L3 flow-groups\
-| ... | (flow-group per direction, ${flows_per_dir} flows per flow-group) with\
-| ... | all packets containing Ethernet header, IPv4 header with UDP header and\
-| ... | static payload. MAC addresses are matching MAC addresses of the TG node\
-| ... | interfaces.
+| ... | Test packets are generated by TG on links to DUTs. TG traffic profile
+| ... | contains two L3 flow-groups (flow-group per direction, ${flows_per_dir}
+| ... | flows per flow-group) with all packets containing Ethernet header, IPv4
+| ... | header with IP protocol=61 and static payload. MAC addresses are
+| ... | matching MAC addresses of the TG node interfaces.
| ... | *[Ref] Applicable standard specifications:* RFC2544.
*** Variables ***
diff --git a/tests/vpp/perf/ip4/10ge2p1x520-ethip4udp-ip4base-oacl10sl-100flows-ndrpdr.robot b/tests/vpp/perf/ip4/10ge2p1x520-ethip4udp-ip4base-oacl10sl-100flows-ndrpdr.robot
index 5b27c367b9..35f12f1a30 100644
--- a/tests/vpp/perf/ip4/10ge2p1x520-ethip4udp-ip4base-oacl10sl-100flows-ndrpdr.robot
+++ b/tests/vpp/perf/ip4/10ge2p1x520-ethip4udp-ip4base-oacl10sl-100flows-ndrpdr.robot
@@ -35,22 +35,21 @@
| ...
| ... | *[Top] Network Topologies:* TG-DUT1-DUT2-TG 3-node circular topology\
| ... | with single links between nodes.
-| ... | *[Enc] Packet Encapsulations:* Eth-IPv4-UDP for L2 switching of IPv4.
-| ... | *[Cfg] DUT configuration:* DUT1 is configured with L2 bridge domain\
-| ... | and MAC learning enabled. DUT2 is configured with L2 cross-connects.\
-| ... | Required ACL rules are applied to input paths of both DUT1 intefaces.\
-| ... | DUT1 and DUT2 are tested with 2p10GE NIC X520 Niantic by Intel.\
-| ... | *[Ver] TG verification:* TG finds and reports throughput NDR (Non Drop\
-| ... | Rate) with zero packet loss tolerance or throughput PDR (Partial Drop\
-| ... | Rate) with non-zero packet loss tolerance (LT) expressed in percentage\
-| ... | of packets transmitted. NDR and PDR are discovered for different\
+| ... | *[Enc] Packet Encapsulations:* Eth-IPv4-UDP for IPv4 routing.
+| ... | *[Cfg] DUT configuration:* DUT1 and DUT2 are configured with IPv4\
+| ... | routing and one static IPv4 /24 route entries. Required ACL rules are\
+| ... | applied to output paths of both DUT1 intefaces. DUT1 and DUT2 are tested\
+| ... | with 2p10GE NIC X520 Niantic by Intel.\
+| ... | *[Ver] TG verification:* TG finds and reports throughput NDR (Non Drop
+| ... | Rate) with zero packet loss tolerance or throughput PDR (Partial Drop
+| ... | Rate) with non-zero packet loss tolerance (LT) expressed in percentage
+| ... | of packets transmitted. NDR and PDR are discovered for different
| ... | Ethernet L2 frame sizes using MLRsearch library.
-| ... | Test packets are generated by TG on\
-| ... | links to DUTs. TG traffic profile contains two L3 flow-groups\
-| ... | (flow-group per direction, ${flows_per_dir} flows per flow-group) with\
-| ... | all packets containing Ethernet header, IPv4 header with UDP header and\
-| ... | static payload. MAC addresses are matching MAC addresses of the TG node\
-| ... | interfaces.
+| ... | Test packets are generated by TG on links to DUTs. TG traffic profile
+| ... | contains two L3 flow-groups (flow-group per direction, ${flows_per_dir}
+| ... | flows per flow-group) with all packets containing Ethernet header, IPv4
+| ... | header with IP protocol=61 and static payload. MAC addresses are
+| ... | matching MAC addresses of the TG node interfaces.
| ... | *[Ref] Applicable standard specifications:* RFC2544.
*** Variables ***
diff --git a/tests/vpp/perf/ip4/10ge2p1x520-ethip4udp-ip4base-oacl10sl-100kflows-mrr.robot b/tests/vpp/perf/ip4/10ge2p1x520-ethip4udp-ip4base-oacl10sl-100kflows-mrr.robot
index 808f3b2c4d..0784b6830c 100644
--- a/tests/vpp/perf/ip4/10ge2p1x520-ethip4udp-ip4base-oacl10sl-100kflows-mrr.robot
+++ b/tests/vpp/perf/ip4/10ge2p1x520-ethip4udp-ip4base-oacl10sl-100kflows-mrr.robot
@@ -34,19 +34,18 @@
| ...
| ... | *[Top] Network Topologies:* TG-DUT1-DUT2-TG 3-node circular topology\
| ... | with single links between nodes.
-| ... | *[Enc] Packet Encapsulations:* Eth-IPv4-UDP for L2 switching of IPv4.
-| ... | *[Cfg] DUT configuration:* DUT1 is configured with L2 bridge domain\
-| ... | and MAC learning enabled. DUT2 is configured with L2 cross-connects.\
-| ... | Required ACL rules are applied to input paths of both DUT1 intefaces.\
-| ... | DUT1 and DUT2 are tested with 2p10GE NIC X520 Niantic by Intel.\
+| ... | *[Enc] Packet Encapsulations:* Eth-IPv4-UDP for IPv4 routing.
+| ... | *[Cfg] DUT configuration:* DUT1 and DUT2 are configured with IPv4\
+| ... | routing and one static IPv4 /24 route entries. Required ACL rules are\
+| ... | applied to output paths of both DUT1 intefaces. DUT1 and DUT2 are tested\
+| ... | with 2p10GE NIC X520 Niantic by Intel.\
| ... | *[Ver] TG verification:* In MaxReceivedRate test TG sends traffic
| ... | at line rate and reports total received/sent packets over trial period.
-| ... | Test packets are generated by TG on\
-| ... | links to DUTs. TG traffic profile contains two L3 flow-groups\
-| ... | (flow-group per direction, ${flows_per_dir} flows per flow-group) with\
-| ... | all packets containing Ethernet header, IPv4 header with UDP header and\
-| ... | static payload. MAC addresses are matching MAC addresses of the TG node\
-| ... | interfaces.
+| ... | Test packets are generated by TG on links to DUTs. TG traffic profile
+| ... | contains two L3 flow-groups (flow-group per direction, ${flows_per_dir}
+| ... | flows per flow-group) with all packets containing Ethernet header, IPv4
+| ... | header with IP protocol=61 and static payload. MAC addresses are
+| ... | matching MAC addresses of the TG node interfaces.
| ... | *[Ref] Applicable standard specifications:* RFC2544.
*** Variables ***
diff --git a/tests/vpp/perf/ip4/10ge2p1x520-ethip4udp-ip4base-oacl10sl-100kflows-ndrpdr.robot b/tests/vpp/perf/ip4/10ge2p1x520-ethip4udp-ip4base-oacl10sl-100kflows-ndrpdr.robot
index bda4ec6749..ea401da9da 100644
--- a/tests/vpp/perf/ip4/10ge2p1x520-ethip4udp-ip4base-oacl10sl-100kflows-ndrpdr.robot
+++ b/tests/vpp/perf/ip4/10ge2p1x520-ethip4udp-ip4base-oacl10sl-100kflows-ndrpdr.robot
@@ -35,22 +35,21 @@
| ...
| ... | *[Top] Network Topologies:* TG-DUT1-DUT2-TG 3-node circular topology\
| ... | with single links between nodes.
-| ... | *[Enc] Packet Encapsulations:* Eth-IPv4-UDP for L2 switching of IPv4.
-| ... | *[Cfg] DUT configuration:* DUT1 is configured with L2 bridge domain\
-| ... | and MAC learning enabled. DUT2 is configured with L2 cross-connects.\
-| ... | Required ACL rules are applied to input paths of both DUT1 intefaces.\
-| ... | DUT1 and DUT2 are tested with 2p10GE NIC X520 Niantic by Intel.\
-| ... | *[Ver] TG verification:* TG finds and reports throughput NDR (Non Drop\
-| ... | Rate) with zero packet loss tolerance or throughput PDR (Partial Drop\
-| ... | Rate) with non-zero packet loss tolerance (LT) expressed in percentage\
-| ... | of packets transmitted. NDR and PDR are discovered for different\
+| ... | *[Enc] Packet Encapsulations:* Eth-IPv4-UDP for IPv4 routing.
+| ... | *[Cfg] DUT configuration:* DUT1 and DUT2 are configured with IPv4\
+| ... | routing and one static IPv4 /24 route entries. Required ACL rules are\
+| ... | applied to output paths of both DUT1 intefaces. DUT1 and DUT2 are tested\
+| ... | with 2p10GE NIC X520 Niantic by Intel.\
+| ... | *[Ver] TG verification:* TG finds and reports throughput NDR (Non Drop
+| ... | Rate) with zero packet loss tolerance or throughput PDR (Partial Drop
+| ... | Rate) with non-zero packet loss tolerance (LT) expressed in percentage
+| ... | of packets transmitted. NDR and PDR are discovered for different
| ... | Ethernet L2 frame sizes using MLRsearch library.
-| ... | Test packets are generated by TG on\
-| ... | links to DUTs. TG traffic profile contains two L3 flow-groups\
-| ... | (flow-group per direction, ${flows_per_dir} flows per flow-group) with\
-| ... | all packets containing Ethernet header, IPv4 header with UDP header and\
-| ... | static payload. MAC addresses are matching MAC addresses of the TG node\
-| ... | interfaces.
+| ... | Test packets are generated by TG on links to DUTs. TG traffic profile
+| ... | contains two L3 flow-groups (flow-group per direction, ${flows_per_dir}
+| ... | flows per flow-group) with all packets containing Ethernet header, IPv4
+| ... | header with IP protocol=61 and static payload. MAC addresses are
+| ... | matching MAC addresses of the TG node interfaces.
| ... | *[Ref] Applicable standard specifications:* RFC2544.
*** Variables ***
diff --git a/tests/vpp/perf/ip4/10ge2p1x520-ethip4udp-ip4base-oacl10sl-10kflows-mrr.robot b/tests/vpp/perf/ip4/10ge2p1x520-ethip4udp-ip4base-oacl10sl-10kflows-mrr.robot
index 334bb39eb3..508e0f92a5 100644
--- a/tests/vpp/perf/ip4/10ge2p1x520-ethip4udp-ip4base-oacl10sl-10kflows-mrr.robot
+++ b/tests/vpp/perf/ip4/10ge2p1x520-ethip4udp-ip4base-oacl10sl-10kflows-mrr.robot
@@ -34,19 +34,18 @@
| ...
| ... | *[Top] Network Topologies:* TG-DUT1-DUT2-TG 3-node circular topology\
| ... | with single links between nodes.
-| ... | *[Enc] Packet Encapsulations:* Eth-IPv4-UDP for L2 switching of IPv4.
-| ... | *[Cfg] DUT configuration:* DUT1 is configured with L2 bridge domain\
-| ... | and MAC learning enabled. DUT2 is configured with L2 cross-connects.\
-| ... | Required ACL rules are applied to input paths of both DUT1 intefaces.\
-| ... | DUT1 and DUT2 are tested with 2p10GE NIC X520 Niantic by Intel.\
+| ... | *[Enc] Packet Encapsulations:* Eth-IPv4-UDP for IPv4 routing.
+| ... | *[Cfg] DUT configuration:* DUT1 and DUT2 are configured with IPv4\
+| ... | routing and one static IPv4 /24 route entries. Required ACL rules are\
+| ... | applied to output paths of both DUT1 intefaces. DUT1 and DUT2 are tested\
+| ... | with 2p10GE NIC X520 Niantic by Intel.\
| ... | *[Ver] TG verification:* In MaxReceivedRate test TG sends traffic
| ... | at line rate and reports total received/sent packets over trial period.
-| ... | Test packets are generated by TG on\
-| ... | links to DUTs. TG traffic profile contains two L3 flow-groups\
-| ... | (flow-group per direction, ${flows_per_dir} flows per flow-group) with\
-| ... | all packets containing Ethernet header, IPv4 header with UDP header and\
-| ... | static payload. MAC addresses are matching MAC addresses of the TG node\
-| ... | interfaces.
+| ... | Test packets are generated by TG on links to DUTs. TG traffic profile
+| ... | contains two L3 flow-groups (flow-group per direction, ${flows_per_dir}
+| ... | flows per flow-group) with all packets containing Ethernet header, IPv4
+| ... | header with IP protocol=61 and static payload. MAC addresses are
+| ... | matching MAC addresses of the TG node interfaces.
| ... | *[Ref] Applicable standard specifications:* RFC2544.
*** Variables ***
diff --git a/tests/vpp/perf/ip4/10ge2p1x520-ethip4udp-ip4base-oacl10sl-10kflows-ndrpdr.robot b/tests/vpp/perf/ip4/10ge2p1x520-ethip4udp-ip4base-oacl10sl-10kflows-ndrpdr.robot
index 135f124e19..62b1f724b1 100644
--- a/tests/vpp/perf/ip4/10ge2p1x520-ethip4udp-ip4base-oacl10sl-10kflows-ndrpdr.robot
+++ b/tests/vpp/perf/ip4/10ge2p1x520-ethip4udp-ip4base-oacl10sl-10kflows-ndrpdr.robot
@@ -35,22 +35,21 @@
| ...
| ... | *[Top] Network Topologies:* TG-DUT1-DUT2-TG 3-node circular topology\
| ... | with single links between nodes.
-| ... | *[Enc] Packet Encapsulations:* Eth-IPv4-UDP for L2 switching of IPv4.
-| ... | *[Cfg] DUT configuration:* DUT1 is configured with L2 bridge domain\
-| ... | and MAC learning enabled. DUT2 is configured with L2 cross-connects.\
-| ... | Required ACL rules are applied to input paths of both DUT1 intefaces.\
-| ... | DUT1 and DUT2 are tested with 2p10GE NIC X520 Niantic by Intel.\
-| ... | *[Ver] TG verification:* TG finds and reports throughput NDR (Non Drop\
-| ... | Rate) with zero packet loss tolerance or throughput PDR (Partial Drop\
-| ... | Rate) with non-zero packet loss tolerance (LT) expressed in percentage\
-| ... | of packets transmitted. NDR and PDR are discovered for different\
+| ... | *[Enc] Packet Encapsulations:* Eth-IPv4-UDP for IPv4 routing.
+| ... | *[Cfg] DUT configuration:* DUT1 and DUT2 are configured with IPv4\
+| ... | routing and one static IPv4 /24 route entries. Required ACL rules are\
+| ... | applied to output paths of both DUT1 intefaces. DUT1 and DUT2 are tested\
+| ... | with 2p10GE NIC X520 Niantic by Intel.\
+| ... | *[Ver] TG verification:* TG finds and reports throughput NDR (Non Drop
+| ... | Rate) with zero packet loss tolerance or throughput PDR (Partial Drop
+| ... | Rate) with non-zero packet loss tolerance (LT) expressed in percentage
+| ... | of packets transmitted. NDR and PDR are discovered for different
| ... | Ethernet L2 frame sizes using MLRsearch library.
-| ... | Test packets are generated by TG on\
-| ... | links to DUTs. TG traffic profile contains two L3 flow-groups\
-| ... | (flow-group per direction, ${flows_per_dir} flows per flow-group) with\
-| ... | all packets containing Ethernet header, IPv4 header with UDP header and\
-| ... | static payload. MAC addresses are matching MAC addresses of the TG node\
-| ... | interfaces.
+| ... | Test packets are generated by TG on links to DUTs. TG traffic profile
+| ... | contains two L3 flow-groups (flow-group per direction, ${flows_per_dir}
+| ... | flows per flow-group) with all packets containing Ethernet header, IPv4
+| ... | header with IP protocol=61 and static payload. MAC addresses are
+| ... | matching MAC addresses of the TG node interfaces.
| ... | *[Ref] Applicable standard specifications:* RFC2544.
*** Variables ***
diff --git a/tests/vpp/perf/ip4/10ge2p1x520-ethip4udp-ip4base-oacl1sf-100flows-mrr.robot b/tests/vpp/perf/ip4/10ge2p1x520-ethip4udp-ip4base-oacl1sf-100flows-mrr.robot
index cb04a4a48b..063437f313 100644
--- a/tests/vpp/perf/ip4/10ge2p1x520-ethip4udp-ip4base-oacl1sf-100flows-mrr.robot
+++ b/tests/vpp/perf/ip4/10ge2p1x520-ethip4udp-ip4base-oacl1sf-100flows-mrr.robot
@@ -34,20 +34,18 @@
| ...
| ... | *[Top] Network Topologies:* TG-DUT1-DUT2-TG 3-node circular topology\
| ... | with single links between nodes.
-| ... | *[Enc] Packet Encapsulations:* Eth-IPv4-UDP for L2 switching of IPv4.
-| ... | *[Cfg] DUT configuration:* DUT1 is configured with L2 bridge domain\
-| ... | and MAC learning enabled. DUT2 is configured with L2 cross-connects.\
-| ... | Required ACL rules are applied to input paths of both DUT1 intefaces.\
-| ... | DUT1 and DUT2 are tested with 2p10GE NIC X520 Niantic by Intel.\
+| ... | *[Enc] Packet Encapsulations:* Eth-IPv4-UDP for IPv4 routing.
+| ... | *[Cfg] DUT configuration:* DUT1 and DUT2 are configured with IPv4\
+| ... | routing and one static IPv4 /24 route entries. Required ACL rules are\
+| ... | applied to output paths of both DUT1 intefaces. DUT1 and DUT2 are tested\
+| ... | with 2p10GE NIC X520 Niantic by Intel.\
| ... | *[Ver] TG verification:* In MaxReceivedRate test TG sends traffic
| ... | at line rate and reports total received/sent packets over trial period.
-| ... | Test packets are generated by TG on\
-| ... | links to DUTs. TG traffic profile contains two L3 flow-groups\
-| ... | (flow-group per direction, ${flows_per_dir} flows per flow-group) with\
-| ... | all packets containing Ethernet header, IPv4 header with UDP header and\
-| ... | static payload. MAC addresses are matching MAC addresses of the TG node\
-| ... | interfaces.
-| ... | *[Ref] Applicable standard specifications:* RFC2544.
+| ... | Test packets are generated by TG on links to DUTs. TG traffic profile
+| ... | contains two L3 flow-groups (flow-group per direction, ${flows_per_dir}
+| ... | flows per flow-group) with all packets containing Ethernet header, IPv4
+| ... | header with IP protocol=61 and static payload. MAC addresses are
+| ... | matching MAC addresses of the TG node interfaces.ble standard specifications:* RFC2544.
*** Variables ***
# X520-DA2 bandwidth limit
diff --git a/tests/vpp/perf/ip4/10ge2p1x520-ethip4udp-ip4base-oacl1sf-100flows-ndrpdr.robot b/tests/vpp/perf/ip4/10ge2p1x520-ethip4udp-ip4base-oacl1sf-100flows-ndrpdr.robot
index f984d9e967..e842ab21c8 100644
--- a/tests/vpp/perf/ip4/10ge2p1x520-ethip4udp-ip4base-oacl1sf-100flows-ndrpdr.robot
+++ b/tests/vpp/perf/ip4/10ge2p1x520-ethip4udp-ip4base-oacl1sf-100flows-ndrpdr.robot
@@ -35,22 +35,21 @@
| ...
| ... | *[Top] Network Topologies:* TG-DUT1-DUT2-TG 3-node circular topology\
| ... | with single links between nodes.
-| ... | *[Enc] Packet Encapsulations:* Eth-IPv4-UDP for L2 switching of IPv4.
-| ... | *[Cfg] DUT configuration:* DUT1 is configured with L2 bridge domain\
-| ... | and MAC learning enabled. DUT2 is configured with L2 cross-connects.\
-| ... | Required ACL rules are applied to input paths of both DUT1 intefaces.\
-| ... | DUT1 and DUT2 are tested with 2p10GE NIC X520 Niantic by Intel.\
-| ... | *[Ver] TG verification:* TG finds and reports throughput NDR (Non Drop\
-| ... | Rate) with zero packet loss tolerance or throughput PDR (Partial Drop\
-| ... | Rate) with non-zero packet loss tolerance (LT) expressed in percentage\
-| ... | of packets transmitted. NDR and PDR are discovered for different\
+| ... | *[Enc] Packet Encapsulations:* Eth-IPv4-UDP for IPv4 routing.
+| ... | *[Cfg] DUT configuration:* DUT1 and DUT2 are configured with IPv4\
+| ... | routing and one static IPv4 /24 route entries. Required ACL rules are\
+| ... | applied to output paths of both DUT1 intefaces. DUT1 and DUT2 are tested\
+| ... | with 2p10GE NIC X520 Niantic by Intel.\
+| ... | *[Ver] TG verification:* TG finds and reports throughput NDR (Non Drop
+| ... | Rate) with zero packet loss tolerance or throughput PDR (Partial Drop
+| ... | Rate) with non-zero packet loss tolerance (LT) expressed in percentage
+| ... | of packets transmitted. NDR and PDR are discovered for different
| ... | Ethernet L2 frame sizes using MLRsearch library.
-| ... | Test packets are generated by TG on\
-| ... | links to DUTs. TG traffic profile contains two L3 flow-groups\
-| ... | (flow-group per direction, ${flows_per_dir} flows per flow-group) with\
-| ... | all packets containing Ethernet header, IPv4 header with UDP header and\
-| ... | static payload. MAC addresses are matching MAC addresses of the TG node\
-| ... | interfaces.
+| ... | Test packets are generated by TG on links to DUTs. TG traffic profile
+| ... | contains two L3 flow-groups (flow-group per direction, ${flows_per_dir}
+| ... | flows per flow-group) with all packets containing Ethernet header, IPv4
+| ... | header with IP protocol=61 and static payload. MAC addresses are
+| ... | matching MAC addresses of the TG node interfaces.
| ... | *[Ref] Applicable standard specifications:* RFC2544.
*** Variables ***
diff --git a/tests/vpp/perf/ip4/10ge2p1x520-ethip4udp-ip4base-oacl1sf-100kflows-mrr.robot b/tests/vpp/perf/ip4/10ge2p1x520-ethip4udp-ip4base-oacl1sf-100kflows-mrr.robot
index 85254c1175..67c3439989 100644
--- a/tests/vpp/perf/ip4/10ge2p1x520-ethip4udp-ip4base-oacl1sf-100kflows-mrr.robot
+++ b/tests/vpp/perf/ip4/10ge2p1x520-ethip4udp-ip4base-oacl1sf-100kflows-mrr.robot
@@ -34,19 +34,18 @@
| ...
| ... | *[Top] Network Topologies:* TG-DUT1-DUT2-TG 3-node circular topology\
| ... | with single links between nodes.
-| ... | *[Enc] Packet Encapsulations:* Eth-IPv4-UDP for L2 switching of IPv4.
-| ... | *[Cfg] DUT configuration:* DUT1 is configured with L2 bridge domain\
-| ... | and MAC learning enabled. DUT2 is configured with L2 cross-connects.\
-| ... | Required ACL rules are applied to input paths of both DUT1 intefaces.\
-| ... | DUT1 and DUT2 are tested with 2p10GE NIC X520 Niantic by Intel.\
+| ... | *[Enc] Packet Encapsulations:* Eth-IPv4-UDP for IPv4 routing.
+| ... | *[Cfg] DUT configuration:* DUT1 and DUT2 are configured with IPv4\
+| ... | routing and one static IPv4 /24 route entries. Required ACL rules are\
+| ... | applied to output paths of both DUT1 intefaces. DUT1 and DUT2 are tested\
+| ... | with 2p10GE NIC X520 Niantic by Intel.\
| ... | *[Ver] TG verification:* In MaxReceivedRate test TG sends traffic
| ... | at line rate and reports total received/sent packets over trial period.
-| ... | Test packets are generated by TG on\
-| ... | links to DUTs. TG traffic profile contains two L3 flow-groups\
-| ... | (flow-group per direction, ${flows_per_dir} flows per flow-group) with\
-| ... | all packets containing Ethernet header, IPv4 header with UDP header and\
-| ... | static payload. MAC addresses are matching MAC addresses of the TG node\
-| ... | interfaces.
+| ... | Test packets are generated by TG on links to DUTs. TG traffic profile
+| ... | contains two L3 flow-groups (flow-group per direction, ${flows_per_dir}
+| ... | flows per flow-group) with all packets containing Ethernet header, IPv4
+| ... | header with IP protocol=61 and static payload. MAC addresses are
+| ... | matching MAC addresses of the TG node interfaces.
| ... | *[Ref] Applicable standard specifications:* RFC2544.
*** Variables ***
diff --git a/tests/vpp/perf/ip4/10ge2p1x520-ethip4udp-ip4base-oacl1sf-100kflows-ndrpdr.robot b/tests/vpp/perf/ip4/10ge2p1x520-ethip4udp-ip4base-oacl1sf-100kflows-ndrpdr.robot
index 07d6421e1b..049d9c9e49 100644
--- a/tests/vpp/perf/ip4/10ge2p1x520-ethip4udp-ip4base-oacl1sf-100kflows-ndrpdr.robot
+++ b/tests/vpp/perf/ip4/10ge2p1x520-ethip4udp-ip4base-oacl1sf-100kflows-ndrpdr.robot
@@ -35,22 +35,21 @@
| ...
| ... | *[Top] Network Topologies:* TG-DUT1-DUT2-TG 3-node circular topology\
| ... | with single links between nodes.
-| ... | *[Enc] Packet Encapsulations:* Eth-IPv4-UDP for L2 switching of IPv4.
-| ... | *[Cfg] DUT configuration:* DUT1 is configured with L2 bridge domain\
-| ... | and MAC learning enabled. DUT2 is configured with L2 cross-connects.\
-| ... | Required ACL rules are applied to input paths of both DUT1 intefaces.\
-| ... | DUT1 and DUT2 are tested with 2p10GE NIC X520 Niantic by Intel.\
-| ... | *[Ver] TG verification:* TG finds and reports throughput NDR (Non Drop\
-| ... | Rate) with zero packet loss tolerance or throughput PDR (Partial Drop\
-| ... | Rate) with non-zero packet loss tolerance (LT) expressed in percentage\
-| ... | of packets transmitted. NDR and PDR are discovered for different\
+| ... | *[Enc] Packet Encapsulations:* Eth-IPv4-UDP for IPv4 routing.
+| ... | *[Cfg] DUT configuration:* DUT1 and DUT2 are configured with IPv4\
+| ... | routing and one static IPv4 /24 route entries. Required ACL rules are\
+| ... | applied to output paths of both DUT1 intefaces. DUT1 and DUT2 are tested\
+| ... | with 2p10GE NIC X520 Niantic by Intel.\
+| ... | *[Ver] TG verification:* TG finds and reports throughput NDR (Non Drop
+| ... | Rate) with zero packet loss tolerance or throughput PDR (Partial Drop
+| ... | Rate) with non-zero packet loss tolerance (LT) expressed in percentage
+| ... | of packets transmitted. NDR and PDR are discovered for different
| ... | Ethernet L2 frame sizes using MLRsearch library.
-| ... | Test packets are generated by TG on\
-| ... | links to DUTs. TG traffic profile contains two L3 flow-groups\
-| ... | (flow-group per direction, ${flows_per_dir} flows per flow-group) with\
-| ... | all packets containing Ethernet header, IPv4 header with UDP header and\
-| ... | static payload. MAC addresses are matching MAC addresses of the TG node\
-| ... | interfaces.
+| ... | Test packets are generated by TG on links to DUTs. TG traffic profile
+| ... | contains two L3 flow-groups (flow-group per direction, ${flows_per_dir}
+| ... | flows per flow-group) with all packets containing Ethernet header, IPv4
+| ... | header with IP protocol=61 and static payload. MAC addresses are
+| ... | matching MAC addresses of the TG node interfaces.
| ... | *[Ref] Applicable standard specifications:* RFC2544.
*** Variables ***
diff --git a/tests/vpp/perf/ip4/10ge2p1x520-ethip4udp-ip4base-oacl1sf-10kflows-mrr.robot b/tests/vpp/perf/ip4/10ge2p1x520-ethip4udp-ip4base-oacl1sf-10kflows-mrr.robot
index 4a95dc140f..e740dc7e06 100644
--- a/tests/vpp/perf/ip4/10ge2p1x520-ethip4udp-ip4base-oacl1sf-10kflows-mrr.robot
+++ b/tests/vpp/perf/ip4/10ge2p1x520-ethip4udp-ip4base-oacl1sf-10kflows-mrr.robot
@@ -34,19 +34,18 @@
| ...
| ... | *[Top] Network Topologies:* TG-DUT1-DUT2-TG 3-node circular topology\
| ... | with single links between nodes.
-| ... | *[Enc] Packet Encapsulations:* Eth-IPv4-UDP for L2 switching of IPv4.
-| ... | *[Cfg] DUT configuration:* DUT1 is configured with L2 bridge domain\
-| ... | and MAC learning enabled. DUT2 is configured with L2 cross-connects.\
-| ... | Required ACL rules are applied to input paths of both DUT1 intefaces.\
-| ... | DUT1 and DUT2 are tested with 2p10GE NIC X520 Niantic by Intel.\
+| ... | *[Enc] Packet Encapsulations:* Eth-IPv4-UDP for IPv4 routing.
+| ... | *[Cfg] DUT configuration:* DUT1 and DUT2 are configured with IPv4\
+| ... | routing and one static IPv4 /24 route entries. Required ACL rules are\
+| ... | applied to output paths of both DUT1 intefaces. DUT1 and DUT2 are tested\
+| ... | with 2p10GE NIC X520 Niantic by Intel.\
| ... | *[Ver] TG verification:* In MaxReceivedRate test TG sends traffic
| ... | at line rate and reports total received/sent packets over trial period.
-| ... | Test packets are generated by TG on\
-| ... | links to DUTs. TG traffic profile contains two L3 flow-groups\
-| ... | (flow-group per direction, ${flows_per_dir} flows per flow-group) with\
-| ... | all packets containing Ethernet header, IPv4 header with UDP header and\
-| ... | static payload. MAC addresses are matching MAC addresses of the TG node\
-| ... | interfaces.
+| ... | Test packets are generated by TG on links to DUTs. TG traffic profile
+| ... | contains two L3 flow-groups (flow-group per direction, ${flows_per_dir}
+| ... | flows per flow-group) with all packets containing Ethernet header, IPv4
+| ... | header with IP protocol=61 and static payload. MAC addresses are
+| ... | matching MAC addresses of the TG node interfaces.
| ... | *[Ref] Applicable standard specifications:* RFC2544.
*** Variables ***
diff --git a/tests/vpp/perf/ip4/10ge2p1x520-ethip4udp-ip4base-oacl1sf-10kflows-ndrpdr.robot b/tests/vpp/perf/ip4/10ge2p1x520-ethip4udp-ip4base-oacl1sf-10kflows-ndrpdr.robot
index bd55f20a3c..a6c7d50fff 100644
--- a/tests/vpp/perf/ip4/10ge2p1x520-ethip4udp-ip4base-oacl1sf-10kflows-ndrpdr.robot
+++ b/tests/vpp/perf/ip4/10ge2p1x520-ethip4udp-ip4base-oacl1sf-10kflows-ndrpdr.robot
@@ -35,22 +35,21 @@
| ...
| ... | *[Top] Network Topologies:* TG-DUT1-DUT2-TG 3-node circular topology\
| ... | with single links between nodes.
-| ... | *[Enc] Packet Encapsulations:* Eth-IPv4-UDP for L2 switching of IPv4.
-| ... | *[Cfg] DUT configuration:* DUT1 is configured with L2 bridge domain\
-| ... | and MAC learning enabled. DUT2 is configured with L2 cross-connects.\
-| ... | Required ACL rules are applied to input paths of both DUT1 intefaces.\
-| ... | DUT1 and DUT2 are tested with 2p10GE NIC X520 Niantic by Intel.\
-| ... | *[Ver] TG verification:* TG finds and reports throughput NDR (Non Drop\
-| ... | Rate) with zero packet loss tolerance or throughput PDR (Partial Drop\
-| ... | Rate) with non-zero packet loss tolerance (LT) expressed in percentage\
-| ... | of packets transmitted. NDR and PDR are discovered for different\
+| ... | *[Enc] Packet Encapsulations:* Eth-IPv4-UDP for IPv4 routing.
+| ... | *[Cfg] DUT configuration:* DUT1 and DUT2 are configured with IPv4\
+| ... | routing and one static IPv4 /24 route entries. Required ACL rules are\
+| ... | applied to output paths of both DUT1 intefaces. DUT1 and DUT2 are tested\
+| ... | with 2p10GE NIC X520 Niantic by Intel.\
+| ... | *[Ver] TG verification:* TG finds and reports throughput NDR (Non Drop
+| ... | Rate) with zero packet loss tolerance or throughput PDR (Partial Drop
+| ... | Rate) with non-zero packet loss tolerance (LT) expressed in percentage
+| ... | of packets transmitted. NDR and PDR are discovered for different
| ... | Ethernet L2 frame sizes using MLRsearch library.
-| ... | Test packets are generated by TG on\
-| ... | links to DUTs. TG traffic profile contains two L3 flow-groups\
-| ... | (flow-group per direction, ${flows_per_dir} flows per flow-group) with\
-| ... | all packets containing Ethernet header, IPv4 header with UDP header and\
-| ... | static payload. MAC addresses are matching MAC addresses of the TG node\
-| ... | interfaces.
+| ... | Test packets are generated by TG on links to DUTs. TG traffic profile
+| ... | contains two L3 flow-groups (flow-group per direction, ${flows_per_dir}
+| ... | flows per flow-group) with all packets containing Ethernet header, IPv4
+| ... | header with IP protocol=61 and static payload. MAC addresses are
+| ... | matching MAC addresses of the TG node interfaces.
| ... | *[Ref] Applicable standard specifications:* RFC2544.
*** Variables ***
diff --git a/tests/vpp/perf/ip4/10ge2p1x520-ethip4udp-ip4base-oacl1sl-100flows-mrr.robot b/tests/vpp/perf/ip4/10ge2p1x520-ethip4udp-ip4base-oacl1sl-100flows-mrr.robot
index 63f447fbff..63e9e1b493 100644
--- a/tests/vpp/perf/ip4/10ge2p1x520-ethip4udp-ip4base-oacl1sl-100flows-mrr.robot
+++ b/tests/vpp/perf/ip4/10ge2p1x520-ethip4udp-ip4base-oacl1sl-100flows-mrr.robot
@@ -34,19 +34,18 @@
| ...
| ... | *[Top] Network Topologies:* TG-DUT1-DUT2-TG 3-node circular topology\
| ... | with single links between nodes.
-| ... | *[Enc] Packet Encapsulations:* Eth-IPv4-UDP for L2 switching of IPv4.
-| ... | *[Cfg] DUT configuration:* DUT1 is configured with L2 bridge domain\
-| ... | and MAC learning enabled. DUT2 is configured with L2 cross-connects.\
-| ... | Required ACL rules are applied to input paths of both DUT1 intefaces.\
-| ... | DUT1 and DUT2 are tested with 2p10GE NIC X520 Niantic by Intel.\
+| ... | *[Enc] Packet Encapsulations:* Eth-IPv4-UDP for IPv4 routing.
+| ... | *[Cfg] DUT configuration:* DUT1 and DUT2 are configured with IPv4\
+| ... | routing and one static IPv4 /24 route entries. Required ACL rules are\
+| ... | applied to output paths of both DUT1 intefaces. DUT1 and DUT2 are tested\
+| ... | with 2p10GE NIC X520 Niantic by Intel.\
| ... | *[Ver] TG verification:* In MaxReceivedRate test TG sends traffic
| ... | at line rate and reports total received/sent packets over trial period.
-| ... | Test packets are generated by TG on\
-| ... | links to DUTs. TG traffic profile contains two L3 flow-groups\
-| ... | (flow-group per direction, ${flows_per_dir} flows per flow-group) with\
-| ... | all packets containing Ethernet header, IPv4 header with UDP header and\
-| ... | static payload. MAC addresses are matching MAC addresses of the TG node\
-| ... | interfaces.
+| ... | Test packets are generated by TG on links to DUTs. TG traffic profile
+| ... | contains two L3 flow-groups (flow-group per direction, ${flows_per_dir}
+| ... | flows per flow-group) with all packets containing Ethernet header, IPv4
+| ... | header with IP protocol=61 and static payload. MAC addresses are
+| ... | matching MAC addresses of the TG node interfaces.
| ... | *[Ref] Applicable standard specifications:* RFC2544.
*** Variables ***
diff --git a/tests/vpp/perf/ip4/10ge2p1x520-ethip4udp-ip4base-oacl1sl-100flows-ndrpdr.robot b/tests/vpp/perf/ip4/10ge2p1x520-ethip4udp-ip4base-oacl1sl-100flows-ndrpdr.robot
index 5075519045..faa01af009 100644
--- a/tests/vpp/perf/ip4/10ge2p1x520-ethip4udp-ip4base-oacl1sl-100flows-ndrpdr.robot
+++ b/tests/vpp/perf/ip4/10ge2p1x520-ethip4udp-ip4base-oacl1sl-100flows-ndrpdr.robot
@@ -35,22 +35,21 @@
| ...
| ... | *[Top] Network Topologies:* TG-DUT1-DUT2-TG 3-node circular topology\
| ... | with single links between nodes.
-| ... | *[Enc] Packet Encapsulations:* Eth-IPv4-UDP for L2 switching of IPv4.
-| ... | *[Cfg] DUT configuration:* DUT1 is configured with L2 bridge domain\
-| ... | and MAC learning enabled. DUT2 is configured with L2 cross-connects.\
-| ... | Required ACL rules are applied to input paths of both DUT1 intefaces.\
-| ... | DUT1 and DUT2 are tested with 2p10GE NIC X520 Niantic by Intel.\
-| ... | *[Ver] TG verification:* TG finds and reports throughput NDR (Non Drop\
-| ... | Rate) with zero packet loss tolerance or throughput PDR (Partial Drop\
-| ... | Rate) with non-zero packet loss tolerance (LT) expressed in percentage\
-| ... | of packets transmitted. NDR and PDR are discovered for different\
+| ... | *[Enc] Packet Encapsulations:* Eth-IPv4-UDP for IPv4 routing.
+| ... | *[Cfg] DUT configuration:* DUT1 and DUT2 are configured with IPv4\
+| ... | routing and one static IPv4 /24 route entries. Required ACL rules are\
+| ... | applied to output paths of both DUT1 intefaces. DUT1 and DUT2 are tested\
+| ... | with 2p10GE NIC X520 Niantic by Intel.\
+| ... | *[Ver] TG verification:* TG finds and reports throughput NDR (Non Drop
+| ... | Rate) with zero packet loss tolerance or throughput PDR (Partial Drop
+| ... | Rate) with non-zero packet loss tolerance (LT) expressed in percentage
+| ... | of packets transmitted. NDR and PDR are discovered for different
| ... | Ethernet L2 frame sizes using MLRsearch library.
-| ... | Test packets are generated by TG on\
-| ... | links to DUTs. TG traffic profile contains two L3 flow-groups\
-| ... | (flow-group per direction, ${flows_per_dir} flows per flow-group) with\
-| ... | all packets containing Ethernet header, IPv4 header with UDP header and\
-| ... | static payload. MAC addresses are matching MAC addresses of the TG node\
-| ... | interfaces.
+| ... | Test packets are generated by TG on links to DUTs. TG traffic profile
+| ... | contains two L3 flow-groups (flow-group per direction, ${flows_per_dir}
+| ... | flows per flow-group) with all packets containing Ethernet header, IPv4
+| ... | header with IP protocol=61 and static payload. MAC addresses are
+| ... | matching MAC addresses of the TG node interfaces.
| ... | *[Ref] Applicable standard specifications:* RFC2544.
*** Variables ***
diff --git a/tests/vpp/perf/ip4/10ge2p1x520-ethip4udp-ip4base-oacl1sl-100kflows-mrr.robot b/tests/vpp/perf/ip4/10ge2p1x520-ethip4udp-ip4base-oacl1sl-100kflows-mrr.robot
index 8ee8a5bb4e..a5355a930c 100644
--- a/tests/vpp/perf/ip4/10ge2p1x520-ethip4udp-ip4base-oacl1sl-100kflows-mrr.robot
+++ b/tests/vpp/perf/ip4/10ge2p1x520-ethip4udp-ip4base-oacl1sl-100kflows-mrr.robot
@@ -34,19 +34,18 @@
| ...
| ... | *[Top] Network Topologies:* TG-DUT1-DUT2-TG 3-node circular topology\
| ... | with single links between nodes.
-| ... | *[Enc] Packet Encapsulations:* Eth-IPv4-UDP for L2 switching of IPv4.
-| ... | *[Cfg] DUT configuration:* DUT1 is configured with L2 bridge domain\
-| ... | and MAC learning enabled. DUT2 is configured with L2 cross-connects.\
-| ... | Required ACL rules are applied to input paths of both DUT1 intefaces.\
-| ... | DUT1 and DUT2 are tested with 2p10GE NIC X520 Niantic by Intel.\
+| ... | *[Enc] Packet Encapsulations:* Eth-IPv4-UDP for IPv4 routing.
+| ... | *[Cfg] DUT configuration:* DUT1 and DUT2 are configured with IPv4\
+| ... | routing and one static IPv4 /24 route entries. Required ACL rules are\
+| ... | applied to output paths of both DUT1 intefaces. DUT1 and DUT2 are tested\
+| ... | with 2p10GE NIC X520 Niantic by Intel.\
| ... | *[Ver] TG verification:* In MaxReceivedRate test TG sends traffic
| ... | at line rate and reports total received/sent packets over trial period.
-| ... | Test packets are generated by TG on\
-| ... | links to DUTs. TG traffic profile contains two L3 flow-groups\
-| ... | (flow-group per direction, ${flows_per_dir} flows per flow-group) with\
-| ... | all packets containing Ethernet header, IPv4 header with UDP header and\
-| ... | static payload. MAC addresses are matching MAC addresses of the TG node\
-| ... | interfaces.
+| ... | Test packets are generated by TG on links to DUTs. TG traffic profile
+| ... | contains two L3 flow-groups (flow-group per direction, ${flows_per_dir}
+| ... | flows per flow-group) with all packets containing Ethernet header, IPv4
+| ... | header with IP protocol=61 and static payload. MAC addresses are
+| ... | matching MAC addresses of the TG node interfaces.
| ... | *[Ref] Applicable standard specifications:* RFC2544.
*** Variables ***
diff --git a/tests/vpp/perf/ip4/10ge2p1x520-ethip4udp-ip4base-oacl1sl-100kflows-ndrpdr.robot b/tests/vpp/perf/ip4/10ge2p1x520-ethip4udp-ip4base-oacl1sl-100kflows-ndrpdr.robot
index 37dd338ca5..e3a050531f 100644
--- a/tests/vpp/perf/ip4/10ge2p1x520-ethip4udp-ip4base-oacl1sl-100kflows-ndrpdr.robot
+++ b/tests/vpp/perf/ip4/10ge2p1x520-ethip4udp-ip4base-oacl1sl-100kflows-ndrpdr.robot
@@ -35,22 +35,21 @@
| ...
| ... | *[Top] Network Topologies:* TG-DUT1-DUT2-TG 3-node circular topology\
| ... | with single links between nodes.
-| ... | *[Enc] Packet Encapsulations:* Eth-IPv4-UDP for L2 switching of IPv4.
-| ... | *[Cfg] DUT configuration:* DUT1 is configured with L2 bridge domain\
-| ... | and MAC learning enabled. DUT2 is configured with L2 cross-connects.\
-| ... | Required ACL rules are applied to input paths of both DUT1 intefaces.\
-| ... | DUT1 and DUT2 are tested with 2p10GE NIC X520 Niantic by Intel.\
-| ... | *[Ver] TG verification:* TG finds and reports throughput NDR (Non Drop\
-| ... | Rate) with zero packet loss tolerance or throughput PDR (Partial Drop\
-| ... | Rate) with non-zero packet loss tolerance (LT) expressed in percentage\
-| ... | of packets transmitted. NDR and PDR are discovered for different\
+| ... | *[Enc] Packet Encapsulations:* Eth-IPv4-UDP for IPv4 routing.
+| ... | *[Cfg] DUT configuration:* DUT1 and DUT2 are configured with IPv4\
+| ... | routing and one static IPv4 /24 route entries. Required ACL rules are\
+| ... | applied to output paths of both DUT1 intefaces. DUT1 and DUT2 are tested\
+| ... | with 2p10GE NIC X520 Niantic by Intel.\
+| ... | *[Ver] TG verification:* TG finds and reports throughput NDR (Non Drop
+| ... | Rate) with zero packet loss tolerance or throughput PDR (Partial Drop
+| ... | Rate) with non-zero packet loss tolerance (LT) expressed in percentage
+| ... | of packets transmitted. NDR and PDR are discovered for different
| ... | Ethernet L2 frame sizes using MLRsearch library.
-| ... | Test packets are generated by TG on\
-| ... | links to DUTs. TG traffic profile contains two L3 flow-groups\
-| ... | (flow-group per direction, ${flows_per_dir} flows per flow-group) with\
-| ... | all packets containing Ethernet header, IPv4 header with UDP header and\
-| ... | static payload. MAC addresses are matching MAC addresses of the TG node\
-| ... | interfaces.
+| ... | Test packets are generated by TG on links to DUTs. TG traffic profile
+| ... | contains two L3 flow-groups (flow-group per direction, ${flows_per_dir}
+| ... | flows per flow-group) with all packets containing Ethernet header, IPv4
+| ... | header with IP protocol=61 and static payload. MAC addresses are
+| ... | matching MAC addresses of the TG node interfaces.
| ... | *[Ref] Applicable standard specifications:* RFC2544.
*** Variables ***
diff --git a/tests/vpp/perf/ip4/10ge2p1x520-ethip4udp-ip4base-oacl1sl-10kflows-mrr.robot b/tests/vpp/perf/ip4/10ge2p1x520-ethip4udp-ip4base-oacl1sl-10kflows-mrr.robot
index 29a45a7f6a..5d72ab0652 100644
--- a/tests/vpp/perf/ip4/10ge2p1x520-ethip4udp-ip4base-oacl1sl-10kflows-mrr.robot
+++ b/tests/vpp/perf/ip4/10ge2p1x520-ethip4udp-ip4base-oacl1sl-10kflows-mrr.robot
@@ -34,19 +34,18 @@
| ...
| ... | *[Top] Network Topologies:* TG-DUT1-DUT2-TG 3-node circular topology\
| ... | with single links between nodes.
-| ... | *[Enc] Packet Encapsulations:* Eth-IPv4-UDP for L2 switching of IPv4.
-| ... | *[Cfg] DUT configuration:* DUT1 is configured with L2 bridge domain\
-| ... | and MAC learning enabled. DUT2 is configured with L2 cross-connects.\
-| ... | Required ACL rules are applied to input paths of both DUT1 intefaces.\
-| ... | DUT1 and DUT2 are tested with 2p10GE NIC X520 Niantic by Intel.\
+| ... | *[Enc] Packet Encapsulations:* Eth-IPv4-UDP for IPv4 routing.
+| ... | *[Cfg] DUT configuration:* DUT1 and DUT2 are configured with IPv4\
+| ... | routing and one static IPv4 /24 route entries. Required ACL rules are\
+| ... | applied to output paths of both DUT1 intefaces. DUT1 and DUT2 are tested\
+| ... | with 2p10GE NIC X520 Niantic by Intel.\
| ... | *[Ver] TG verification:* In MaxReceivedRate test TG sends traffic
| ... | at line rate and reports total received/sent packets over trial period.
-| ... | Test packets are generated by TG on\
-| ... | links to DUTs. TG traffic profile contains two L3 flow-groups\
-| ... | (flow-group per direction, ${flows_per_dir} flows per flow-group) with\
-| ... | all packets containing Ethernet header, IPv4 header with UDP header and\
-| ... | static payload. MAC addresses are matching MAC addresses of the TG node\
-| ... | interfaces.
+| ... | Test packets are generated by TG on links to DUTs. TG traffic profile
+| ... | contains two L3 flow-groups (flow-group per direction, ${flows_per_dir}
+| ... | flows per flow-group) with all packets containing Ethernet header, IPv4
+| ... | header with IP protocol=61 and static payload. MAC addresses are
+| ... | matching MAC addresses of the TG node interfaces.
| ... | *[Ref] Applicable standard specifications:* RFC2544.
*** Variables ***
diff --git a/tests/vpp/perf/ip4/10ge2p1x520-ethip4udp-ip4base-oacl1sl-10kflows-ndrpdr.robot b/tests/vpp/perf/ip4/10ge2p1x520-ethip4udp-ip4base-oacl1sl-10kflows-ndrpdr.robot
index 212299ce9c..db2a9ddb2e 100644
--- a/tests/vpp/perf/ip4/10ge2p1x520-ethip4udp-ip4base-oacl1sl-10kflows-ndrpdr.robot
+++ b/tests/vpp/perf/ip4/10ge2p1x520-ethip4udp-ip4base-oacl1sl-10kflows-ndrpdr.robot
@@ -35,22 +35,21 @@
| ...
| ... | *[Top] Network Topologies:* TG-DUT1-DUT2-TG 3-node circular topology\
| ... | with single links between nodes.
-| ... | *[Enc] Packet Encapsulations:* Eth-IPv4-UDP for L2 switching of IPv4.
-| ... | *[Cfg] DUT configuration:* DUT1 is configured with L2 bridge domain\
-| ... | and MAC learning enabled. DUT2 is configured with L2 cross-connects.\
-| ... | Required ACL rules are applied to input paths of both DUT1 intefaces.\
-| ... | DUT1 and DUT2 are tested with 2p10GE NIC X520 Niantic by Intel.\
-| ... | *[Ver] TG verification:* TG finds and reports throughput NDR (Non Drop\
-| ... | Rate) with zero packet loss tolerance or throughput PDR (Partial Drop\
-| ... | Rate) with non-zero packet loss tolerance (LT) expressed in percentage\
-| ... | of packets transmitted. NDR and PDR are discovered for different\
+| ... | *[Enc] Packet Encapsulations:* Eth-IPv4-UDP for IPv4 routing.
+| ... | *[Cfg] DUT configuration:* DUT1 and DUT2 are configured with IPv4\
+| ... | routing and one static IPv4 /24 route entries. Required ACL rules are\
+| ... | applied to output paths of both DUT1 intefaces. DUT1 and DUT2 are tested\
+| ... | with 2p10GE NIC X520 Niantic by Intel.\
+| ... | *[Ver] TG verification:* TG finds and reports throughput NDR (Non Drop
+| ... | Rate) with zero packet loss tolerance or throughput PDR (Partial Drop
+| ... | Rate) with non-zero packet loss tolerance (LT) expressed in percentage
+| ... | of packets transmitted. NDR and PDR are discovered for different
| ... | Ethernet L2 frame sizes using MLRsearch library.
-| ... | Test packets are generated by TG on\
-| ... | links to DUTs. TG traffic profile contains two L3 flow-groups\
-| ... | (flow-group per direction, ${flows_per_dir} flows per flow-group) with\
-| ... | all packets containing Ethernet header, IPv4 header with UDP header and\
-| ... | static payload. MAC addresses are matching MAC addresses of the TG node\
-| ... | interfaces.
+| ... | Test packets are generated by TG on links to DUTs. TG traffic profile
+| ... | contains two L3 flow-groups (flow-group per direction, ${flows_per_dir}
+| ... | flows per flow-group) with all packets containing Ethernet header, IPv4
+| ... | header with IP protocol=61 and static payload. MAC addresses are
+| ... | matching MAC addresses of the TG node interfaces.
| ... | *[Ref] Applicable standard specifications:* RFC2544.
*** Variables ***
diff --git a/tests/vpp/perf/ip4/10ge2p1x520-ethip4udp-ip4base-oacl50sf-100flows-mrr.robot b/tests/vpp/perf/ip4/10ge2p1x520-ethip4udp-ip4base-oacl50sf-100flows-mrr.robot
index b33f96a6dd..d301061bd5 100644
--- a/tests/vpp/perf/ip4/10ge2p1x520-ethip4udp-ip4base-oacl50sf-100flows-mrr.robot
+++ b/tests/vpp/perf/ip4/10ge2p1x520-ethip4udp-ip4base-oacl50sf-100flows-mrr.robot
@@ -34,19 +34,18 @@
| ...
| ... | *[Top] Network Topologies:* TG-DUT1-DUT2-TG 3-node circular topology\
| ... | with single links between nodes.
-| ... | *[Enc] Packet Encapsulations:* Eth-IPv4-UDP for L2 switching of IPv4.
-| ... | *[Cfg] DUT configuration:* DUT1 is configured with L2 bridge domain\
-| ... | and MAC learning enabled. DUT2 is configured with L2 cross-connects.\
-| ... | Required ACL rules are applied to input paths of both DUT1 intefaces.\
-| ... | DUT1 and DUT2 are tested with 2p10GE NIC X520 Niantic by Intel.\
+| ... | *[Enc] Packet Encapsulations:* Eth-IPv4-UDP for IPv4 routing.
+| ... | *[Cfg] DUT configuration:* DUT1 and DUT2 are configured with IPv4\
+| ... | routing and one static IPv4 /24 route entries. Required ACL rules are\
+| ... | applied to output paths of both DUT1 intefaces. DUT1 and DUT2 are tested\
+| ... | with 2p10GE NIC X520 Niantic by Intel.\
| ... | *[Ver] TG verification:* In MaxReceivedRate test TG sends traffic
| ... | at line rate and reports total received/sent packets over trial period.
-| ... | Test packets are generated by TG on\
-| ... | links to DUTs. TG traffic profile contains two L3 flow-groups\
-| ... | (flow-group per direction, ${flows_per_dir} flows per flow-group) with\
-| ... | all packets containing Ethernet header, IPv4 header with UDP header and\
-| ... | static payload. MAC addresses are matching MAC addresses of the TG node\
-| ... | interfaces.
+| ... | Test packets are generated by TG on links to DUTs. TG traffic profile
+| ... | contains two L3 flow-groups (flow-group per direction, ${flows_per_dir}
+| ... | flows per flow-group) with all packets containing Ethernet header, IPv4
+| ... | header with IP protocol=61 and static payload. MAC addresses are
+| ... | matching MAC addresses of the TG node interfaces.
| ... | *[Ref] Applicable standard specifications:* RFC2544.
*** Variables ***
diff --git a/tests/vpp/perf/ip4/10ge2p1x520-ethip4udp-ip4base-oacl50sf-100flows-ndrpdr.robot b/tests/vpp/perf/ip4/10ge2p1x520-ethip4udp-ip4base-oacl50sf-100flows-ndrpdr.robot
index 4ee35f4a19..dec141a5aa 100644
--- a/tests/vpp/perf/ip4/10ge2p1x520-ethip4udp-ip4base-oacl50sf-100flows-ndrpdr.robot
+++ b/tests/vpp/perf/ip4/10ge2p1x520-ethip4udp-ip4base-oacl50sf-100flows-ndrpdr.robot
@@ -35,22 +35,21 @@
| ...
| ... | *[Top] Network Topologies:* TG-DUT1-DUT2-TG 3-node circular topology\
| ... | with single links between nodes.
-| ... | *[Enc] Packet Encapsulations:* Eth-IPv4-UDP for L2 switching of IPv4.
-| ... | *[Cfg] DUT configuration:* DUT1 is configured with L2 bridge domain\
-| ... | and MAC learning enabled. DUT2 is configured with L2 cross-connects.\
-| ... | Required ACL rules are applied to input paths of both DUT1 intefaces.\
-| ... | DUT1 and DUT2 are tested with 2p10GE NIC X520 Niantic by Intel.\
-| ... | *[Ver] TG verification:* TG finds and reports throughput NDR (Non Drop\
-| ... | Rate) with zero packet loss tolerance or throughput PDR (Partial Drop\
-| ... | Rate) with non-zero packet loss tolerance (LT) expressed in percentage\
-| ... | of packets transmitted. NDR and PDR are discovered for different\
+| ... | *[Enc] Packet Encapsulations:* Eth-IPv4-UDP for IPv4 routing.
+| ... | *[Cfg] DUT configuration:* DUT1 and DUT2 are configured with IPv4\
+| ... | routing and one static IPv4 /24 route entries. Required ACL rules are\
+| ... | applied to output paths of both DUT1 intefaces. DUT1 and DUT2 are tested\
+| ... | with 2p10GE NIC X520 Niantic by Intel.\
+| ... | *[Ver] TG verification:* TG finds and reports throughput NDR (Non Drop
+| ... | Rate) with zero packet loss tolerance or throughput PDR (Partial Drop
+| ... | Rate) with non-zero packet loss tolerance (LT) expressed in percentage
+| ... | of packets transmitted. NDR and PDR are discovered for different
| ... | Ethernet L2 frame sizes using MLRsearch library.
-| ... | Test packets are generated by TG on\
-| ... | links to DUTs. TG traffic profile contains two L3 flow-groups\
-| ... | (flow-group per direction, ${flows_per_dir} flows per flow-group) with\
-| ... | all packets containing Ethernet header, IPv4 header with UDP header and\
-| ... | static payload. MAC addresses are matching MAC addresses of the TG node\
-| ... | interfaces.
+| ... | Test packets are generated by TG on links to DUTs. TG traffic profile
+| ... | contains two L3 flow-groups (flow-group per direction, ${flows_per_dir}
+| ... | flows per flow-group) with all packets containing Ethernet header, IPv4
+| ... | header with IP protocol=61 and static payload. MAC addresses are
+| ... | matching MAC addresses of the TG node interfaces.
| ... | *[Ref] Applicable standard specifications:* RFC2544.
*** Variables ***
diff --git a/tests/vpp/perf/ip4/10ge2p1x520-ethip4udp-ip4base-oacl50sf-100kflows-mrr.robot b/tests/vpp/perf/ip4/10ge2p1x520-ethip4udp-ip4base-oacl50sf-100kflows-mrr.robot
index c1a0bc03dc..83e2281b09 100644
--- a/tests/vpp/perf/ip4/10ge2p1x520-ethip4udp-ip4base-oacl50sf-100kflows-mrr.robot
+++ b/tests/vpp/perf/ip4/10ge2p1x520-ethip4udp-ip4base-oacl50sf-100kflows-mrr.robot
@@ -34,19 +34,18 @@
| ...
| ... | *[Top] Network Topologies:* TG-DUT1-DUT2-TG 3-node circular topology\
| ... | with single links between nodes.
-| ... | *[Enc] Packet Encapsulations:* Eth-IPv4-UDP for L2 switching of IPv4.
-| ... | *[Cfg] DUT configuration:* DUT1 is configured with L2 bridge domain\
-| ... | and MAC learning enabled. DUT2 is configured with L2 cross-connects.\
-| ... | Required ACL rules are applied to input paths of both DUT1 intefaces.\
-| ... | DUT1 and DUT2 are tested with 2p10GE NIC X520 Niantic by Intel.\
+| ... | *[Enc] Packet Encapsulations:* Eth-IPv4-UDP for IPv4 routing.
+| ... | *[Cfg] DUT configuration:* DUT1 and DUT2 are configured with IPv4\
+| ... | routing and one static IPv4 /24 route entries. Required ACL rules are\
+| ... | applied to output paths of both DUT1 intefaces. DUT1 and DUT2 are tested\
+| ... | with 2p10GE NIC X520 Niantic by Intel.\
| ... | *[Ver] TG verification:* In MaxReceivedRate test TG sends traffic
| ... | at line rate and reports total received/sent packets over trial period.
-| ... | Test packets are generated by TG on\
-| ... | links to DUTs. TG traffic profile contains two L3 flow-groups\
-| ... | (flow-group per direction, ${flows_per_dir} flows per flow-group) with\
-| ... | all packets containing Ethernet header, IPv4 header with UDP header and\
-| ... | static payload. MAC addresses are matching MAC addresses of the TG node\
-| ... | interfaces.
+| ... | Test packets are generated by TG on links to DUTs. TG traffic profile
+| ... | contains two L3 flow-groups (flow-group per direction, ${flows_per_dir}
+| ... | flows per flow-group) with all packets containing Ethernet header, IPv4
+| ... | header with IP protocol=61 and static payload. MAC addresses are
+| ... | matching MAC addresses of the TG node interfaces.
| ... | *[Ref] Applicable standard specifications:* RFC2544.
*** Variables ***
diff --git a/tests/vpp/perf/ip4/10ge2p1x520-ethip4udp-ip4base-oacl50sf-100kflows-ndrpdr.robot b/tests/vpp/perf/ip4/10ge2p1x520-ethip4udp-ip4base-oacl50sf-100kflows-ndrpdr.robot
index 5cebb45d41..41a94de820 100644
--- a/tests/vpp/perf/ip4/10ge2p1x520-ethip4udp-ip4base-oacl50sf-100kflows-ndrpdr.robot
+++ b/tests/vpp/perf/ip4/10ge2p1x520-ethip4udp-ip4base-oacl50sf-100kflows-ndrpdr.robot
@@ -35,22 +35,21 @@
| ...
| ... | *[Top] Network Topologies:* TG-DUT1-DUT2-TG 3-node circular topology\
| ... | with single links between nodes.
-| ... | *[Enc] Packet Encapsulations:* Eth-IPv4-UDP for L2 switching of IPv4.
-| ... | *[Cfg] DUT configuration:* DUT1 is configured with L2 bridge domain\
-| ... | and MAC learning enabled. DUT2 is configured with L2 cross-connects.\
-| ... | Required ACL rules are applied to input paths of both DUT1 intefaces.\
-| ... | DUT1 and DUT2 are tested with 2p10GE NIC X520 Niantic by Intel.\
-| ... | *[Ver] TG verification:* TG finds and reports throughput NDR (Non Drop\
-| ... | Rate) with zero packet loss tolerance or throughput PDR (Partial Drop\
-| ... | Rate) with non-zero packet loss tolerance (LT) expressed in percentage\
-| ... | of packets transmitted. NDR and PDR are discovered for different\
+| ... | *[Enc] Packet Encapsulations:* Eth-IPv4-UDP for IPv4 routing.
+| ... | *[Cfg] DUT configuration:* DUT1 and DUT2 are configured with IPv4\
+| ... | routing and one static IPv4 /24 route entries. Required ACL rules are\
+| ... | applied to output paths of both DUT1 intefaces. DUT1 and DUT2 are tested\
+| ... | with 2p10GE NIC X520 Niantic by Intel.\
+| ... | *[Ver] TG verification:* TG finds and reports throughput NDR (Non Drop
+| ... | Rate) with zero packet loss tolerance or throughput PDR (Partial Drop
+| ... | Rate) with non-zero packet loss tolerance (LT) expressed in percentage
+| ... | of packets transmitted. NDR and PDR are discovered for different
| ... | Ethernet L2 frame sizes using MLRsearch library.
-| ... | Test packets are generated by TG on\
-| ... | links to DUTs. TG traffic profile contains two L3 flow-groups\
-| ... | (flow-group per direction, ${flows_per_dir} flows per flow-group) with\
-| ... | all packets containing Ethernet header, IPv4 header with UDP header and\
-| ... | static payload. MAC addresses are matching MAC addresses of the TG node\
-| ... | interfaces.
+| ... | Test packets are generated by TG on links to DUTs. TG traffic profile
+| ... | contains two L3 flow-groups (flow-group per direction, ${flows_per_dir}
+| ... | flows per flow-group) with all packets containing Ethernet header, IPv4
+| ... | header with IP protocol=61 and static payload. MAC addresses are
+| ... | matching MAC addresses of the TG node interfaces.
| ... | *[Ref] Applicable standard specifications:* RFC2544.
*** Variables ***
diff --git a/tests/vpp/perf/ip4/10ge2p1x520-ethip4udp-ip4base-oacl50sf-10kflows-mrr.robot b/tests/vpp/perf/ip4/10ge2p1x520-ethip4udp-ip4base-oacl50sf-10kflows-mrr.robot
index 1db6de2cce..3c5565aeb8 100644
--- a/tests/vpp/perf/ip4/10ge2p1x520-ethip4udp-ip4base-oacl50sf-10kflows-mrr.robot
+++ b/tests/vpp/perf/ip4/10ge2p1x520-ethip4udp-ip4base-oacl50sf-10kflows-mrr.robot
@@ -34,19 +34,18 @@
| ...
| ... | *[Top] Network Topologies:* TG-DUT1-DUT2-TG 3-node circular topology\
| ... | with single links between nodes.
-| ... | *[Enc] Packet Encapsulations:* Eth-IPv4-UDP for L2 switching of IPv4.
-| ... | *[Cfg] DUT configuration:* DUT1 is configured with L2 bridge domain\
-| ... | and MAC learning enabled. DUT2 is configured with L2 cross-connects.\
-| ... | Required ACL rules are applied to input paths of both DUT1 intefaces.\
-| ... | DUT1 and DUT2 are tested with 2p10GE NIC X520 Niantic by Intel.\
+| ... | *[Enc] Packet Encapsulations:* Eth-IPv4-UDP for IPv4 routing.
+| ... | *[Cfg] DUT configuration:* DUT1 and DUT2 are configured with IPv4\
+| ... | routing and one static IPv4 /24 route entries. Required ACL rules are\
+| ... | applied to output paths of both DUT1 intefaces. DUT1 and DUT2 are tested\
+| ... | with 2p10GE NIC X520 Niantic by Intel.\
| ... | *[Ver] TG verification:* In MaxReceivedRate test TG sends traffic
| ... | at line rate and reports total received/sent packets over trial period.
-| ... | Test packets are generated by TG on\
-| ... | links to DUTs. TG traffic profile contains two L3 flow-groups\
-| ... | (flow-group per direction, ${flows_per_dir} flows per flow-group) with\
-| ... | all packets containing Ethernet header, IPv4 header with UDP header and\
-| ... | static payload. MAC addresses are matching MAC addresses of the TG node\
-| ... | interfaces.
+| ... | Test packets are generated by TG on links to DUTs. TG traffic profile
+| ... | contains two L3 flow-groups (flow-group per direction, ${flows_per_dir}
+| ... | flows per flow-group) with all packets containing Ethernet header, IPv4
+| ... | header with IP protocol=61 and static payload. MAC addresses are
+| ... | matching MAC addresses of the TG node interfaces.
| ... | *[Ref] Applicable standard specifications:* RFC2544.
*** Variables ***
diff --git a/tests/vpp/perf/ip4/10ge2p1x520-ethip4udp-ip4base-oacl50sf-10kflows-ndrpdr.robot b/tests/vpp/perf/ip4/10ge2p1x520-ethip4udp-ip4base-oacl50sf-10kflows-ndrpdr.robot
index 82ec769241..05dd7fa25b 100644
--- a/tests/vpp/perf/ip4/10ge2p1x520-ethip4udp-ip4base-oacl50sf-10kflows-ndrpdr.robot
+++ b/tests/vpp/perf/ip4/10ge2p1x520-ethip4udp-ip4base-oacl50sf-10kflows-ndrpdr.robot
@@ -35,22 +35,21 @@
| ...
| ... | *[Top] Network Topologies:* TG-DUT1-DUT2-TG 3-node circular topology\
| ... | with single links between nodes.
-| ... | *[Enc] Packet Encapsulations:* Eth-IPv4-UDP for L2 switching of IPv4.
-| ... | *[Cfg] DUT configuration:* DUT1 is configured with L2 bridge domain\
-| ... | and MAC learning enabled. DUT2 is configured with L2 cross-connects.\
-| ... | Required ACL rules are applied to input paths of both DUT1 intefaces.\
-| ... | DUT1 and DUT2 are tested with 2p10GE NIC X520 Niantic by Intel.\
-| ... | *[Ver] TG verification:* TG finds and reports throughput NDR (Non Drop\
-| ... | Rate) with zero packet loss tolerance or throughput PDR (Partial Drop\
-| ... | Rate) with non-zero packet loss tolerance (LT) expressed in percentage\
-| ... | of packets transmitted. NDR and PDR are discovered for different\
+| ... | *[Enc] Packet Encapsulations:* Eth-IPv4-UDP for IPv4 routing.
+| ... | *[Cfg] DUT configuration:* DUT1 and DUT2 are configured with IPv4\
+| ... | routing and one static IPv4 /24 route entries. Required ACL rules are\
+| ... | applied to output paths of both DUT1 intefaces. DUT1 and DUT2 are tested\
+| ... | with 2p10GE NIC X520 Niantic by Intel.\
+| ... | *[Ver] TG verification:* TG finds and reports throughput NDR (Non Drop
+| ... | Rate) with zero packet loss tolerance or throughput PDR (Partial Drop
+| ... | Rate) with non-zero packet loss tolerance (LT) expressed in percentage
+| ... | of packets transmitted. NDR and PDR are discovered for different
| ... | Ethernet L2 frame sizes using MLRsearch library.
-| ... | Test packets are generated by TG on\
-| ... | links to DUTs. TG traffic profile contains two L3 flow-groups\
-| ... | (flow-group per direction, ${flows_per_dir} flows per flow-group) with\
-| ... | all packets containing Ethernet header, IPv4 header with UDP header and\
-| ... | static payload. MAC addresses are matching MAC addresses of the TG node\
-| ... | interfaces.
+| ... | Test packets are generated by TG on links to DUTs. TG traffic profile
+| ... | contains two L3 flow-groups (flow-group per direction, ${flows_per_dir}
+| ... | flows per flow-group) with all packets containing Ethernet header, IPv4
+| ... | header with IP protocol=61 and static payload. MAC addresses are
+| ... | matching MAC addresses of the TG node interfaces.
| ... | *[Ref] Applicable standard specifications:* RFC2544.
*** Variables ***
diff --git a/tests/vpp/perf/ip4/10ge2p1x520-ethip4udp-ip4base-oacl50sl-100flows-mrr.robot b/tests/vpp/perf/ip4/10ge2p1x520-ethip4udp-ip4base-oacl50sl-100flows-mrr.robot
index fcfab06341..76c7fc21bc 100644
--- a/tests/vpp/perf/ip4/10ge2p1x520-ethip4udp-ip4base-oacl50sl-100flows-mrr.robot
+++ b/tests/vpp/perf/ip4/10ge2p1x520-ethip4udp-ip4base-oacl50sl-100flows-mrr.robot
@@ -34,19 +34,18 @@
| ...
| ... | *[Top] Network Topologies:* TG-DUT1-DUT2-TG 3-node circular topology\
| ... | with single links between nodes.
-| ... | *[Enc] Packet Encapsulations:* Eth-IPv4-UDP for L2 switching of IPv4.
-| ... | *[Cfg] DUT configuration:* DUT1 is configured with L2 bridge domain\
-| ... | and MAC learning enabled. DUT2 is configured with L2 cross-connects.\
-| ... | Required ACL rules are applied to input paths of both DUT1 intefaces.\
-| ... | DUT1 and DUT2 are tested with 2p10GE NIC X520 Niantic by Intel.\
+| ... | *[Enc] Packet Encapsulations:* Eth-IPv4-UDP for IPv4 routing.
+| ... | *[Cfg] DUT configuration:* DUT1 and DUT2 are configured with IPv4\
+| ... | routing and one static IPv4 /24 route entries. Required ACL rules are\
+| ... | applied to output paths of both DUT1 intefaces. DUT1 and DUT2 are tested\
+| ... | with 2p10GE NIC X520 Niantic by Intel.\
| ... | *[Ver] TG verification:* In MaxReceivedRate test TG sends traffic
| ... | at line rate and reports total received/sent packets over trial period.
-| ... | Test packets are generated by TG on\
-| ... | links to DUTs. TG traffic profile contains two L3 flow-groups\
-| ... | (flow-group per direction, ${flows_per_dir} flows per flow-group) with\
-| ... | all packets containing Ethernet header, IPv4 header with UDP header and\
-| ... | static payload. MAC addresses are matching MAC addresses of the TG node\
-| ... | interfaces.
+| ... | Test packets are generated by TG on links to DUTs. TG traffic profile
+| ... | contains two L3 flow-groups (flow-group per direction, ${flows_per_dir}
+| ... | flows per flow-group) with all packets containing Ethernet header, IPv4
+| ... | header with IP protocol=61 and static payload. MAC addresses are
+| ... | matching MAC addresses of the TG node interfaces.
| ... | *[Ref] Applicable standard specifications:* RFC2544.
*** Variables ***
diff --git a/tests/vpp/perf/ip4/10ge2p1x520-ethip4udp-ip4base-oacl50sl-100flows-ndrpdr.robot b/tests/vpp/perf/ip4/10ge2p1x520-ethip4udp-ip4base-oacl50sl-100flows-ndrpdr.robot
index f323fd5a2d..9c6dfecbaf 100644
--- a/tests/vpp/perf/ip4/10ge2p1x520-ethip4udp-ip4base-oacl50sl-100flows-ndrpdr.robot
+++ b/tests/vpp/perf/ip4/10ge2p1x520-ethip4udp-ip4base-oacl50sl-100flows-ndrpdr.robot
@@ -35,22 +35,21 @@
| ...
| ... | *[Top] Network Topologies:* TG-DUT1-DUT2-TG 3-node circular topology\
| ... | with single links between nodes.
-| ... | *[Enc] Packet Encapsulations:* Eth-IPv4-UDP for L2 switching of IPv4.
-| ... | *[Cfg] DUT configuration:* DUT1 is configured with L2 bridge domain\
-| ... | and MAC learning enabled. DUT2 is configured with L2 cross-connects.\
-| ... | Required ACL rules are applied to input paths of both DUT1 intefaces.\
-| ... | DUT1 and DUT2 are tested with 2p10GE NIC X520 Niantic by Intel.\
-| ... | *[Ver] TG verification:* TG finds and reports throughput NDR (Non Drop\
-| ... | Rate) with zero packet loss tolerance or throughput PDR (Partial Drop\
-| ... | Rate) with non-zero packet loss tolerance (LT) expressed in percentage\
-| ... | of packets transmitted. NDR and PDR are discovered for different\
+| ... | *[Enc] Packet Encapsulations:* Eth-IPv4-UDP for IPv4 routing.
+| ... | *[Cfg] DUT configuration:* DUT1 and DUT2 are configured with IPv4\
+| ... | routing and one static IPv4 /24 route entries. Required ACL rules are\
+| ... | applied to output paths of both DUT1 intefaces. DUT1 and DUT2 are tested\
+| ... | with 2p10GE NIC X520 Niantic by Intel.\
+| ... | *[Ver] TG verification:* TG finds and reports throughput NDR (Non Drop
+| ... | Rate) with zero packet loss tolerance or throughput PDR (Partial Drop
+| ... | Rate) with non-zero packet loss tolerance (LT) expressed in percentage
+| ... | of packets transmitted. NDR and PDR are discovered for different
| ... | Ethernet L2 frame sizes using MLRsearch library.
-| ... | Test packets are generated by TG on\
-| ... | links to DUTs. TG traffic profile contains two L3 flow-groups\
-| ... | (flow-group per direction, ${flows_per_dir} flows per flow-group) with\
-| ... | all packets containing Ethernet header, IPv4 header with UDP header and\
-| ... | static payload. MAC addresses are matching MAC addresses of the TG node\
-| ... | interfaces.
+| ... | Test packets are generated by TG on links to DUTs. TG traffic profile
+| ... | contains two L3 flow-groups (flow-group per direction, ${flows_per_dir}
+| ... | flows per flow-group) with all packets containing Ethernet header, IPv4
+| ... | header with IP protocol=61 and static payload. MAC addresses are
+| ... | matching MAC addresses of the TG node interfaces.
| ... | *[Ref] Applicable standard specifications:* RFC2544.
*** Variables ***
diff --git a/tests/vpp/perf/ip4/10ge2p1x520-ethip4udp-ip4base-oacl50sl-100kflows-mrr.robot b/tests/vpp/perf/ip4/10ge2p1x520-ethip4udp-ip4base-oacl50sl-100kflows-mrr.robot
index 6662bd09fb..a285f08262 100644
--- a/tests/vpp/perf/ip4/10ge2p1x520-ethip4udp-ip4base-oacl50sl-100kflows-mrr.robot
+++ b/tests/vpp/perf/ip4/10ge2p1x520-ethip4udp-ip4base-oacl50sl-100kflows-mrr.robot
@@ -34,19 +34,18 @@
| ...
| ... | *[Top] Network Topologies:* TG-DUT1-DUT2-TG 3-node circular topology\
| ... | with single links between nodes.
-| ... | *[Enc] Packet Encapsulations:* Eth-IPv4-UDP for L2 switching of IPv4.
-| ... | *[Cfg] DUT configuration:* DUT1 is configured with L2 bridge domain\
-| ... | and MAC learning enabled. DUT2 is configured with L2 cross-connects.\
-| ... | Required ACL rules are applied to input paths of both DUT1 intefaces.\
-| ... | DUT1 and DUT2 are tested with 2p10GE NIC X520 Niantic by Intel.\
+| ... | *[Enc] Packet Encapsulations:* Eth-IPv4-UDP for IPv4 routing.
+| ... | *[Cfg] DUT configuration:* DUT1 and DUT2 are configured with IPv4\
+| ... | routing and one static IPv4 /24 route entries. Required ACL rules are\
+| ... | applied to output paths of both DUT1 intefaces. DUT1 and DUT2 are tested\
+| ... | with 2p10GE NIC X520 Niantic by Intel.\
| ... | *[Ver] TG verification:* In MaxReceivedRate test TG sends traffic
| ... | at line rate and reports total received/sent packets over trial period.
-| ... | Test packets are generated by TG on\
-| ... | links to DUTs. TG traffic profile contains two L3 flow-groups\
-| ... | (flow-group per direction, ${flows_per_dir} flows per flow-group) with\
-| ... | all packets containing Ethernet header, IPv4 header with UDP header and\
-| ... | static payload. MAC addresses are matching MAC addresses of the TG node\
-| ... | interfaces.
+| ... | Test packets are generated by TG on links to DUTs. TG traffic profile
+| ... | contains two L3 flow-groups (flow-group per direction, ${flows_per_dir}
+| ... | flows per flow-group) with all packets containing Ethernet header, IPv4
+| ... | header with IP protocol=61 and static payload. MAC addresses are
+| ... | matching MAC addresses of the TG node interfaces.
| ... | *[Ref] Applicable standard specifications:* RFC2544.
*** Variables ***
diff --git a/tests/vpp/perf/ip4/10ge2p1x520-ethip4udp-ip4base-oacl50sl-100kflows-ndrpdr.robot b/tests/vpp/perf/ip4/10ge2p1x520-ethip4udp-ip4base-oacl50sl-100kflows-ndrpdr.robot
index 760ff4e9e4..c9c0b76d58 100644
--- a/tests/vpp/perf/ip4/10ge2p1x520-ethip4udp-ip4base-oacl50sl-100kflows-ndrpdr.robot
+++ b/tests/vpp/perf/ip4/10ge2p1x520-ethip4udp-ip4base-oacl50sl-100kflows-ndrpdr.robot
@@ -35,22 +35,21 @@
| ...
| ... | *[Top] Network Topologies:* TG-DUT1-DUT2-TG 3-node circular topology\
| ... | with single links between nodes.
-| ... | *[Enc] Packet Encapsulations:* Eth-IPv4-UDP for L2 switching of IPv4.
-| ... | *[Cfg] DUT configuration:* DUT1 is configured with L2 bridge domain\
-| ... | and MAC learning enabled. DUT2 is configured with L2 cross-connects.\
-| ... | Required ACL rules are applied to input paths of both DUT1 intefaces.\
-| ... | DUT1 and DUT2 are tested with 2p10GE NIC X520 Niantic by Intel.\
-| ... | *[Ver] TG verification:* TG finds and reports throughput NDR (Non Drop\
-| ... | Rate) with zero packet loss tolerance or throughput PDR (Partial Drop\
-| ... | Rate) with non-zero packet loss tolerance (LT) expressed in percentage\
-| ... | of packets transmitted. NDR and PDR are discovered for different\
+| ... | *[Enc] Packet Encapsulations:* Eth-IPv4-UDP for IPv4 routing.
+| ... | *[Cfg] DUT configuration:* DUT1 and DUT2 are configured with IPv4\
+| ... | routing and one static IPv4 /24 route entries. Required ACL rules are\
+| ... | applied to output paths of both DUT1 intefaces. DUT1 and DUT2 are tested\
+| ... | with 2p10GE NIC X520 Niantic by Intel.\
+| ... | *[Ver] TG verification:* TG finds and reports throughput NDR (Non Drop
+| ... | Rate) with zero packet loss tolerance or throughput PDR (Partial Drop
+| ... | Rate) with non-zero packet loss tolerance (LT) expressed in percentage
+| ... | of packets transmitted. NDR and PDR are discovered for different
| ... | Ethernet L2 frame sizes using MLRsearch library.
-| ... | Test packets are generated by TG on\
-| ... | links to DUTs. TG traffic profile contains two L3 flow-groups\
-| ... | (flow-group per direction, ${flows_per_dir} flows per flow-group) with\
-| ... | all packets containing Ethernet header, IPv4 header with UDP header and\
-| ... | static payload. MAC addresses are matching MAC addresses of the TG node\
-| ... | interfaces.
+| ... | Test packets are generated by TG on links to DUTs. TG traffic profile
+| ... | contains two L3 flow-groups (flow-group per direction, ${flows_per_dir}
+| ... | flows per flow-group) with all packets containing Ethernet header, IPv4
+| ... | header with IP protocol=61 and static payload. MAC addresses are
+| ... | matching MAC addresses of the TG node interfaces.
| ... | *[Ref] Applicable standard specifications:* RFC2544.
*** Variables ***
diff --git a/tests/vpp/perf/ip4/10ge2p1x520-ethip4udp-ip4base-oacl50sl-10kflows-mrr.robot b/tests/vpp/perf/ip4/10ge2p1x520-ethip4udp-ip4base-oacl50sl-10kflows-mrr.robot
index 587b269966..f8cc2cc467 100644
--- a/tests/vpp/perf/ip4/10ge2p1x520-ethip4udp-ip4base-oacl50sl-10kflows-mrr.robot
+++ b/tests/vpp/perf/ip4/10ge2p1x520-ethip4udp-ip4base-oacl50sl-10kflows-mrr.robot
@@ -34,19 +34,18 @@
| ...
| ... | *[Top] Network Topologies:* TG-DUT1-DUT2-TG 3-node circular topology\
| ... | with single links between nodes.
-| ... | *[Enc] Packet Encapsulations:* Eth-IPv4-UDP for L2 switching of IPv4.
-| ... | *[Cfg] DUT configuration:* DUT1 is configured with L2 bridge domain\
-| ... | and MAC learning enabled. DUT2 is configured with L2 cross-connects.\
-| ... | Required ACL rules are applied to input paths of both DUT1 intefaces.\
-| ... | DUT1 and DUT2 are tested with 2p10GE NIC X520 Niantic by Intel.\
+| ... | *[Enc] Packet Encapsulations:* Eth-IPv4-UDP for IPv4 routing.
+| ... | *[Cfg] DUT configuration:* DUT1 and DUT2 are configured with IPv4\
+| ... | routing and one static IPv4 /24 route entries. Required ACL rules are\
+| ... | applied to output paths of both DUT1 intefaces. DUT1 and DUT2 are tested\
+| ... | with 2p10GE NIC X520 Niantic by Intel.\
| ... | *[Ver] TG verification:* In MaxReceivedRate test TG sends traffic
| ... | at line rate and reports total received/sent packets over trial period.
-| ... | Test packets are generated by TG on\
-| ... | links to DUTs. TG traffic profile contains two L3 flow-groups\
-| ... | (flow-group per direction, ${flows_per_dir} flows per flow-group) with\
-| ... | all packets containing Ethernet header, IPv4 header with UDP header and\
-| ... | static payload. MAC addresses are matching MAC addresses of the TG node\
-| ... | interfaces.
+| ... | Test packets are generated by TG on links to DUTs. TG traffic profile
+| ... | contains two L3 flow-groups (flow-group per direction, ${flows_per_dir}
+| ... | flows per flow-group) with all packets containing Ethernet header, IPv4
+| ... | header with IP protocol=61 and static payload. MAC addresses are
+| ... | matching MAC addresses of the TG node interfaces.
| ... | *[Ref] Applicable standard specifications:* RFC2544.
*** Variables ***
diff --git a/tests/vpp/perf/ip4/10ge2p1x520-ethip4udp-ip4base-oacl50sl-10kflows-ndrpdr.robot b/tests/vpp/perf/ip4/10ge2p1x520-ethip4udp-ip4base-oacl50sl-10kflows-ndrpdr.robot
index 40c23b8f11..7bde770412 100644
--- a/tests/vpp/perf/ip4/10ge2p1x520-ethip4udp-ip4base-oacl50sl-10kflows-ndrpdr.robot
+++ b/tests/vpp/perf/ip4/10ge2p1x520-ethip4udp-ip4base-oacl50sl-10kflows-ndrpdr.robot
@@ -35,22 +35,21 @@
| ...
| ... | *[Top] Network Topologies:* TG-DUT1-DUT2-TG 3-node circular topology\
| ... | with single links between nodes.
-| ... | *[Enc] Packet Encapsulations:* Eth-IPv4-UDP for L2 switching of IPv4.
-| ... | *[Cfg] DUT configuration:* DUT1 is configured with L2 bridge domain\
-| ... | and MAC learning enabled. DUT2 is configured with L2 cross-connects.\
-| ... | Required ACL rules are applied to input paths of both DUT1 intefaces.\
-| ... | DUT1 and DUT2 are tested with 2p10GE NIC X520 Niantic by Intel.\
-| ... | *[Ver] TG verification:* TG finds and reports throughput NDR (Non Drop\
-| ... | Rate) with zero packet loss tolerance or throughput PDR (Partial Drop\
-| ... | Rate) with non-zero packet loss tolerance (LT) expressed in percentage\
-| ... | of packets transmitted. NDR and PDR are discovered for different\
+| ... | *[Enc] Packet Encapsulations:* Eth-IPv4-UDP for IPv4 routing.
+| ... | *[Cfg] DUT configuration:* DUT1 and DUT2 are configured with IPv4\
+| ... | routing and one static IPv4 /24 route entries. Required ACL rules are\
+| ... | applied to output paths of both DUT1 intefaces. DUT1 and DUT2 are tested\
+| ... | with 2p10GE NIC X520 Niantic by Intel.\
+| ... | *[Ver] TG verification:* TG finds and reports throughput NDR (Non Drop
+| ... | Rate) with zero packet loss tolerance or throughput PDR (Partial Drop
+| ... | Rate) with non-zero packet loss tolerance (LT) expressed in percentage
+| ... | of packets transmitted. NDR and PDR are discovered for different
| ... | Ethernet L2 frame sizes using MLRsearch library.
-| ... | Test packets are generated by TG on\
-| ... | links to DUTs. TG traffic profile contains two L3 flow-groups\
-| ... | (flow-group per direction, ${flows_per_dir} flows per flow-group) with\
-| ... | all packets containing Ethernet header, IPv4 header with UDP header and\
-| ... | static payload. MAC addresses are matching MAC addresses of the TG node\
-| ... | interfaces.
+| ... | Test packets are generated by TG on links to DUTs. TG traffic profile
+| ... | contains two L3 flow-groups (flow-group per direction, ${flows_per_dir}
+| ... | flows per flow-group) with all packets containing Ethernet header, IPv4
+| ... | header with IP protocol=61 and static payload. MAC addresses are
+| ... | matching MAC addresses of the TG node interfaces.
| ... | *[Ref] Applicable standard specifications:* RFC2544.
*** Variables ***