ligang/vpp
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

tests: upgrade python packages

Browse Source 
Type: test

Change-Id: I01500466f3d15c79e38028677ce7e5c75d427fdc
Signed-off-by: Dave Wallace <dwallacelf@gmail.com>
This commit is contained in:
Dave Wallace 2024-04-03 12:31:42 -04:00
parent b48325100b
commit 940a70fff4
11 changed files with 574 additions and 516 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
extras/deprecated/plugins/gbp/test_gbp.py
View File

@ -391,9 +391,9 @@ class VppGbpEndpointGroup(VppObject):
def encode(self) -> dict:
return {
"uplink_sw_if_index": self.uplink.sw_if_index
if self.uplink
else INDEX_INVALID,
"uplink_sw_if_index": (
self.uplink.sw_if_index if self.uplink else INDEX_INVALID
),
"bd_id": self.bd.bd.bd_id,
"rd_id": self.rd.rd_id,
"vnid": self.vnid,
@ -460,12 +460,12 @@ class VppGbpBridgeDomain(VppObject):
return {
"flags": self.flags,
"bvi_sw_if_index": self.bvi.sw_if_index,
"uu_fwd_sw_if_index": self.uu_fwd.sw_if_index
if self.uu_fwd
else INDEX_INVALID,
"bm_flood_sw_if_index": self.bm_flood.sw_if_index
if self.bm_flood
else INDEX_INVALID,
"uu_fwd_sw_if_index": (
self.uu_fwd.sw_if_index if self.uu_fwd else INDEX_INVALID
),
"bm_flood_sw_if_index": (
self.bm_flood.sw_if_index if self.bm_flood else INDEX_INVALID
),
"bd_id": self.bd.bd_id,
"rd_id": self.rd.rd_id,
}
@ -510,12 +510,12 @@ class VppGbpRouteDomain(VppObject):
"scope": self.scope,
"ip4_table_id": self.t4.table_id,
"ip6_table_id": self.t6.table_id,
"ip4_uu_sw_if_index": self.ip4_uu.sw_if_index
if self.ip4_uu
else INDEX_INVALID,
"ip6_uu_sw_if_index": self.ip6_uu.sw_if_index
if self.ip6_uu
else INDEX_INVALID,
"ip4_uu_sw_if_index": (
self.ip4_uu.sw_if_index if self.ip4_uu else INDEX_INVALID
),
"ip6_uu_sw_if_index": (
self.ip6_uu.sw_if_index if self.ip6_uu else INDEX_INVALID
),
}
def add_vpp_config(self):

6
extras/deprecated/vnet/vxlan-gbp/vpp_vxlan_gbp_tunnel.py
View File

@ -56,9 +56,9 @@ class VppVxlanGbpTunnel(VppInterface):
"dst": self.dst,
"mode": self.mode,
"vni": self.vni,
"mcast_sw_if_index": self.mcast_itf.sw_if_index
if self.mcast_itf
else INDEX_INVALID,
"mcast_sw_if_index": (
self.mcast_itf.sw_if_index if self.mcast_itf else INDEX_INVALID
),
"encap_table_id": self.encap_table_id,
"instance": self.instance,
}

56
src/vpp-api/vapi/vapi_c_gen.py
View File

@ -108,9 +108,11 @@ class CField(Field):
% (
".".join([prefix] + path),
self.name,
self.get_vla_parameter_name(path)
if is_alloc
else "%s.%s" % (prefix, self.get_vla_field_name(path)),
(
self.get_vla_parameter_name(path)
if is_alloc
else "%s.%s" % (prefix, self.get_vla_field_name(path))
),
)
]
else:
@ -593,12 +595,16 @@ class CMessage(Message):
' VAPI_DBG("Swapping `%s\'@%%p to big endian", msg);'
% self.get_c_name()
),
" %s(&msg->header);" % self.header.get_swap_to_be_func_name()
if self.header is not None
else "",
" %s(&msg->payload);" % self.get_swap_payload_to_be_func_name()
if self.has_payload()
else "",
(
" %s(&msg->header);" % self.header.get_swap_to_be_func_name()
if self.header is not None
else ""
),
(
" %s(&msg->payload);" % self.get_swap_payload_to_be_func_name()
if self.has_payload()
else ""
),
"}",
]
)
@ -612,12 +618,16 @@ class CMessage(Message):
' VAPI_DBG("Swapping `%s\'@%%p to host byte order", msg);'
% self.get_c_name()
),
" %s(&msg->header);" % self.header.get_swap_to_host_func_name()
if self.header is not None
else "",
" %s(&msg->payload);" % self.get_swap_payload_to_host_func_name()
if self.has_payload()
else "",
(
" %s(&msg->header);" % self.header.get_swap_to_host_func_name()
if self.header is not None
else ""
),
(
" %s(&msg->payload);" % self.get_swap_payload_to_host_func_name()
if self.has_payload()
else ""
),
"}",
]
)
@ -791,12 +801,16 @@ class CMessage(Message):
" name_with_crc,",
" sizeof(name_with_crc) - 1,",
" true," if has_context else " false,",
" offsetof(%s, context)," % self.header.get_c_name()
if has_context
else " 0,",
(" offsetof(%s, payload)," % self.get_c_name())
if self.has_payload()
else " VAPI_INVALID_MSG_ID,",
(
" offsetof(%s, context)," % self.header.get_c_name()
if has_context
else " 0,"
),
(
(" offsetof(%s, payload)," % self.get_c_name())
if self.has_payload()
else " VAPI_INVALID_MSG_ID,"
),
" (verify_msg_size_fn_t)%s," % self.get_verify_msg_size_func_name(),
" (generic_swap_fn_t)%s," % self.get_swap_to_be_func_name(),
" (generic_swap_fn_t)%s," % self.get_swap_to_host_func_name(),

