X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=test%2Ftest_l2bd_learnlimit.py;h=434a2922a647c6347ed62695f61d494d2d3446b5;hb=4c45d6fef426863cce7a6f6cb42150897a674ed9;hp=e59496eebf0e35c0a65e406c972789ce1e1eab89;hpb=5f93e3b7f85e2257406cf601e5f231a872100fcf;p=vpp.git

diff --git a/test/test_l2bd_learnlimit.py b/test/test_l2bd_learnlimit.py
old mode 100644
new mode 100755
index e59496eebf0..434a2922a64
--- a/test/test_l2bd_learnlimit.py
+++ b/test/test_l2bd_learnlimit.py
@@ -12,7 +12,7 @@ from util import Host, ppp
 
 
 class TestL2LearnLimit(VppTestCase):
-    """ L2 Learn limit Test Case """
+    """ L2 Learn no limit Test Case """
 
     @classmethod
     def setUpClass(self):
@@ -29,7 +29,7 @@ class TestL2LearnLimit(VppTestCase):
         interfaces. Create host IPv4 address for every host MAC address.
 
         :param int n_hosts_per_if: Number of per interface hosts to
-        create MAC/IPv4 addresses for.
+            create MAC/IPv4 addresses for.
         """
 
         hosts = dict()
@@ -62,7 +62,7 @@ class TestL2LearnLimit(VppTestCase):
         self.logger.info("Sending broadcast eth frames for MAC learning")
         self.pg_start()
 
-    def test_l2bd_learnlimit01(self):
+    def test_l2bd_learnlimit(self):
         """ L2BD test without learn Limit
         """
         hosts = self.create_hosts(self.pg_interfaces[0], 20, 1)
@@ -72,61 +72,6 @@ class TestL2LearnLimit(VppTestCase):
         # check that 20 macs are learned.
         self.assertEqual(len(lfs), 20)
 
-    def test_l2bd_learnlimit02(self):
-        """ L2BD test with learn Limit
-        """
-        self.vapi.want_l2_macs_events(enable_disable=1, learn_limit=10)
-        hosts = self.create_hosts(self.pg_interfaces[0], 20, 1)
-        fhosts = self.create_hosts(self.pg_interfaces[1], 1, 2)
-
-        # inject 20 mac addresses on bd1
-        self.learn_hosts(self.pg_interfaces[0], 1, hosts)
-
-        # inject 1 mac address on bd2
-        self.learn_hosts(self.pg_interfaces[1], 2, fhosts)
-
-        lfs1 = self.vapi.l2_fib_table_dump(1)
-        lfs2 = self.vapi.l2_fib_table_dump(2)
-
-        # check that only 10 macs are learned.
-        self.assertEqual(len(lfs1), 10)
-
-        # check that bd2 was not able to learn
-        self.assertEqual(len(lfs2), 0)
-
-    def test_l2bd_learnlimit03(self):
-        """ L2BD test with bridge domain limit
-        """
-        self.vapi.bridge_domain_set_default_learn_limit(4)
-        self.vapi.bridge_domain_add_del(bd_id=3)
-        self.vapi.sw_interface_set_l2_bridge(
-            self.pg_interfaces[2].sw_if_index, bd_id=3)
-
-        self.vapi.bridge_domain_set_learn_limit(2, 5)
-
-        hosts = self.create_hosts(self.pg_interfaces[1], 20, 2)
-        fhosts = self.create_hosts(self.pg_interfaces[2], 20, 3)
-
-        # inject 20 mac addresses on bd2
-        self.learn_hosts(self.pg_interfaces[1], 2, hosts)
-
-        # inject 20 macs address on bd3
-        self.learn_hosts(self.pg_interfaces[2], 3, fhosts)
-
-        lfs1 = self.vapi.l2_fib_table_dump(2)
-        lfs2 = self.vapi.l2_fib_table_dump(3)
-
-        # check that only 5 macs are learned.
-        self.assertEqual(len(lfs1), 5)
-
-        # check that only 4 macs are learned.
-        self.assertEqual(len(lfs2), 4)
-
-        self.vapi.sw_interface_set_l2_bridge(
-            rx_sw_if_index=self.pg_interfaces[2].sw_if_index,
-            bd_id=3, enable=0)
-        self.vapi.bridge_domain_add_del(is_add=0, bd_id=3)
-
     def setUp(self):
         super(TestL2LearnLimit, self).setUp()
 
@@ -148,12 +93,6 @@ class TestL2LearnLimit(VppTestCase):
             bd_id=2, enable=0)
         self.vapi.bridge_domain_add_del(bd_id=1, is_add=0)
         self.vapi.bridge_domain_add_del(bd_id=2, is_add=0)
-        i = 0
-        while (len(self.vapi.l2_fib_table_dump(bd_id=0xffffffff)) != 0):
-            time.sleep(1)
-            i = i + 1
-            if i == 30:
-                self.assertTrue(False)
 
 
 if __name__ == '__main__':