Code Review
/
vpp.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
tests: fix setting gcov flag for test-cov target
[vpp.git]
/
test
/
test_l2bd_learnlimit_bdenabled.py
diff --git
a/test/test_l2bd_learnlimit_bdenabled.py
b/test/test_l2bd_learnlimit_bdenabled.py
index
503a7d8
..
36c49ed
100644
(file)
--- a/
test/test_l2bd_learnlimit_bdenabled.py
+++ b/
test/test_l2bd_learnlimit_bdenabled.py
@@
-7,21
+7,21
@@
from scapy.packet import Raw
from scapy.layers.l2 import Ether
from scapy.layers.inet import IP, UDP
from scapy.layers.l2 import Ether
from scapy.layers.inet import IP, UDP
-from framework import VppTestCase, VppTestRunner
, running_extended_tests
+from framework import VppTestCase, VppTestRunner
from util import Host, ppp
from util import Host, ppp
-class TestL2LearnLimit(VppTestCase):
- """
L2 Bridge Domain Learn limit Test Case
"""
+class TestL2LearnLimit
BdEnable
(VppTestCase):
+ """
L2 Bridge Domain Learn limit Test Case
"""
@classmethod
def setUpClass(self):
@classmethod
def setUpClass(self):
- super(TestL2LearnLimit, self).setUpClass()
+ super(TestL2LearnLimit
BdEnable
, self).setUpClass()
self.create_pg_interfaces(range(3))
@classmethod
def tearDownClass(cls):
self.create_pg_interfaces(range(3))
@classmethod
def tearDownClass(cls):
- super(TestL2LearnLimit, cls).tearDownClass()
+ super(TestL2LearnLimit
BdEnable
, cls).tearDownClass()
def create_hosts(self, pg_if, n_hosts_per_if, subnet):
"""
def create_hosts(self, pg_if, n_hosts_per_if, subnet):
"""
@@
-35,11
+35,15
@@
class TestL2LearnLimit(VppTestCase):
hosts = dict()
swif = pg_if.sw_if_index
hosts = dict()
swif = pg_if.sw_if_index
- def mac(j): return "00:00:%02x:ff:%02x:%02x" % (subnet, swif, j)
+ def mac(j):
+ return "00:00:%02x:ff:%02x:%02x" % (subnet, swif, j)
- def ip(j): return "172.%02u.1%02x.%u" % (subnet, swif, j)
+ def ip(j):
+ return "172.%02u.1%02x.%u" % (subnet, swif, j)
+
+ def h(j):
+ return Host(mac(j), ip(j))
- def h(j): return Host(mac(j), ip(j))
hosts[swif] = [h(j) for j in range(n_hosts_per_if)]
return hosts
hosts[swif] = [h(j) for j in range(n_hosts_per_if)]
return hosts
@@
-56,20
+60,19
@@
class TestL2LearnLimit(VppTestCase):
self.vapi.bridge_flags(bd_id=bd_id, is_set=1, flags=1)
swif = pg_if.sw_if_index
self.vapi.bridge_flags(bd_id=bd_id, is_set=1, flags=1)
swif = pg_if.sw_if_index
- packets = [Ether(dst="ff:ff:ff:ff:ff:ff", src=host.mac)
- for host in hosts[swif]]
+ packets = [Ether(dst="ff:ff:ff:ff:ff:ff", src=host.mac) for host in hosts[swif]]
pg_if.add_stream(packets)
self.logger.info("Sending broadcast eth frames for MAC learning")
self.pg_start()
def test_l2bd_learnlimit(self):
pg_if.add_stream(packets)
self.logger.info("Sending broadcast eth frames for MAC learning")
self.pg_start()
def test_l2bd_learnlimit(self):
- """ L2BD test with bridge domain limit
- """
+ """L2BD test with bridge domain limit"""
self.vapi.want_l2_macs_events(enable_disable=1, learn_limit=1000)
self.vapi.bridge_domain_set_default_learn_limit(4)
self.vapi.want_l2_macs_events(enable_disable=1, learn_limit=1000)
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_add_del_v2(
+ bd_id=3, is_add=1, flood=1, uu_flood=1, forward=1, learn=1
+ )
+ 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)
self.vapi.bridge_domain_set_learn_limit(2, 5)
@@
-92,32
+95,34
@@
class TestL2LearnLimit(VppTestCase):
self.assertEqual(len(lfs2), 4)
self.vapi.sw_interface_set_l2_bridge(
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)
+ rx_sw_if_index=self.pg_interfaces[2].sw_if_index,
bd_id=3, enable=0
+ )
+ self.vapi.bridge_domain_add_del
_v2
(is_add=0, bd_id=3)
def setUp(self):
def setUp(self):
- super(TestL2LearnLimit, self).setUp()
+ super(TestL2LearnLimit
BdEnable
, self).setUp()
- self.vapi.bridge_domain_add_del(bd_id=1)
- self.vapi.bridge_domain_add_del(bd_id=2)
+ self.vapi.bridge_domain_add_del_v2(
+ bd_id=1, is_add=1, flood=1, uu_flood=1, forward=1, learn=1
+ )
+ self.vapi.bridge_domain_add_del_v2(
+ bd_id=2, is_add=1, flood=1, uu_flood=1, forward=1, learn=1
+ )
- self.vapi.sw_interface_set_l2_bridge(
- self.pg_interfaces[0].sw_if_index, bd_id=1)
- self.vapi.sw_interface_set_l2_bridge(
- self.pg_interfaces[1].sw_if_index, bd_id=2)
+ self.vapi.sw_interface_set_l2_bridge(self.pg_interfaces[0].sw_if_index, bd_id=1)
+ self.vapi.sw_interface_set_l2_bridge(self.pg_interfaces[1].sw_if_index, bd_id=2)
def tearDown(self):
def tearDown(self):
- super(TestL2LearnLimit, self).tearDown()
+ super(TestL2LearnLimit
BdEnable
, self).tearDown()
self.vapi.sw_interface_set_l2_bridge(
self.vapi.sw_interface_set_l2_bridge(
- rx_sw_if_index=self.pg_interfaces[0].sw_if_index,
-
bd_id=1, enable=0
)
+ rx_sw_if_index=self.pg_interfaces[0].sw_if_index,
bd_id=1, enable=0
+ )
self.vapi.sw_interface_set_l2_bridge(
self.vapi.sw_interface_set_l2_bridge(
- rx_sw_if_index=self.pg_interfaces[1].sw_if_index,
-
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)
+ rx_sw_if_index=self.pg_interfaces[1].sw_if_index,
bd_id=2, enable=0
+ )
+ self.vapi.bridge_domain_add_del
_v2
(bd_id=1, is_add=0)
+ self.vapi.bridge_domain_add_del
_v2
(bd_id=2, is_add=0)
-if __name__ ==
'__main__'
:
+if __name__ ==
"__main__"
:
unittest.main(testRunner=VppTestRunner)
unittest.main(testRunner=VppTestRunner)