CSIT-1459: Migrate IP libraries from VAT to PAPI

[csit.git] / tests / vpp / func / telemetry / eth2p-ethip4-ip4base-spanrx-func.robot

diff --git a/tests/vpp/func/telemetry/eth2p-ethip4-ip4base-spanrx-func.robot b/tests/vpp/func/telemetry/eth2p-ethip4-ip4base-spanrx-func.robot
index 37e5b04..d3cf563 100644 (file)
--- a/tests/vpp/func/telemetry/eth2p-ethip4-ip4base-spanrx-func.robot
+++ b/tests/vpp/func/telemetry/eth2p-ethip4-ip4base-spanrx-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,16 +12,20 @@
 # limitations under the License.
 
 *** Settings ***
+| Library  | resources.libraries.python.IPUtil
+| Library  | resources.libraries.python.Trace
+| Library  | resources.libraries.python.telemetry.SPAN
+| ...
 | Resource | resources/libraries/robot/shared/default.robot
 | Resource | resources/libraries/robot/shared/testing_path.robot
 | Resource | resources/libraries/robot/telemetry/span.robot
-| Library  | resources.libraries.python.Trace
-| Library  | resources.libraries.python.IPv4Util
-| Library  | resources.libraries.python.IPv4Setup
-| Library  | resources.libraries.python.telemetry.SPAN
+| ...
 | Force Tags | HW_ENV | VM_ENV | 3_NODE_DOUBLE_LINK_TOPO
+| ...
 | Test Setup | Set up functional test
+| ...
 | Test Teardown | Tear down functional test
+| ...
 | Documentation | *SPAN test suite*
 | ... | *[Top] Network Topologies:* TG=DUT1 2-node topology with two
 | ... | links between nodes.
@@ -46,10 +50,10 @@
 | | ... | [Ver] Make TG send an ARP packet to DUT through one interface,\
 | | ... | then receive a copy of sent packet and of DUT's ARP reply\
 | | ... | on the second interface.
-| | Given Configure path in 2-node circular topology | ${nodes['TG']} | ${nodes['DUT1']}
-| | ... | ${nodes['TG']}
+| | Given Configure path in 2-node circular topology | ${nodes['TG']}
+| | ... | ${nodes['DUT1']} | ${nodes['TG']}
 | | And Set interfaces in 2-node circular topology up
-| | And Set interface Address | ${dut_node} | ${dut_to_tg_if1}
+| | And VPP Interface Set IP Address | ${dut_node} | ${dut_to_tg_if1}
 | | ... | ${dut_to_tg_if1_ip4} | ${prefix}
 | | And Set SPAN Mirroring | ${dut_node} | ${dut_to_tg_if1} | ${dut_to_tg_if2}
 | | Then Send Packet And Check Received Copies | ${tg_node}
@@ -65,13 +69,13 @@
 | | ... | [Ver] Make TG send an ICMP packet to DUT through one interface,\
 | | ... | then receive a copy of sent packet and of DUT's ICMP reply\
 | | ... | on the other interface.
-| | Given Configure path in 2-node circular topology | ${nodes['TG']} | ${nodes['DUT1']}
-| | ... | ${nodes['TG']}
+| | Given Configure path in 2-node circular topology | ${nodes['TG']}
+| | ... | ${nodes['DUT1']} | ${nodes['TG']}
 | | And Set interfaces in 2-node circular topology up
-| | And Set interface Address | ${dut_node} | ${dut_to_tg_if1}
+| | And VPP Interface Set IP Address | ${dut_node} | ${dut_to_tg_if1}
 | | ... | ${dut_to_tg_if1_ip4} | ${prefix}
-| | And Add ARP on DUT | ${dut_node} | ${dut_to_tg_if1} | ${tg_to_dut_if1_ip4}
-| | ... | ${tg_to_dut_if1_mac}
+| | And VPP Add IP Neighbor | ${dut_node} | ${dut_to_tg_if1}
+| | ... | ${tg_to_dut_if1_ip4} | ${tg_to_dut_if1_mac}
 | | And Set SPAN Mirroring | ${dut_node} | ${dut_to_tg_if1} | ${dut_to_tg_if2}
 | | Then Send Packet And Check Received Copies | ${tg_node}
 | | ... | ${tg_to_dut_if1} | ${tg_to_dut_if1_mac}