3 files changed, 30 insertions, 30 deletions

diff --git a/tests/func/dhcp/dhcp_client.robot b/tests/func/dhcp/eth2p-ethip4-ip4base-ip4dhcpclient-func.robot
index 6169b97fb7..5507c956d5 100644
--- a/tests/func/dhcp/dhcp_client.robot
+++ b/tests/func/dhcp/eth2p-ethip4-ip4base-ip4dhcpclient-func.robot
@@ -20,7 +20,7 @@
 | Force Tags | HW_ENV | VM_ENV | 3_NODE_DOUBLE_LINK_TOPO
 | Test Setup | Func Test Setup
 | Test Teardown | Func Test Teardown
-| Documentation | *DHCP Client related test cases*
+| Documentation | *DHCPv4 Client related test cases*
 
 *** Variables ***
 | ${client_hostname}= | dhcp-client
@@ -32,9 +32,9 @@
 
 *** Test Cases ***
 | VPP sends a DHCP DISCOVER
-| | [Documentation] | Configure DHCP client on interface to TG without hostname
-| | ...             | and check if DHCP DISCOVER message contains all required
-| | ...             | fields with expected values.
+| | [Documentation] | Configure DHCPv4 client on interface to TG without
+| | ...             | hostname and check if DHCPv4 DISCOVER message contains all
+| | ...             | required fields with expected values.
 | | ...
 | | Given Path for 2-node testing is set
 | |       ... | ${nodes['TG']} | ${nodes['DUT1']} | ${nodes['TG']}
@@ -43,9 +43,9 @@
 | | Then  Check DHCP DISCOVER header | ${tg_node}
 | |       ... | ${tg_to_dut_if1} | ${dut_to_tg_if1_mac}
 
-| VPP sends a DHCP DISCOVER with hostname
-| | [Documentation] | Configure DHCP client on interface to TG with hostname
-| | ...             | and check if DHCP DISCOVER message contains all required
+| VPP sends a DHCPv4 DISCOVER with hostname
+| | [Documentation] | Configure DHCPv4 client on interface to TG with hostname
+| | ...             | and check if DHCPv4 DISCOVER message contains all required
 | | ...             | fields with expected values.
 | | ...
 | | Given Path for 2-node testing is set
@@ -56,9 +56,9 @@
 | | Then  Check DHCP DISCOVER header | ${tg_node}
 | |       ... | ${tg_to_dut_if1} | ${dut_to_tg_if1_mac} | ${client_hostname}
 
-| VPP sends DHCP REQUEST after OFFER
-| | [Documentation] | Configure DHCP client on interface to TG and check if
-| | ...             | DHCP REQUEST message contains all required fields.
+| VPP sends DHCPv4 REQUEST after OFFER
+| | [Documentation] | Configure DHCPv4 client on interface to TG and check if
+| | ...             | DHCPv4 REQUEST message contains all required fields.
 | | ...
 | | Given Path for 2-node testing is set
 | |       ... | ${nodes['TG']} | ${nodes['DUT1']} | ${nodes['TG']}
@@ -70,11 +70,11 @@
 | |       ... | ${tg_to_dut_if1_mac} | ${server_ip}
 | |       ... | ${dut_to_tg_if1_mac} | ${client_ip} | ${client_mask}
 
-| VPP doesn't send DHCP REQUEST after OFFER with wrong XID
+| VPP doesn't send DHCPv4 REQUEST after OFFER with wrong XID
 | | [ Tags ] | EXPECTED_FAILING
-| | [Documentation] | Configure DHCP client on interface to TG. If server sends
-| | ...             | DHCP OFFER with different XID as in DHCP DISCOVER,
-| | ...             | DHCP REQUEST message shouldn't be sent.
+| | [Documentation] | Configure DHCPv4 client on interface to TG. If server
+| | ...             | sends DHCPv4 OFFER with different XID as in DHCPv4
+| | ...             | DISCOVER, DHCPv4 REQUEST message shouldn't be sent.
 | | ...
 | | Given Path for 2-node testing is set
 | |       ... | ${nodes['TG']} | ${nodes['DUT1']} | ${nodes['TG']}
@@ -89,9 +89,9 @@
 | |       ... | offer_xid=${own_xid}
 
 | VPP honors DHCPv4 lease time
-| | [Documentation] | Send IP configuration to the VPP client via DHCP. Address
-| | ...             | is checked with ICMP echo request and there should be no
-| | ...             | reply for echo request when lease has expired.
+| | [Documentation] | Send IP configuration to the VPP client via DHCPv4.
+| | ...             | Address is checked with ICMP echo request and there should
+| | ...             | be no reply for echo request when lease has expired.
 | | ...
 | | Given Path for 2-node testing is set
 | |       ... | ${nodes['TG']} | ${nodes['DUT1']} | ${nodes['TG']}
