aboutsummaryrefslogtreecommitdiffstats
path: root/tests/suites/bridge_domain
diff options
context:
space:
mode:
authorMatej Klotton <mklotton@cisco.com>2016-04-28 16:39:18 +0200
committerMatej Klotton <mklotton@cisco.com>2016-05-11 14:59:12 +0000
commit7dbda72563912b656bde2ee4b4611a0b284b933e (patch)
tree91f9001d402ee5971013a0ebc2edbf28649f4888 /tests/suites/bridge_domain
parent10f3b07a5c883e20ef345c8b1c8e24063a50281f (diff)
Add library for set path variables for testing.
Change-Id: Icb243bacc9329c4bf3bc28098fced473b4e3c991 Signed-off-by: Matej Klotton <mklotton@cisco.com>
Diffstat (limited to 'tests/suites/bridge_domain')
-rw-r--r--tests/suites/bridge_domain/bridge_domain_untagged.robot33
1 files changed, 17 insertions, 16 deletions
diff --git a/tests/suites/bridge_domain/bridge_domain_untagged.robot b/tests/suites/bridge_domain/bridge_domain_untagged.robot
index 6f7cd6ea86..bada88d47a 100644
--- a/tests/suites/bridge_domain/bridge_domain_untagged.robot
+++ b/tests/suites/bridge_domain/bridge_domain_untagged.robot
@@ -14,6 +14,7 @@
*** Settings ***
| Resource | resources/libraries/robot/default.robot
| Resource | resources/libraries/robot/bridge_domain.robot
+| Resource | resources/libraries/robot/testing_path.robot
| Resource | resources/libraries/robot/qemu.robot
| Library | resources.libraries.python.Trace
| Force Tags | HW_ENV | VM_ENV
@@ -47,13 +48,14 @@
| | ... | add there two interfaces and check traffic
| | ... | bidirectionally.
| | [Tags] | 3_NODE_DOUBLE_LINK_TOPO
-| | Given Path for 2-node BD testing is set | ${nodes['TG']} | ${nodes['DUT1']}
+| | Given Path for 2-node testing is set
+| | ... | ${nodes['TG']} | ${nodes['DUT1']} | ${nodes['TG']}
+| | And Interfaces in 2-node path are up
| | When Bridge domain on DUT node is created | ${dut_node} | ${bd_id1}
| | And Interface is added to bridge domain | ${dut_node} | ${dut_to_tg_if1}
| | ... | ${bd_id1}
| | And Interface is added to bridge domain | ${dut_node} | ${dut_to_tg_if2}
| | ... | ${bd_id1}
-| | And Interfaces on all VPP nodes in the path are up | ${dut_node}
| | Then Send and receive ICMPv4 bidirectionally | ${tg_node} | ${tg_to_dut_if1}
| | ... | ${tg_to_dut_if2}
@@ -62,8 +64,9 @@
| | ... | add two interfaces to each bridge domain and check traffic
| | ... | bidirectionally.
| | [Tags] | 3_NODE_SINGLE_LINK_TOPO
-| | Given Path for 3-node BD testing is set | ${nodes['TG']} | ${nodes['DUT1']}
-| | ... | ${nodes['DUT2']}
+| | Given Path for 3-node testing is set
+| | ... | ${nodes['TG']} | ${nodes['DUT1']} | ${nodes['DUT2']} | ${nodes['TG']}
+| | And Interfaces in 3-node path are up
| | When Bridge domain on DUT node is created | ${dut1_node} | ${bd_id1}
| | And Interface is added to bridge domain | ${dut1_node} | ${dut1_to_tg}
| | ... | ${bd_id1}
@@ -74,8 +77,6 @@
| | ... | ${bd_id2}
| | And Interface is added to bridge domain | ${dut2_node} | ${dut2_to_dut1}
| | ... | ${bd_id2}
-| | And Interfaces on all VPP nodes in the path are up | ${dut1_node}
-| | ... | ${dut2_node}
| | Then Send and receive ICMPv4 bidirectionally | ${tg_node} | ${tg_to_dut1}
| | ... | ${tg_to_dut2}
@@ -85,8 +86,9 @@
| | ... | static L2FIB entry on each interface and check traffic
| | ... | bidirectionally.
| | [Tags] | 3_NODE_SINGLE_LINK_TOPO
-| | Given Path for 3-node BD testing is set | ${nodes['TG']} | ${nodes['DUT1']}
-| | ... | ${nodes['DUT2']}
+| | Given Path for 3-node testing is set
+| | ... | ${nodes['TG']} | ${nodes['DUT1']} | ${nodes['DUT2']} | ${nodes['TG']}
+| | And Interfaces in 3-node path are up
| | When Bridge domain on DUT node is created | ${dut1_node} | ${bd_id1}
| | ... | learn=${FALSE}
| | And Interface is added to bridge domain | ${dut1_node} | ${dut1_to_tg}
@@ -119,8 +121,6 @@
| | ... | ${dut2_node}
| | ... | ${dut2_to_tg}
| | ... | ${bd_id2}
-| | And Interfaces on all VPP nodes in the path are up | ${dut1_node}
-| | ... | ${dut2_node}
| | Then Send and receive ICMPv4 bidirectionally | ${tg_node} | ${tg_to_dut1}
| | ... | ${tg_to_dut2}
@@ -133,6 +133,7 @@
| | Given Path for 3-node BD-SHG testing is set | ${nodes['TG']}
| | ... | ${nodes['DUT1']}
| | ... | ${nodes['DUT2']}
+| | And Interfaces in 3-node BD-SHG testing are up
| | When Bridge domain on DUT node is created | ${dut1_node} | ${bd_id1}
| | And Interface is added to bridge domain | ${dut1_node} | ${dut1_to_tg_if1}
| | ... | ${bd_id1} | ${shg1}
@@ -147,8 +148,6 @@
| | ... | ${bd_id2} | ${shg2}
| | And Interface is added to bridge domain | ${dut2_node} | ${dut2_to_dut1}
| | ... | ${bd_id2}
-| | And Interfaces on all VPP nodes in the path are up | ${dut1_node}
-| | ... | ${dut2_node}
| | Then Send and receive ICMPv4 bidirectionally | ${tg_node}
| | ... | ${tg_to_dut1_if1}
| | ... | ${tg_to_dut2_if1}
@@ -175,7 +174,9 @@
| | ... | interfaces and check packet forwarding through VM via two
| | ... | L2 bridge domains with learning enabled.
| | [Tags] | 3_NODE_DOUBLE_LINK_TOPO | VPP_VM_ENV
-| | Given Path for 2-node BD testing is set | ${nodes['TG']} | ${nodes['DUT1']}
+| | Given Path for 2-node testing is set
+| | ... | ${nodes['TG']} | ${nodes['DUT1']} | ${nodes['TG']}
+| | And Interfaces in 2-node path are up
| | When VPP Vhost interfaces for L2BD forwarding are setup | ${dut_node}
| | ... | ${sock1}
| | ... | ${sock2}
@@ -189,7 +190,6 @@
| | ... | ${bd_id2}
| | And Interface is added to bridge domain | ${dut_node} | ${vhost_if2}
| | ... | ${bd_id2}
-| | And Interfaces on all VPP nodes in the path are up | ${dut_node}
| | And VM for Vhost L2BD forwarding is setup | ${dut_node} | ${sock1}
| | ... | ${sock2}
| | Then Send and receive ICMPv4 bidirectionally | ${tg_node} | ${tg_to_dut_if1}
@@ -203,7 +203,9 @@
| | ... | L2 bridge domains with learning disabled (static L2BFIB
| | ... | entries).
| | [Tags] | 3_NODE_DOUBLE_LINK_TOPO | VPP_VM_ENV
-| | Given Path for 2-node BD testing is set | ${nodes['TG']} | ${nodes['DUT1']}
+| | Given Path for 2-node testing is set
+| | ... | ${nodes['TG']} | ${nodes['DUT1']} | ${nodes['TG']}
+| | And Interfaces in 2-node path are up
| | When VPP Vhost interfaces for L2BD forwarding are setup | ${dut_node}
| | ... | ${sock1}
| | ... | ${sock2}
@@ -229,7 +231,6 @@
| | ... | ${bd_id2}
| | And Interface is added to bridge domain | ${dut_node} | ${vhost_if2}
| | ... | ${bd_id2}
-| | And Interfaces on all VPP nodes in the path are up | ${dut_node}
| | And Destination port is added to L2FIB on DUT node | ${tg_node}
| | ... | ${tg_to_dut_if2}
| | ... | ${dut_node}