diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/plugins/dhcp/test/test_dhcp.py | 6 | ||||
| -rw-r--r-- | src/plugins/dhcp/test/test_dhcp6.py | 6 | ||||
| -rw-r--r-- | src/plugins/flowprobe/test/test_flowprobe.py | 6 | ||||
| -rw-r--r-- | src/plugins/memif/test/test_memif.py | 6 | ||||
| -rw-r--r-- | src/vnet/bfd/test/test_bfd.py | 31 |
5 files changed, 15 insertions, 40 deletions
diff --git a/src/plugins/dhcp/test/test_dhcp.py b/src/plugins/dhcp/test/test_dhcp.py index 266932c3830..e17b0049df7 100644 --- a/src/plugins/dhcp/test/test_dhcp.py +++ b/src/plugins/dhcp/test/test_dhcp.py @@ -6,6 +6,7 @@ import struct import six from framework import VppTestCase, VppTestRunner, running_extended_tests +from framework import tag_run_solo from vpp_neighbor import VppNeighbor from vpp_ip_route import find_route, VppIpTable from util import mk_ll_addr @@ -32,14 +33,11 @@ DHCP6_CLIENT_PORT = 547 DHCP6_SERVER_PORT = 546 +@tag_run_solo class TestDHCP(VppTestCase): """ DHCP Test Case """ @classmethod - def force_solo(cls): - return True - - @classmethod def setUpClass(cls): super(TestDHCP, cls).setUpClass() diff --git a/src/plugins/dhcp/test/test_dhcp6.py b/src/plugins/dhcp/test/test_dhcp6.py index ebd43729e4b..e35e0e1ccda 100644 --- a/src/plugins/dhcp/test/test_dhcp6.py +++ b/src/plugins/dhcp/test/test_dhcp6.py @@ -9,6 +9,7 @@ from scapy.layers.inet6 import IPv6, Ether, UDP from scapy.utils6 import in6_mactoifaceid from framework import VppTestCase +from framework import tag_run_solo from vpp_papi import VppEnum import util import os @@ -220,14 +221,11 @@ class TestDHCPv6DataPlane(VppTestCase): self.vapi.dhcp6_clients_enable_disable(enable=0) +@tag_run_solo class TestDHCPv6IANAControlPlane(VppTestCase): """ DHCPv6 IA NA Control Plane Test Case """ @classmethod - def force_solo(cls): - return True - - @classmethod def setUpClass(cls): super(TestDHCPv6IANAControlPlane, cls).setUpClass() diff --git a/src/plugins/flowprobe/test/test_flowprobe.py b/src/plugins/flowprobe/test/test_flowprobe.py index 4cf019ad47e..56724abe269 100644 --- a/src/plugins/flowprobe/test/test_flowprobe.py +++ b/src/plugins/flowprobe/test/test_flowprobe.py @@ -13,6 +13,7 @@ from scapy.layers.inet import IP, TCP, UDP from scapy.layers.inet6 import IPv6 from framework import VppTestCase, VppTestRunner, running_extended_tests +from framework import tag_run_solo from vpp_object import VppObject from vpp_pg_interface import CaptureTimeoutError from util import ppp @@ -343,14 +344,11 @@ class MethodHolder(VppTestCase): return p +@tag_run_solo class Flowprobe(MethodHolder): """Template verification, timer tests""" @classmethod - def force_solo(cls): - return True - - @classmethod def setUpClass(cls): super(Flowprobe, cls).setUpClass() diff --git a/src/plugins/memif/test/test_memif.py b/src/plugins/memif/test/test_memif.py index f2bbded320b..caaab87f1e8 100644 --- a/src/plugins/memif/test/test_memif.py +++ b/src/plugins/memif/test/test_memif.py @@ -5,6 +5,7 @@ from scapy.layers.l2 import Ether from scapy.layers.inet import IP, ICMP from framework import VppTestCase, VppTestRunner, running_extended_tests +from framework import tag_run_solo from remote_test import RemoteClass, RemoteVppTestCase from vpp_memif import remove_all_memif_vpp_config, \ VppSocketFilename, VppMemif @@ -12,14 +13,11 @@ from vpp_ip_route import VppIpRoute, VppRoutePath from vpp_papi import VppEnum +@tag_run_solo class TestMemif(VppTestCase): """ Memif Test Case """ @classmethod - def force_solo(cls): - return True - - @classmethod def setUpClass(cls): # fork new process before client connects to VPP cls.remote_test = RemoteClass(RemoteVppTestCase) diff --git a/src/vnet/bfd/test/test_bfd.py b/src/vnet/bfd/test/test_bfd.py index 784cdadb24d..71904a89f7f 100644 --- a/src/vnet/bfd/test/test_bfd.py +++ b/src/vnet/bfd/test/test_bfd.py @@ -22,6 +22,7 @@ from scapy.packet import Raw from bfd import VppBFDAuthKey, BFD, BFDAuthType, VppBFDUDPSession, \ BFDDiagCode, BFDState, BFD_vpp_echo from framework import VppTestCase, VppTestRunner, running_extended_tests +from framework import tag_run_solo from util import ppp from vpp_ip import DpoProto from vpp_ip_route import VppIpRoute, VppRoutePath @@ -677,6 +678,7 @@ def wait_for_bfd_packet(test, timeout=1, pcap_time_min=None, is_tunnel=False): return p +@tag_run_solo class BFD4TestCase(VppTestCase): """Bidirectional Forwarding Detection (BFD)""" @@ -686,10 +688,6 @@ class BFD4TestCase(VppTestCase): test_session = None @classmethod - def force_solo(cls): - return True - - @classmethod def setUpClass(cls): super(BFD4TestCase, cls).setUpClass() cls.vapi.cli("set log class bfd level debug") @@ -1489,6 +1487,7 @@ class BFD4TestCase(VppTestCase): self.assertFalse(vpp_session.query_vpp_config()) +@tag_run_solo class BFD6TestCase(VppTestCase): """Bidirectional Forwarding Detection (BFD) (IPv6) """ @@ -1498,10 +1497,6 @@ class BFD6TestCase(VppTestCase): test_session = None @classmethod - def force_solo(cls): - return True - - @classmethod def setUpClass(cls): super(BFD6TestCase, cls).setUpClass() cls.vapi.cli("set log class bfd level debug") @@ -1706,6 +1701,7 @@ class BFD6TestCase(VppTestCase): self.assertFalse(vpp_session.query_vpp_config()) +@tag_run_solo class BFDFIBTestCase(VppTestCase): """ BFD-FIB interactions (IPv6) """ @@ -1713,10 +1709,6 @@ class BFDFIBTestCase(VppTestCase): test_session = None @classmethod - def force_solo(cls): - return True - - @classmethod def setUpClass(cls): super(BFDFIBTestCase, cls).setUpClass() @@ -1896,6 +1888,7 @@ class BFDTunTestCase(VppTestCase): bfd_session_down(self) +@tag_run_solo class BFDSHA1TestCase(VppTestCase): """Bidirectional Forwarding Detection (BFD) (SHA1 auth) """ @@ -1905,10 +1898,6 @@ class BFDSHA1TestCase(VppTestCase): test_session = None @classmethod - def force_solo(cls): - return True - - @classmethod def setUpClass(cls): super(BFDSHA1TestCase, cls).setUpClass() cls.vapi.cli("set log class bfd level debug") @@ -2131,6 +2120,7 @@ class BFDSHA1TestCase(VppTestCase): bfd_session_up(self) +@tag_run_solo class BFDAuthOnOffTestCase(VppTestCase): """Bidirectional Forwarding Detection (BFD) (changing auth) """ @@ -2139,10 +2129,6 @@ class BFDAuthOnOffTestCase(VppTestCase): test_session = None @classmethod - def force_solo(cls): - return True - - @classmethod def setUpClass(cls): super(BFDAuthOnOffTestCase, cls).setUpClass() cls.vapi.cli("set log class bfd level debug") @@ -2347,15 +2333,12 @@ class BFDAuthOnOffTestCase(VppTestCase): "number of bfd events") +@tag_run_solo class BFDCLITestCase(VppTestCase): """Bidirectional Forwarding Detection (BFD) (CLI) """ pg0 = None @classmethod - def force_solo(cls): - return True - - @classmethod def setUpClass(cls): super(BFDCLITestCase, cls).setUpClass() cls.vapi.cli("set log class bfd level debug") |