diff --git a/tests/func/dhcp/dhcp_v4_proxy.robot b/tests/func/dhcp/eth2p-ethip4-ip4base-ip4dhcpproxy-func.robot
index a9c4d23ea9..e503c7fe0f 100644
--- a/tests/func/dhcp/dhcp_v4_proxy.robot
+++ b/tests/func/dhcp/eth2p-ethip4-ip4base-ip4dhcpproxy-func.robot
@@ -20,15 +20,15 @@
 | Force Tags | HW_ENV | VM_ENV | 3_NODE_DOUBLE_LINK_TOPO
 | Test Setup | Func Test Setup
 | Test Teardown | Func Test Teardown
-| Documentation | *DHCP proxy test cases*
+| Documentation | *DHCPv4 proxy test cases*
 | ...
 | ... | *[Top] Network Topologies:* TG = DUT
 | ... |        with two links between the nodes.
 | ... | *[Enc] Packet Encapsulations:* Eth-IPv4-UDP-BOOTP-DHCP
-| ... | *[Cfg] DUT configuration:* DUT is configured with DHCP proxy.
-| ... | *[Ver] TG verification:* Test DHCP packets are sent
+| ... | *[Cfg] DUT configuration:* DUT is configured with DHCPv4 proxy.
+| ... | *[Ver] TG verification:* Test DHCPv4 packets are sent
 | ... |        on TG on first link to DUT and received on TG on second link.
-| ... |        On receive TG verifies if DHCP packets are valid.
+| ... |        On receive TG verifies if DHCPv4 packets are valid.
 
 *** Variables ***
 | ${dut_to_tg_if1_ip}= | 172.16.0.1
@@ -46,8 +46,8 @@
 | | [Documentation] |
 | | ... | [Top] TG=DUT \
 | | ... | [Enc] Eth-IPv4-UDP-BOOTP-DHCP
-| | ... | [Cfg] On DUT setup DHCP proxy.
-| | ... | [Ver] Make TG verify matching DHCP packets between client and DHCP
+| | ... | [Cfg] On DUT setup DHCPv4 proxy.
+| | ... | [Ver] Make TG verify matching DHCPv4 packets between client and DHCPv4
 | | ... | server through DHCP proxy.
 | | ...
 | | Given Path for 2-node testing is set
@@ -71,8 +71,8 @@
 | | [Documentation] |
 | | ... | [Top] TG=DUT \
 | | ... | [Enc] Eth-IPv4-UDP-BOOTP-DHCP
-| | ... | [Cfg] On DUT setup DHCP proxy.
-| | ... | [Ver] Make TG verify matching invalid DHCP packets are dropped.
+| | ... | [Cfg] On DUT setup DHCPv4 proxy.
+| | ... | [Ver] Make TG verify matching invalid DHCPv4 packets are dropped.
 | | ...
 | | Given Path for 2-node testing is set
 | | ... | ${nodes['TG']} | ${nodes['DUT1']} | ${nodes['TG']}
diff --git a/tests/func/dhcp/dhcp_v6_proxy.robot b/tests/func/dhcp/eth2p-ethip6-ip6base-ip6dhcpproxy-func.robot
index eeaf796a28..724150f929 100644
--- a/tests/func/dhcp/dhcp_v6_proxy.robot
+++ b/tests/func/dhcp/eth2p-ethip6-ip6base-ip6dhcpproxy-func.robot
@@ -24,10 +24,10 @@
 | ...
 | ... | *[Top] Network Topologies:* TG = DUT
 | ... |        with two links between the nodes.
-| ... | *[Cfg] DUT configuration:* DUT is configured with DHCP proxy.
-| ... | *[Ver] TG verification:*Test DHCP packets are sent
+| ... | *[Cfg] DUT configuration:* DUT is configured with DHCPv6 proxy.
+| ... | *[Ver] TG verification:* Test DHCPv6 packets are sent
 | ... |        on TG on first link to DUT and received on TG on second link.
-| ... |        On receive TG verifies if DHCP packets are valid
+| ... |        On receive TG verifies if DHCPv6 packets are valid
 | ... | *[Ref] Applicable standard specifications:* RFC 3315
 
 
@@ -43,8 +43,8 @@
 | | [Documentation] |
 | | ... | [Top] TG=DUT
 | | ... | [Cfg] On DUT setup DHCP proxy.
-| | ... | [Ver] Make TG verify matching DHCPv6 packets between client and DHCP \
-| | ... | server through DHCP proxy.
+| | ... | [Ver] Make TG verify matching DHCPv6 packets between client and \
+| | ... | DHCPv6 server through DHCPv6 proxy.
 | | ... | [Ref] RFC 3315
 | | ...
 | | Given Path for 2-node testing is set