X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=tests%2Fvpp%2Ffunc%2Fip4%2Feth2p-ethip4-ip4base-ip4dhcpclient-func.robot;h=3dbb2abb1112a9dee5bb792df6cd467712a7b04f;hb=33fb34665214bbbd0a4b3154169b21c2da01f69b;hp=5960e8379770a212947d07c64f279b6cf7f0a88b;hpb=6721e7f09aa95bff6622068332a3f56afad9c87b;p=csit.git

diff --git a/tests/vpp/func/ip4/eth2p-ethip4-ip4base-ip4dhcpclient-func.robot b/tests/vpp/func/ip4/eth2p-ethip4-ip4base-ip4dhcpclient-func.robot
index 5960e83797..3dbb2abb11 100644
--- a/tests/vpp/func/ip4/eth2p-ethip4-ip4base-ip4dhcpclient-func.robot
+++ b/tests/vpp/func/ip4/eth2p-ethip4-ip4base-ip4dhcpclient-func.robot
@@ -1,4 +1,4 @@
-# Copyright (c) 2016 Cisco and/or its affiliates.
+# Copyright (c) 2019 Cisco and/or its affiliates.
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
 # You may obtain a copy of the License at:
@@ -12,15 +12,20 @@
 # limitations under the License.
 
 *** Settings ***
+| Library | resources.libraries.python.Trace
+| ...
+| Resource | resources/libraries/robot/ip/ip4.robot
+| Resource | resources/libraries/robot/features/dhcp_client.robot
 | Resource | resources/libraries/robot/shared/default.robot
 | Resource | resources/libraries/robot/shared/testing_path.robot
-| Resource | resources/libraries/robot/features/dhcp_client.robot
-| Resource | resources/libraries/robot/ip/ip4.robot
-| Library | resources.libraries.python.Trace
-| Force Tags | HW_ENV | VM_ENV | 3_NODE_DOUBLE_LINK_TOPO
+| ...
+| Force Tags | HW_ENV | VM_ENV | 3_NODE_DOUBLE_LINK_TOPO | SKIP_VPP_PATCH
+| ...
 | Test Setup | Set up functional test
+| ...
 | Test Teardown | Tear down functional test
-| Documentation | *DHCPv4 Client related test cases*
+| ...
+| Documentation | DHCPv4 Client related test cases
 
 *** Variables ***
 | ${client_hostname}= | dhcp-client
@@ -63,8 +68,7 @@
 | | Given Configure path in 2-node circular topology
 | | ... | ${nodes['TG']} | ${nodes['DUT1']} | ${nodes['TG']}
 | | And Set interfaces in 2-node circular topology up
-| | And VPP Route Add | ${dut_node} | 255.255.255.255 | 32 | ${NONE} | local
-| | ... | ${FALSE} | ${NONE}
+| | And VPP Route Add | ${dut_node} | 255.255.255.255 | 32 | local=${TRUE}
 | | When Set DHCP client on Interface | ${dut_node} | ${dut_to_tg_if1}
 | | Then Verify DHCP REQUEST after OFFER | ${tg_node} | ${tg_to_dut_if1}
 | | ... | ${tg_to_dut_if1_mac} | ${server_ip}
@@ -79,8 +83,7 @@
 | | Given Configure path in 2-node circular topology
 | | ... | ${nodes['TG']} | ${nodes['DUT1']} | ${nodes['TG']}
 | | And Set interfaces in 2-node circular topology up
-| | And VPP Route Add | ${dut_node} | 255.255.255.255 | 32 | ${NONE} | local
-| | ... | ${FALSE} | ${NONE}
+| | And VPP Route Add | ${dut_node} | 255.255.255.255 | 32 | local=${TRUE}
 | | When Set DHCP client on Interface | ${dut_node} | ${dut_to_tg_if1}
 | | Then Run Keyword And Expect Error | DHCP REQUEST Rx timeout
 | | ... | Verify DHCP REQUEST after OFFER | ${tg_node} | ${tg_to_dut_if1}
@@ -96,15 +99,14 @@
 | | Given Configure path in 2-node circular topology
 | | ... | ${nodes['TG']} | ${nodes['DUT1']} | ${nodes['TG']}
 | | And Set interfaces in 2-node circular topology up
-| | And VPP Route Add | ${dut_node} | 255.255.255.255 | 32 | ${NONE} | local
-| | ... | ${FALSE} | ${NONE}
+| | And VPP Route Add | ${dut_node} | 255.255.255.255 | 32 | local=${TRUE}
 | | When Set DHCP client on Interface | ${dut_node} | ${dut_to_tg_if1}
 | | And Configure IP on client via DHCP
 | | ... | ${tg_node} | ${tg_to_dut_if1}
 | | ... | ${tg_to_dut_if1_mac} | ${server_ip}
 | | ... | ${client_ip} | ${client_mask}
 | | ... | ${lease_time}
-| | And Add Arp On Dut | ${dut_node} | ${dut_to_tg_if1} | ${server_ip}
+| | And VPP Add IP Neighbor | ${dut_node} | ${dut_to_tg_if1} | ${server_ip}
 | | ... | ${tg_to_dut_if1_mac}
 | | Then Send ICMP echo request and verify answer
 | | ... | ${tg_node} | ${tg_to_dut_if1}