From 8dc0d488e62323a6f2814a74130934f5ed2bf724 Mon Sep 17 00:00:00 2001 From: Andrew Yourtchenko Date: Fri, 29 Jan 2021 13:17:19 +0000 Subject: tests: tag the tests that do not work with multi-worker configuration If the multi-worker default VPP configuration is triggered by setting VPP_WORKER_CONFIG="workers 2", some of the tests fail for various reasons. It's a substantial number, so this change marks all of the testsets that have this issue, such that they can be addressed later independently. Type: test Change-Id: I4f77196499edef3300afe7eabef9cbff91f794d3 Signed-off-by: Andrew Yourtchenko --- src/plugins/dhcp/test/test_dhcp6.py | 2 ++ src/plugins/flowprobe/test/test_flowprobe.py | 3 +++ src/plugins/gbp/test/test_gbp.py | 2 ++ src/plugins/gtpu/test/test_gtpu.py | 2 ++ src/plugins/igmp/test/test_igmp.py | 2 ++ src/plugins/ikev2/test/test_ikev2.py | 16 ++++++++++++++++ src/plugins/l2tp/test/test_l2tp.py | 2 ++ src/plugins/nat/test/test_dslite.py | 2 ++ src/plugins/nat/test/test_nat44_ed.py | 3 +++ src/plugins/nat/test/test_nat44_ei.py | 2 ++ src/plugins/nat/test/test_nat64.py | 2 ++ src/plugins/quic/test/test_quic.py | 4 ++++ src/vlib/test/test_counters.py | 2 ++ src/vnet/bfd/test/test_bfd.py | 2 ++ src/vnet/fib/test/test_fib.py | 2 ++ src/vnet/gre/test/test_gre.py | 2 ++ 16 files changed, 50 insertions(+) (limited to 'src') diff --git a/src/plugins/dhcp/test/test_dhcp6.py b/src/plugins/dhcp/test/test_dhcp6.py index e35e0e1ccda..57eb113fb13 100644 --- a/src/plugins/dhcp/test/test_dhcp6.py +++ b/src/plugins/dhcp/test/test_dhcp6.py @@ -8,6 +8,7 @@ from scapy.layers.dhcp6 import DHCP6_Advertise, DHCP6OptClientId, \ from scapy.layers.inet6 import IPv6, Ether, UDP from scapy.utils6 import in6_mactoifaceid +from framework import tag_fixme_vpp_workers from framework import VppTestCase from framework import tag_run_solo from vpp_papi import VppEnum @@ -475,6 +476,7 @@ class TestDHCPv6IANAControlPlane(VppTestCase): self.assertEqual(len(new_addresses), 0) +@tag_fixme_vpp_workers class TestDHCPv6PDControlPlane(VppTestCase): """ DHCPv6 PD Control Plane Test Case """ diff --git a/src/plugins/flowprobe/test/test_flowprobe.py b/src/plugins/flowprobe/test/test_flowprobe.py index 56724abe269..517729d8591 100644 --- a/src/plugins/flowprobe/test/test_flowprobe.py +++ b/src/plugins/flowprobe/test/test_flowprobe.py @@ -12,6 +12,7 @@ from scapy.layers.l2 import Ether from scapy.layers.inet import IP, TCP, UDP from scapy.layers.inet6 import IPv6 +from framework import tag_fixme_vpp_workers from framework import VppTestCase, VppTestRunner, running_extended_tests from framework import tag_run_solo from vpp_object import VppObject @@ -345,6 +346,7 @@ class MethodHolder(VppTestCase): @tag_run_solo +@tag_fixme_vpp_workers class Flowprobe(MethodHolder): """Template verification, timer tests""" @@ -483,6 +485,7 @@ class Flowprobe(MethodHolder): self.logger.info("FFP_TEST_FINISH_0000") +@tag_fixme_vpp_workers class Datapath(MethodHolder): """collect information on Ethernet, IP4 and IP6 datapath (no timers)""" diff --git a/src/plugins/gbp/test/test_gbp.py b/src/plugins/gbp/test/test_gbp.py index df3c3ad54f0..5ff6ae439d9 100644 --- a/src/plugins/gbp/test/test_gbp.py +++ b/src/plugins/gbp/test/test_gbp.py @@ -13,6 +13,7 @@ from scapy.utils6 import in6_getnsma, in6_getnsmac from scapy.layers.vxlan import VXLAN from scapy.data import ETH_P_IP, ETH_P_IPV6, ETH_P_ARP +from framework import tag_fixme_vpp_workers from framework import VppTestCase, VppTestRunner from vpp_object import VppObject from vpp_interface import VppInterface @@ -572,6 +573,7 @@ class VppGbpVxlanTunnel(VppInterface): return find_gbp_vxlan(self._test, self.vni) +@tag_fixme_vpp_workers class TestGBP(VppTestCase): """ GBP Test Case """ diff --git a/src/plugins/gtpu/test/test_gtpu.py b/src/plugins/gtpu/test/test_gtpu.py index f68c86fbc04..791067c0633 100644 --- a/src/plugins/gtpu/test/test_gtpu.py +++ b/src/plugins/gtpu/test/test_gtpu.py @@ -3,6 +3,7 @@ import socket from util import ip4_range import unittest +from framework import tag_fixme_vpp_workers from framework import VppTestCase, VppTestRunner from template_bd import BridgeDomain @@ -18,6 +19,7 @@ from vpp_ip_route import VppIpRoute, VppRoutePath from vpp_ip import INVALID_INDEX +@tag_fixme_vpp_workers class TestGtpuUDP(VppTestCase): """ GTPU UDP ports Test Case """ diff --git a/src/plugins/igmp/test/test_igmp.py b/src/plugins/igmp/test/test_igmp.py index 01f59bae024..8053bc3d544 100644 --- a/src/plugins/igmp/test/test_igmp.py +++ b/src/plugins/igmp/test/test_igmp.py @@ -7,6 +7,7 @@ from scapy.packet import Raw from scapy.layers.inet import IP, IPOption from scapy.contrib.igmpv3 import IGMPv3, IGMPv3gr, IGMPv3mq, IGMPv3mr +from framework import tag_fixme_vpp_workers from framework import VppTestCase, VppTestRunner, running_extended_tests from vpp_igmp import find_igmp_state, IGMP_FILTER, IgmpRecord, IGMP_MODE, \ IgmpSG, VppHostState, wait_for_igmp_event @@ -18,6 +19,7 @@ class IgmpMode: ROUTER = 0 +@tag_fixme_vpp_workers class TestIgmp(VppTestCase): """ IGMP Test Case """ diff --git a/src/plugins/ikev2/test/test_ikev2.py b/src/plugins/ikev2/test/test_ikev2.py index 89cd2dea2b1..dea9a6a41c8 100644 --- a/src/plugins/ikev2/test/test_ikev2.py +++ b/src/plugins/ikev2/test/test_ikev2.py @@ -18,6 +18,7 @@ from scapy.layers.inet import IP, UDP, Ether from scapy.layers.inet6 import IPv6 from scapy.packet import raw, Raw from scapy.utils import long_converter +from framework import tag_fixme_vpp_workers from framework import VppTestCase, VppTestRunner from vpp_ikev2 import Profile, IDType, AuthMethod from vpp_papi import VppEnum @@ -1638,6 +1639,7 @@ class TestApi(VppTestCase): self.assertEqual(ap.tun_itf, 0xffffffff) +@tag_fixme_vpp_workers class TestResponderBehindNAT(TemplateResponder, Ikev2Params): """ test responder - responder behind NAT """ @@ -1647,6 +1649,7 @@ class TestResponderBehindNAT(TemplateResponder, Ikev2Params): self.config_params({'r_natt': True}) +@tag_fixme_vpp_workers class TestInitiatorNATT(TemplateInitiator, Ikev2Params): """ test ikev2 initiator - NAT traversal (intitiator behind NAT) """ @@ -1672,6 +1675,7 @@ class TestInitiatorNATT(TemplateInitiator, Ikev2Params): 'integ_alg': 12}}) +@tag_fixme_vpp_workers class TestInitiatorPsk(TemplateInitiator, Ikev2Params): """ test ikev2 initiator - pre shared key auth """ @@ -1696,6 +1700,7 @@ class TestInitiatorPsk(TemplateInitiator, Ikev2Params): 'integ_alg': 12}}) +@tag_fixme_vpp_workers class TestInitiatorRequestWindowSize(TestInitiatorPsk): """ test initiator - request window size (1) """ @@ -1737,6 +1742,7 @@ class TestInitiatorRequestWindowSize(TestInitiatorPsk): self.verify_ipsec_sas(is_rekey=True) +@tag_fixme_vpp_workers class TestInitiatorRekey(TestInitiatorPsk): """ test ikev2 initiator - rekey """ @@ -1774,6 +1780,7 @@ class TestInitiatorRekey(TestInitiatorPsk): self.verify_ipsec_sas(is_rekey=True) +@tag_fixme_vpp_workers class TestInitiatorDelSAFromResponder(TemplateInitiator, Ikev2Params): """ test ikev2 initiator - delete IKE SA from responder """ @@ -1799,6 +1806,7 @@ class TestInitiatorDelSAFromResponder(TemplateInitiator, Ikev2Params): 'integ_alg': 12}}) +@tag_fixme_vpp_workers class TestResponderInitBehindNATT(TemplateResponder, Ikev2Params): """ test ikev2 responder - initiator behind NAT """ @@ -1809,12 +1817,14 @@ class TestResponderInitBehindNATT(TemplateResponder, Ikev2Params): {'i_natt': True}) +@tag_fixme_vpp_workers class TestResponderPsk(TemplateResponder, Ikev2Params): """ test ikev2 responder - pre shared key auth """ def config_tc(self): self.config_params() +@tag_fixme_vpp_workers class TestResponderDpd(TestResponderPsk): """ Dead peer detection test @@ -1844,6 +1854,7 @@ class TestResponderDpd(TestResponderPsk): self.assertEqual(len(ipsec_sas), 0) +@tag_fixme_vpp_workers class TestResponderRekey(TestResponderPsk): """ test ikev2 responder - rekey """ @@ -1905,6 +1916,7 @@ class TestResponderVrf(TestResponderPsk, Ikev2Params): self.assertEqual(plain, b'') +@tag_fixme_vpp_workers class TestResponderRsaSign(TemplateResponder, Ikev2Params): """ test ikev2 responder - cert based auth """ def config_tc(self): @@ -1917,6 +1929,7 @@ class TestResponderRsaSign(TemplateResponder, Ikev2Params): 'server-cert': 'server-cert.pem'}) +@tag_fixme_vpp_workers class Test_IKE_AES_CBC_128_SHA256_128_MODP2048_ESP_AES_CBC_192_SHA_384_192\ (TemplateResponder, Ikev2Params): """ @@ -1931,6 +1944,7 @@ class Test_IKE_AES_CBC_128_SHA256_128_MODP2048_ESP_AES_CBC_192_SHA_384_192\ 'ike-dh': '2048MODPgr'}) +@tag_fixme_vpp_workers class TestAES_CBC_128_SHA256_128_MODP3072_ESP_AES_GCM_16\ (TemplateResponder, Ikev2Params): @@ -1946,6 +1960,7 @@ class TestAES_CBC_128_SHA256_128_MODP3072_ESP_AES_GCM_16\ 'ike-dh': '3072MODPgr'}) +@tag_fixme_vpp_workers class Test_IKE_AES_GCM_16_256(TemplateResponder, Ikev2Params): """ IKE:AES_GCM_16_256 @@ -1967,6 +1982,7 @@ class Test_IKE_AES_GCM_16_256(TemplateResponder, Ikev2Params): 'end_addr': '11::100'}}) +@tag_fixme_vpp_workers class TestInitiatorKeepaliveMsg(TestInitiatorPsk): """ Test for keep alive messages diff --git a/src/plugins/l2tp/test/test_l2tp.py b/src/plugins/l2tp/test/test_l2tp.py index c57b5912de1..5a665238260 100644 --- a/src/plugins/l2tp/test/test_l2tp.py +++ b/src/plugins/l2tp/test/test_l2tp.py @@ -5,9 +5,11 @@ import unittest from scapy.layers.l2 import Ether from scapy.layers.inet6 import IPv6 +from framework import tag_fixme_vpp_workers from framework import VppTestCase +@tag_fixme_vpp_workers class TestL2tp(VppTestCase): """ L2TP Test Case """ diff --git a/src/plugins/nat/test/test_dslite.py b/src/plugins/nat/test/test_dslite.py index af256e39fc4..2b4f4aacc9f 100644 --- a/src/plugins/nat/test/test_dslite.py +++ b/src/plugins/nat/test/test_dslite.py @@ -5,6 +5,7 @@ import unittest import struct import random +from framework import tag_fixme_vpp_workers from framework import VppTestCase, VppTestRunner, running_extended_tests import scapy.compat @@ -33,6 +34,7 @@ from scapy.all import bind_layers, Packet, ByteEnumField, ShortField, \ from ipaddress import IPv6Network +@tag_fixme_vpp_workers class TestDSlite(VppTestCase): """ DS-Lite Test Cases """ diff --git a/src/plugins/nat/test/test_nat44_ed.py b/src/plugins/nat/test/test_nat44_ed.py index 3d8921790ee..f4d53e9f850 100644 --- a/src/plugins/nat/test/test_nat44_ed.py +++ b/src/plugins/nat/test/test_nat44_ed.py @@ -5,6 +5,7 @@ from io import BytesIO from random import randint import scapy.compat +from framework import tag_fixme_vpp_workers from framework import VppTestCase, VppTestRunner from scapy.data import IP_PROTOS from scapy.layers.inet import IP, TCP, UDP, ICMP, GRE @@ -916,6 +917,7 @@ class NAT44EDTestCase(VppTestCase): "%d" % self.tcp_external_port) +@tag_fixme_vpp_workers class TestNAT44ED(NAT44EDTestCase): """ NAT44ED Test Case """ @@ -1904,6 +1906,7 @@ class TestNAT44ED(NAT44EDTestCase): raise +@tag_fixme_vpp_workers class TestNAT44EDMW(TestNAT44ED): """ NAT44ED MW Test Case """ worker_config = "workers 1" diff --git a/src/plugins/nat/test/test_nat44_ei.py b/src/plugins/nat/test/test_nat44_ei.py index 471d1483cf8..999f91ecda8 100644 --- a/src/plugins/nat/test/test_nat44_ei.py +++ b/src/plugins/nat/test/test_nat44_ei.py @@ -9,6 +9,7 @@ from io import BytesIO from time import sleep import scapy.compat +from framework import tag_fixme_vpp_workers from framework import VppTestCase, VppTestRunner from ipfix import IPFIX, Set, Template, Data, IPFIXDecoder from scapy.all import bind_layers, Packet, ByteEnumField, ShortField, \ @@ -885,6 +886,7 @@ class TestNAT44EIAPI(MethodHolder): self.assertEqual(256, nat_config.frame_queue_nelts) +@tag_fixme_vpp_workers class TestNAT44EI(MethodHolder): """ NAT44EI Test Cases """ diff --git a/src/plugins/nat/test/test_nat64.py b/src/plugins/nat/test/test_nat64.py index d3bec97801e..9a10b9fc380 100644 --- a/src/plugins/nat/test/test_nat64.py +++ b/src/plugins/nat/test/test_nat64.py @@ -9,6 +9,7 @@ from io import BytesIO from time import sleep import scapy.compat +from framework import tag_fixme_vpp_workers from framework import VppTestCase, VppTestRunner, running_extended_tests from ipfix import IPFIX, Set, Template, Data, IPFIXDecoder from scapy.data import IP_PROTOS @@ -25,6 +26,7 @@ from util import ppc, ppp from vpp_papi import VppEnum +@tag_fixme_vpp_workers class TestNAT64(VppTestCase): """ NAT64 Test Cases """ diff --git a/src/plugins/quic/test/test_quic.py b/src/plugins/quic/test/test_quic.py index 0a654cba52b..d984b99610c 100644 --- a/src/plugins/quic/test/test_quic.py +++ b/src/plugins/quic/test/test_quic.py @@ -5,6 +5,7 @@ import unittest import os import subprocess import signal +from framework import tag_fixme_vpp_workers from framework import VppTestCase, VppTestRunner, running_extended_tests, \ Worker from vpp_ip_route import VppIpTable, VppIpRoute, VppRoutePath @@ -138,6 +139,7 @@ class QUICEchoIntTestCase(QUICTestCase): self.assertNotIn("failed", error) +@tag_fixme_vpp_workers class QUICEchoIntTransferTestCase(QUICEchoIntTestCase): """QUIC Echo Internal Transfer Test Case""" def test_quic_int_transfer(self): @@ -146,6 +148,7 @@ class QUICEchoIntTransferTestCase(QUICEchoIntTestCase): self.client("no-output", "mbytes", "2") +@tag_fixme_vpp_workers class QUICEchoIntSerialTestCase(QUICEchoIntTestCase): """QUIC Echo Internal Serial Transfer Test Case""" def test_quic_serial_int_transfer(self): @@ -158,6 +161,7 @@ class QUICEchoIntSerialTestCase(QUICEchoIntTestCase): self.client("no-output", "mbytes", "2") +@tag_fixme_vpp_workers class QUICEchoIntMStreamTestCase(QUICEchoIntTestCase): """QUIC Echo Internal MultiStream Test Case""" def test_quic_int_multistream_transfer(self): diff --git a/src/vlib/test/test_counters.py b/src/vlib/test/test_counters.py index 5c63308fcb0..e4cb85621d0 100644 --- a/src/vlib/test/test_counters.py +++ b/src/vlib/test/test_counters.py @@ -1,8 +1,10 @@ #!/usr/bin/env python3 from framework import VppTestCase +from framework import tag_fixme_vpp_workers +@tag_fixme_vpp_workers class TestCounters(VppTestCase): """ Counters C Unit Tests """ diff --git a/src/vnet/bfd/test/test_bfd.py b/src/vnet/bfd/test/test_bfd.py index 71904a89f7f..3e6453ccbc9 100644 --- a/src/vnet/bfd/test/test_bfd.py +++ b/src/vnet/bfd/test/test_bfd.py @@ -21,6 +21,7 @@ from scapy.packet import Raw from bfd import VppBFDAuthKey, BFD, BFDAuthType, VppBFDUDPSession, \ BFDDiagCode, BFDState, BFD_vpp_echo +from framework import tag_fixme_vpp_workers from framework import VppTestCase, VppTestRunner, running_extended_tests from framework import tag_run_solo from util import ppp @@ -1488,6 +1489,7 @@ class BFD4TestCase(VppTestCase): @tag_run_solo +@tag_fixme_vpp_workers class BFD6TestCase(VppTestCase): """Bidirectional Forwarding Detection (BFD) (IPv6) """ diff --git a/src/vnet/fib/test/test_fib.py b/src/vnet/fib/test/test_fib.py index 0eefcdf8b80..7c08722d803 100644 --- a/src/vnet/fib/test/test_fib.py +++ b/src/vnet/fib/test/test_fib.py @@ -2,9 +2,11 @@ import unittest +from framework import tag_fixme_vpp_workers from framework import VppTestCase, VppTestRunner +@tag_fixme_vpp_workers class TestFIB(VppTestCase): """ FIB Test Case """ diff --git a/src/vnet/gre/test/test_gre.py b/src/vnet/gre/test/test_gre.py index 7a249998829..828fb731006 100644 --- a/src/vnet/gre/test/test_gre.py +++ b/src/vnet/gre/test/test_gre.py @@ -9,6 +9,7 @@ from scapy.layers.inet import IP, UDP from scapy.layers.inet6 import IPv6 from scapy.volatile import RandMAC, RandIP +from framework import tag_fixme_vpp_workers from framework import VppTestCase, VppTestRunner from vpp_sub_interface import L2_VTR_OP, VppDot1QSubint from vpp_gre_interface import VppGreInterface @@ -21,6 +22,7 @@ from util import ppp, ppc from vpp_papi import VppEnum +@tag_fixme_vpp_workers class TestGREInputNodes(VppTestCase): """ GRE Input Nodes Test Case """ -- cgit 1.2.3-korg