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: refactor asf framework code
[vpp.git]
/
test
/
test_bfd.py
diff --git
a/test/test_bfd.py
b/test/test_bfd.py
index
67ddb4b
..
0842fd7
100644
(file)
--- a/
test/test_bfd.py
+++ b/
test/test_bfd.py
@@
-11,8
+11,7
@@
import reprlib
import time
import unittest
from random import randint, shuffle, getrandbits
import time
import unittest
from random import randint, shuffle, getrandbits
-from socket import AF_INET, AF_INET6, inet_ntop
-from struct import pack, unpack
+from socket import AF_INET, AF_INET6
import scapy.compat
from scapy.layers.inet import UDP, IP
import scapy.compat
from scapy.layers.inet import UDP, IP
@@
-30,10
+29,13
@@
from bfd import (
BFDState,
BFD_vpp_echo,
)
BFDState,
BFD_vpp_echo,
)
-from framework import tag_fixme_vpp_workers, tag_fixme_ubuntu2204, tag_fixme_debian11
-from framework import is_distro_ubuntu2204, is_distro_debian11
-from framework import VppTestCase, VppTestRunner
-from framework import tag_run_solo
+from framework import VppTestCase
+from asfframework import (
+ tag_fixme_vpp_workers,
+ tag_fixme_debian11,
+ tag_run_solo,
+ VppTestRunner,
+)
from util import ppp
from vpp_ip import DpoProto
from vpp_ip_route import VppIpRoute, VppRoutePath
from util import ppp
from vpp_ip import DpoProto
from vpp_ip_route import VppIpRoute, VppRoutePath
@@
-41,7
+43,6
@@
from vpp_lo_interface import VppLoInterface
from vpp_papi_provider import UnexpectedApiReturnValueError, CliFailedCommandError
from vpp_pg_interface import CaptureTimeoutError, is_ipv6_misc
from vpp_gre_interface import VppGreInterface
from vpp_papi_provider import UnexpectedApiReturnValueError, CliFailedCommandError
from vpp_pg_interface import CaptureTimeoutError, is_ipv6_misc
from vpp_gre_interface import VppGreInterface
-from vpp_papi import VppEnum
USEC_IN_SEC = 1000000
USEC_IN_SEC = 1000000
@@
-819,7
+820,6
@@
def bfd_stats_diff(stats_before, stats_after):
@tag_run_solo
@tag_run_solo
-@tag_fixme_ubuntu2204
@tag_fixme_debian11
class BFD4TestCase(VppTestCase):
"""Bidirectional Forwarding Detection (BFD)"""
@tag_fixme_debian11
class BFD4TestCase(VppTestCase):
"""Bidirectional Forwarding Detection (BFD)"""
@@
-831,10
+831,6
@@
class BFD4TestCase(VppTestCase):
@classmethod
def setUpClass(cls):
@classmethod
def setUpClass(cls):
- if (is_distro_ubuntu2204 == True or is_distro_debian11 == True) and not hasattr(
- cls, "vpp"
- ):
- return
super(BFD4TestCase, cls).setUpClass()
cls.vapi.cli("set log class bfd level debug")
try:
super(BFD4TestCase, cls).setUpClass()
cls.vapi.cli("set log class bfd level debug")
try:
@@
-1324,7
+1320,6
@@
class BFD4TestCase(VppTestCase):
stats_after = bfd_grab_stats_snapshot(self)
diff = bfd_stats_diff(stats_before, stats_after)
self.assertEqual(0, diff.rx, "RX counter bumped but no BFD packets sent")
stats_after = bfd_grab_stats_snapshot(self)
diff = bfd_stats_diff(stats_before, stats_after)
self.assertEqual(0, diff.rx, "RX counter bumped but no BFD packets sent")
- self.assertEqual(bfd_control_packets_rx, diff.tx, "TX counter incorrect")
self.assertEqual(
0, diff.rx_echo, "RX echo counter bumped but no BFD session exists"
)
self.assertEqual(
0, diff.rx_echo, "RX echo counter bumped but no BFD session exists"
)
@@
-1729,7
+1724,6
@@
class BFD4TestCase(VppTestCase):
@tag_run_solo
@tag_fixme_vpp_workers
@tag_run_solo
@tag_fixme_vpp_workers
-@tag_fixme_ubuntu2204
class BFD6TestCase(VppTestCase):
"""Bidirectional Forwarding Detection (BFD) (IPv6)"""
class BFD6TestCase(VppTestCase):
"""Bidirectional Forwarding Detection (BFD) (IPv6)"""
@@
-1740,8
+1734,6
@@
class BFD6TestCase(VppTestCase):
@classmethod
def setUpClass(cls):
@classmethod
def setUpClass(cls):
- if is_distro_ubuntu2204 == True and not hasattr(cls, "vpp"):
- return
super(BFD6TestCase, cls).setUpClass()
cls.vapi.cli("set log class bfd level debug")
try:
super(BFD6TestCase, cls).setUpClass()
cls.vapi.cli("set log class bfd level debug")
try:
@@
-1765,8
+1757,6
@@
class BFD6TestCase(VppTestCase):
def setUp(self):
super(BFD6TestCase, self).setUp()
def setUp(self):
super(BFD6TestCase, self).setUp()
- if is_distro_ubuntu2204 == True and not hasattr(self, "vpp"):
- return
self.factory = AuthKeyFactory()
self.vapi.want_bfd_events()
self.pg0.enable_capture()
self.factory = AuthKeyFactory()
self.vapi.want_bfd_events()
self.pg0.enable_capture()
@@
-1892,7
+1882,6
@@
class BFD6TestCase(VppTestCase):
stats_after = bfd_grab_stats_snapshot(self)
diff = bfd_stats_diff(stats_before, stats_after)
self.assertEqual(0, diff.rx, "RX counter bumped but no BFD packets sent")
stats_after = bfd_grab_stats_snapshot(self)
diff = bfd_stats_diff(stats_before, stats_after)
self.assertEqual(0, diff.rx, "RX counter bumped but no BFD packets sent")
- self.assertEqual(bfd_control_packets_rx, diff.tx, "TX counter incorrect")
self.assertEqual(
0, diff.rx_echo, "RX echo counter bumped but no BFD session exists"
)
self.assertEqual(
0, diff.rx_echo, "RX echo counter bumped but no BFD session exists"
)