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: use proper unit test skip instead of prints
[vpp.git]
/
test
/
test_l2bd_learnlimit.py
diff --git
a/test/test_l2bd_learnlimit.py
b/test/test_l2bd_learnlimit.py
index
fe798fc
..
fd33bd4
100644
(file)
--- a/
test/test_l2bd_learnlimit.py
+++ b/
test/test_l2bd_learnlimit.py
@@
-1,18
+1,16
@@
#!/usr/bin/env python3
import unittest
#!/usr/bin/env python3
import unittest
-import random
-from scapy.packet import Raw
from scapy.layers.l2 import Ether
from scapy.layers.l2 import Ether
-from scapy.layers.inet import IP, UDP
-from framework import VppTestCase, VppTestRunner, running_extended_tests
-from util import Host, ppp
+from framework import VppTestCase
+from asfframework import VppTestRunner
+from util import Host
class TestL2LearnLimit(VppTestCase):
class TestL2LearnLimit(VppTestCase):
- """
L2 Learn no limit Test Case
"""
+ """
L2 Learn no limit Test Case
"""
@classmethod
def setUpClass(self):
@classmethod
def setUpClass(self):
@@
-29,17
+27,21
@@
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
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()
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,15
+58,13
@@
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 without learn Limit
- """
+ """L2BD test without learn Limit"""
hosts = self.create_hosts(self.pg_interfaces[0], 20, 1)
self.learn_hosts(self.pg_interfaces[0], 1, hosts)
lfs = self.vapi.l2_fib_table_dump(1)
hosts = self.create_hosts(self.pg_interfaces[0], 20, 1)
self.learn_hosts(self.pg_interfaces[0], 1, hosts)
lfs = self.vapi.l2_fib_table_dump(1)
@@
-75,25
+75,27
@@
class TestL2LearnLimit(VppTestCase):
def setUp(self):
super(TestL2LearnLimit, self).setUp()
def setUp(self):
super(TestL2LearnLimit, 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, forward=1, learn=1, uu_flood=1
+ )
+ self.vapi.bridge_domain_add_del_v2(
+ bd_id=2, is_add=1, flood=1, forward=1, learn=1, uu_flood=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):
super(TestL2LearnLimit, self).tearDown()
self.vapi.sw_interface_set_l2_bridge(
def tearDown(self):
super(TestL2LearnLimit, self).tearDown()
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)