CSIT-484: HC Test: Lisp

[csit.git] / tests / func / fds / provider_network.robot

diff --git a/tests/func/fds/provider_network.robot b/tests/func/fds/provider_network.robot
index bda5525..612825d 100644 (file)
--- a/tests/func/fds/provider_network.robot
+++ b/tests/func/fds/provider_network.robot
@@ -21,6 +21,7 @@
 | Library  | resources.libraries.python.Trace
 | Force Tags | HW_ENV | VM_ENV | SKIP_PATCH
 | Test Setup | Run Keywords | Setup all DUTs before test
+| ...        | AND          | Save VPP PIDs
 | ...        | AND          | Setup all TGs before traffic script
 | Test Teardown | Run Keywords | Show Packet Trace on All DUTs | ${nodes}
 | ...           | AND          | Show vpp trace dump on all DUTs
@@ -28,6 +29,7 @@
 | ...                          | qemu_node1
 | ...           | AND          | Qemu Teardown | ${dut2_node} | ${qemu_node2}
 | ...                          | qemu_node2
+| ...           | AND          | Check VPP PID in Teardown
 | Documentation | *Provider network FDS related.*
 | ...
 | ... | Test suite uses 3-node topology TG - DUT1 - DUT2 - TG
@@ -167,10 +169,14 @@
 | | ... | ${dut_node} | ${interface_name} | ${vlan_blue}
 | | ${vlan2_name} | ${vlan2_index}= | Create Vlan Subinterface
 | | ... | ${dut_node} | ${interface_name} | ${vlan_red}
-| | L2 Tag Rewrite | ${dut_node} | @{vhosts}[0] | push-1 | ${vlan_blue}
-| | L2 Tag Rewrite | ${dut_node} | @{vhosts}[1] | push-1 | ${vlan_blue}
-| | L2 Tag Rewrite | ${dut_node} | @{vhosts}[2] | push-1 | ${vlan_red}
-| | L2 Tag Rewrite | ${dut_node} | @{vhosts}[3] | push-1 | ${vlan_red}
+| | L2 Vlan Tag Rewrite | ${dut_node} | @{vhosts}[0] | push-1
+| | ... | tag1_id=${vlan_blue}
+| | L2 Vlan Tag Rewrite | ${dut_node} | @{vhosts}[1] | push-1
+| | ... | tag1_id=${vlan_blue}
+| | L2 Vlan Tag Rewrite | ${dut_node} | @{vhosts}[2] | push-1
+| | ... | tag1_id=${vlan_red}
+| | L2 Vlan Tag Rewrite | ${dut_node} | @{vhosts}[3] | push-1
+| | ... | tag1_id=${vlan_red}
 | | Interface is added to bridge domain | ${dut_node}
 | | ... | ${vlan1_index} | ${bid_b} | 0
 | | Interface is added to bridge domain | ${dut_node}
@@ -252,7 +258,6 @@
 | | ... | Send Ping From Node To Dst | ${qemu_node1} | ${dut1_blue2}
 | | ... | ${namespace4}
 
-
 | Negative Scenario Ping From DUT1 - Inter network
 | | [Documentation] | Send ping packets from specified namespaces to other in
 | | ...             | order to test unreachability of namespaces.
@@ -309,7 +314,6 @@
 | | ... | Send Ping From Node To Dst | ${qemu_node2} | ${dut2_blue2}
 | | ... | ${namespace4}
 
-
 | Negative Scenario Ping From DUT2 - Inter network
 | | [Documentation] | Send ping packets from specified namespaces to other in
 | | ...             | order to test unreachability of namespaces.