6
test/Makefile
View File

@ -74,10 +74,10 @@ V=0
endif
PYTHON_VERSION=$(shell $(PYTHON_INTERP) -c 'import sys; print(sys.version_info.major)')
PIP_VERSION=23.3.1
PIP_VERSION=24.0
# Keep in sync with requirements.txt
PIP_TOOLS_VERSION=7.3.0
PIP_SETUPTOOLS_VERSION=68.1.0
PIP_TOOLS_VERSION=7.4.1
PIP_SETUPTOOLS_VERSION=69.2.0
PYTHON_DEPENDS=requirements-$(PYTHON_VERSION).txt
SCAPY_SOURCE=$(shell find $(VENV_PATH)/lib/python* -name site-packages)
BUILD_COV_DIR=$(BR)/test-coverage

860
test/requirements-3.txt
View File

File diff suppressed because it is too large Load Diff

6
test/run.py
View File

@ -111,9 +111,9 @@ class ExtendedEnvBuilder(venv.EnvBuilder):
request being processed.
"""
os.environ["VIRTUAL_ENV"] = context.env_dir
os.environ[
"CUSTOM_COMPILE_COMMAND"
] = "make test-refresh-deps (or update requirements.txt)"
os.environ["CUSTOM_COMPILE_COMMAND"] = (
"make test-refresh-deps (or update requirements.txt)"
)
# Set the venv python executable & binary install path
env_exe = context.env_exe
bin_path = context.bin_path

58
test/run_tests.py
View File

@ -788,28 +788,42 @@ class AllResults(dict):
f"Scheduled tests: {self.all_testcases}",
f"Executed tests: {self[TestResultCode.TEST_RUN]}",
f"Passed tests: {colorize(self[TestResultCode.PASS], GREEN)}",
f"Expected failures: {colorize(self[TestResultCode.EXPECTED_FAIL], GREEN)}"
if self[TestResultCode.EXPECTED_FAIL]
else None,
f"Skipped tests: {colorize(self[TestResultCode.SKIP], YELLOW)}"
if self[TestResultCode.SKIP]
else None,
f"Not Executed tests: {colorize(self.not_executed, RED)}"
if self.not_executed
else None,
f"Failures: {colorize(self[TestResultCode.FAIL], RED)}"
if self[TestResultCode.FAIL]
else None,
f"Unexpected passes: {colorize(self[TestResultCode.UNEXPECTED_PASS], RED)}"
if self[TestResultCode.UNEXPECTED_PASS]
else None,
f"Errors: {colorize(self[TestResultCode.ERROR], RED)}"
if self[TestResultCode.ERROR]
else None,
"Tests skipped due to lack of CPUS: "
f"{colorize(self[TestResultCode.SKIP_CPU_SHORTAGE], YELLOW)}"
if self[TestResultCode.SKIP_CPU_SHORTAGE]
else None,
(
f"Expected failures: {colorize(self[TestResultCode.EXPECTED_FAIL], GREEN)}"
if self[TestResultCode.EXPECTED_FAIL]
else None
),
(
f"Skipped tests: {colorize(self[TestResultCode.SKIP], YELLOW)}"
if self[TestResultCode.SKIP]
else None
),
(
f"Not Executed tests: {colorize(self.not_executed, RED)}"
if self.not_executed
else None
),
(
f"Failures: {colorize(self[TestResultCode.FAIL], RED)}"
if self[TestResultCode.FAIL]
else None
),
(
f"Unexpected passes: {colorize(self[TestResultCode.UNEXPECTED_PASS], RED)}"
if self[TestResultCode.UNEXPECTED_PASS]
else None
),
(
f"Errors: {colorize(self[TestResultCode.ERROR], RED)}"
if self[TestResultCode.ERROR]
else None
),
(
"Tests skipped due to lack of CPUS: "
f"{colorize(self[TestResultCode.SKIP_CPU_SHORTAGE], YELLOW)}"
if self[TestResultCode.SKIP_CPU_SHORTAGE]
else None
),
]
)

1
test/test_ikev2.py
View File

@ -2485,7 +2485,6 @@ class Test_IKE_AES_CBC_128_SHA256_128_MODP2048_ESP_AES_CBC_192_SHA_384_192(
class TestAES_CBC_128_SHA256_128_MODP3072_ESP_AES_GCM_16(
TemplateResponder, Ikev2Params
):
"""
IKE:AES_CBC_128_SHA256_128,DH=modp3072 ESP:AES_GCM_16
"""

2
test/test_ip6.py
View File

@ -248,7 +248,7 @@ class TestIPv6(TestIPv6ND):
# create 2 subinterfaces for p1 and pg2
self.sub_interfaces = [
VppDot1QSubint(self, self.pg1, 100),
VppDot1QSubint(self, self.pg2, 200)
VppDot1QSubint(self, self.pg2, 200),
# TODO: VppDot1ADSubint(self, self.pg2, 200, 300, 400)
]

64
test/vm_vpp_interfaces.py
View File

@ -264,12 +264,16 @@ class TestVPPInterfacesQemu:
self.iprf_client_host_interface_on_linux,
self.iprf_client_host_interface_on_vpp,
self.client_namespace,
layer2["client_ip4_prefix"]
if x_connect_mode == "L2"
else layer3["client_ip4_prefix"],
layer2["client_ip6_prefix"]
if x_connect_mode == "L2"
else layer3["client_ip6_prefix"],
(
layer2["client_ip4_prefix"]
if x_connect_mode == "L2"
else layer3["client_ip4_prefix"]
),
(
layer2["client_ip6_prefix"]
if x_connect_mode == "L2"
else layer3["client_ip6_prefix"]
),
)
self.ingress_if_idx = self.create_af_packet(
version=client_if_version,
@ -298,18 +302,26 @@ class TestVPPInterfacesQemu:
id=101,
host_namespace=self.client_namespace,
ip_version=ip_version,
host_ip4_prefix=layer2["client_ip4_prefix"]
if x_connect_mode == "L2"
else layer3["client_ip4_prefix"],
host_ip6_prefix=layer2["client_ip6_prefix"]
if x_connect_mode == "L2"
else layer3["client_ip6_prefix"],
host_ip4_gw=vpp_client_nexthop
if x_connect_mode == "L3" and ip_version == 4
else None,
host_ip6_gw=vpp_client_nexthop
if x_connect_mode == "L3" and ip_version == 6
else None,
host_ip4_prefix=(
layer2["client_ip4_prefix"]
if x_connect_mode == "L2"
else layer3["client_ip4_prefix"]
),
host_ip6_prefix=(
layer2["client_ip6_prefix"]
if x_connect_mode == "L2"
else layer3["client_ip6_prefix"]
),
host_ip4_gw=(
vpp_client_nexthop
if x_connect_mode == "L3" and ip_version == 4
else None
),
host_ip6_gw=(
vpp_client_nexthop
if x_connect_mode == "L3" and ip_version == 6
else None
),
int_type=client_if_type,
host_if_name=f"{client_if_type}0",
enable_gso=enable_client_if_gso,
@ -373,12 +385,16 @@ class TestVPPInterfacesQemu:
id=102,
host_namespace=self.server_namespace,
ip_version=ip_version,
host_ip4_prefix=layer2["server_ip4_prefix"]
if x_connect_mode == "L2"
else layer3["server_ip4_prefix"],
host_ip6_prefix=layer2["server_ip6_prefix"]
if x_connect_mode == "L2"
else layer3["server_ip6_prefix"],
host_ip4_prefix=(
layer2["server_ip4_prefix"]
if x_connect_mode == "L2"
else layer3["server_ip4_prefix"]
),
host_ip6_prefix=(
layer2["server_ip6_prefix"]
if x_connect_mode == "L2"
else layer3["server_ip6_prefix"]
),
int_type=server_if_type,
host_if_name=f"{server_if_type}0",
enable_gso=enable_server_if_gso,

1
test/vpp_ip.py
View File

@ -2,6 +2,7 @@
IP Types
"""
import logging
from ipaddress import ip_address