X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=test%2Ftest_l2_fib.py;h=1cee58982e53168f6e9cce5ded21f28d1dc37fd6;hb=8006c6a;hp=ba2f787bdd90e6aac5d1a57d3e02763f5c9a28dd;hpb=755b1403daeddc9518bf1383b89945966404643e;p=vpp.git

diff --git a/test/test_l2_fib.py b/test/test_l2_fib.py
index ba2f787bdd9..1cee58982e5 100644
--- a/test/test_l2_fib.py
+++ b/test/test_l2_fib.py
@@ -69,6 +69,12 @@ from scapy.layers.inet import IP, UDP
 
 from framework import VppTestCase, VppTestRunner
 from util import Host, ppp
+from vpp_papi import mac_pton
+
+# from src/vnet/l2/l2_fib.h
+MAC_EVENT_ACTION_ADD = 0
+MAC_EVENT_ACTION_DELETE = 1
+MAC_EVENT_ACTION_MOVE = 2
 
 
 class TestL2fib(VppTestCase):
@@ -76,7 +82,8 @@ class TestL2fib(VppTestCase):
 
     @classmethod
     def bd_ifs(cls, bd_id):
-        return range((bd_id - 1) * cls.n_ifs_per_bd, bd_id * cls.n_ifs_per_bd)
+        return range((bd_id - 1) * cls.n_ifs_per_bd,
+                     bd_id * cls.n_ifs_per_bd - 1)
 
     @classmethod
     def setUpClass(cls):
@@ -93,7 +100,7 @@ class TestL2fib(VppTestCase):
             n_brs = cls.n_brs = range(1, 3)
             cls.n_ifs_per_bd = 4
             n_ifs = range(cls.n_ifs_per_bd * len(cls.n_brs))
-            # Create 4 pg interfaces
+            # Create pg interfaces
             cls.create_pg_interfaces(n_ifs)
 
             cls.flows = dict()
@@ -199,7 +206,7 @@ class TestL2fib(VppTestCase):
             swif = pg_if.sw_if_index
             for host in hosts[swif]:
                 self.vapi.l2fib_add_del(
-                    host.mac, bd_id, swif, static_mac=1)
+                    mac_pton(host.mac), bd_id, swif, static_mac=1)
 
     def delete_l2_fib_entry(self, bd_id, hosts):
         """
@@ -212,7 +219,7 @@ class TestL2fib(VppTestCase):
             swif = pg_if.sw_if_index
             for host in hosts[swif]:
                 self.vapi.l2fib_add_del(
-                    host.mac, bd_id, swif, is_add=0)
+                    mac_pton(host.mac), bd_id, swif, is_add=0)
 
     def flush_int(self, swif, learned_hosts):
         """
@@ -385,8 +392,8 @@ class TestL2fib(VppTestCase):
         self.config_l2_fib_entries(bd_id, hosts)
         self.run_verify_test(bd_id, hosts, hosts)
 
-    def test_l2_fib_delete12(self):
-        """ L2 FIB - program 100 + delete 12 MACs
+    def test_l2_fib_program100_delete12(self):
+        """ L2 FIB - program 100, delete 12 MACs
         """
         bd_id = 1
         hosts = self.create_hosts(100, subnet=17)
@@ -397,8 +404,8 @@ class TestL2fib(VppTestCase):
         self.run_verify_test(bd_id, hosts, hosts)
         self.run_verify_negat_test(bd_id, hosts, del_hosts)
 
-    def test_l2_fib_add100_add100(self):
-        """ L2 FIB - program 100 + 100 MACs
+    def test_l2_fib_program100_add100(self):
+        """ L2 FIB - program 100, add 100 MACs
         """
         bd_id = 1
         hosts = self.create_hosts(100, subnet=17)
@@ -408,7 +415,7 @@ class TestL2fib(VppTestCase):
         self.run_verify_test(bd_id, hosts, hosts2)
 
     def test_l2_fib_program10_learn10(self):
-        """ L2 FIB - Program 10 MACs, learn 10
+        """ L2 FIB - program 10 MACs, learn 10
         """
         hosts = self.create_hosts(20, subnet=35)
         lhosts = self.split_hosts(hosts, 10)
@@ -483,7 +490,7 @@ class TestL2fib(VppTestCase):
         evs = self.vapi.collect_events()
         learned_macs = {
             e.mac[i].mac_addr for e in evs for i in range(e.n_macs)
-            if not e.mac[i].is_del}
+            if e.mac[i].action == MAC_EVENT_ACTION_ADD}
         macs = {h.bin_mac for swif in self.bd_ifs(bd1)
                 for h in hosts[self.pg_interfaces[swif].sw_if_index]}
         self.vapi.want_macs_learn_events(enable_disable=0)
@@ -507,7 +514,7 @@ class TestL2fib(VppTestCase):
         self.assertGreater(len(evs), 0)
         learned_macs = {
             e.mac[i].mac_addr for e in evs for i in range(e.n_macs)
-            if not e.mac[i].is_del}
+            if e.mac[i].action == MAC_EVENT_ACTION_ADD}
         macs = {h.bin_mac for swif in self.bd_ifs(bd1)
                 for h in hosts[self.pg_interfaces[swif].sw_if_index]}