From 284293a3ff4ba6508f8d02b644cfd1a60966382c Mon Sep 17 00:00:00 2001 From: Eyal Bari Date: Tue, 6 Jun 2017 14:18:55 +0300 Subject: L2-VTR: add vtr tests re-enable l2 fib flush tests reorder l2bd multi instance tests - move flags test as last enabling of uu-flood will now flood when entry is stale Change-Id: I052663ec3eb4acee5f296fb7525dd535924e0003 Signed-off-by: Eyal Bari --- test/test_l2bd_multi_instance.py | 60 ++++++++++++++++++++-------------------- 1 file changed, 30 insertions(+), 30 deletions(-) (limited to 'test/test_l2bd_multi_instance.py') diff --git a/test/test_l2bd_multi_instance.py b/test/test_l2bd_multi_instance.py index 1cf1b13d728..0bb9e5974d1 100644 --- a/test/test_l2bd_multi_instance.py +++ b/test/test_l2bd_multi_instance.py @@ -403,33 +403,7 @@ class TestL2bdMultiInst(VppTestCase): self.run_verify_test() def test_l2bd_inst_02(self): - """ L2BD Multi-instance test 2 - update data of 5 BDs - """ - # Config 2 - # Update data of 5 BDs (disable learn, forward, flood, uu-flood) - self.set_bd_flags(self.bd_list[0], learn=False, forward=False, - flood=False, uu_flood=False) - self.set_bd_flags(self.bd_list[1], forward=False) - self.set_bd_flags(self.bd_list[2], flood=False) - self.set_bd_flags(self.bd_list[3], uu_flood=False) - self.set_bd_flags(self.bd_list[4], learn=False) - - # Verify 2 - # Skipping check of uu_flood as it is not returned by - # bridge_domain_dump api command - self.verify_bd(self.bd_list[0], learn=False, forward=False, - flood=False, uu_flood=False) - self.verify_bd(self.bd_list[1], learn=True, forward=False, - flood=True, uu_flood=True) - self.verify_bd(self.bd_list[2], learn=True, forward=True, - flood=False, uu_flood=True) - self.verify_bd(self.bd_list[3], learn=True, forward=True, - flood=True, uu_flood=False) - self.verify_bd(self.bd_list[4], learn=False, forward=True, - flood=True, uu_flood=True) - - def test_l2bd_inst_03(self): - """ L2BD Multi-instance 3 - delete 2 BDs + """ L2BD Multi-instance test 2 - delete 2 BDs """ # Config 3 # Delete 2 BDs @@ -444,8 +418,8 @@ class TestL2bdMultiInst(VppTestCase): # Test 3 self.run_verify_test() - def test_l2bd_inst_04(self): - """ L2BD Multi-instance test 4 - add 2 BDs + def test_l2bd_inst_03(self): + """ L2BD Multi-instance test 3 - add 2 BDs """ # Config 4 # Create 5 BDs, put interfaces to these BDs and send MAC learning @@ -460,8 +434,34 @@ class TestL2bdMultiInst(VppTestCase): # self.vapi.cli("clear trace") self.run_verify_test() + def test_l2bd_inst_04(self): + """ L2BD Multi-instance test 4 - update data of 5 BDs + """ + # Config 2 + # Update data of 5 BDs (disable learn, forward, flood, uu-flood) + self.set_bd_flags(self.bd_list[0], learn=False, forward=False, + flood=False, uu_flood=False) + self.set_bd_flags(self.bd_list[1], forward=False) + self.set_bd_flags(self.bd_list[2], flood=False) + self.set_bd_flags(self.bd_list[3], uu_flood=False) + self.set_bd_flags(self.bd_list[4], learn=False) + + # Verify 2 + # Skipping check of uu_flood as it is not returned by + # bridge_domain_dump api command + self.verify_bd(self.bd_list[0], learn=False, forward=False, + flood=False, uu_flood=False) + self.verify_bd(self.bd_list[1], learn=True, forward=False, + flood=True, uu_flood=True) + self.verify_bd(self.bd_list[2], learn=True, forward=True, + flood=False, uu_flood=True) + self.verify_bd(self.bd_list[3], learn=True, forward=True, + flood=True, uu_flood=False) + self.verify_bd(self.bd_list[4], learn=False, forward=True, + flood=True, uu_flood=True) + def test_l2bd_inst_05(self): - """ L2BD Multi-instance 5 - delete 5 BDs + """ L2BD Multi-instance test 5 - delete 5 BDs """ # Config 5 # Delete 5 BDs -- cgit 1.2.3-korg