From 0e28406b43bf4ce145f1530f15dbb00957edf945 Mon Sep 17 00:00:00 2001 From: Jan Gelety Date: Thu, 30 May 2019 16:13:25 +0200 Subject: CSIT-1459: Migrate IP libraries from VAT to PAPI Change-Id: Id84cf9c3afd53260b5bbf658a6a3870aa0c91333 Signed-off-by: Jan Gelety --- .../eth2p-ethip4-ip4base-ip4dhcpclient-func.robot | 24 ++++++++++++---------- 1 file changed, 13 insertions(+), 11 deletions(-) (limited to 'tests/vpp/func/ip4/eth2p-ethip4-ip4base-ip4dhcpclient-func.robot') 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 db32c07ab1..3dbb2abb11 100644 --- a/tests/vpp/func/ip4/eth2p-ethip4-ip4base-ip4dhcpclient-func.robot +++ b/tests/vpp/func/ip4/eth2p-ethip4-ip4base-ip4dhcpclient-func.robot @@ -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 | 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 | gateway=${NONE} -| | ... | interface=local | use_sw_index=${FALSE} | resolve_attempts=${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 | gateway=${NONE} -| | ... | interface=local | use_sw_index=${FALSE} | resolve_attempts=${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 | gateway=${NONE} -| | ... | interface=local | use_sw_index=${FALSE} | resolve_attempts=${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} -- cgit 1.2.3-korg