Skip to content

Commit 087e515

Browse files
committed
Dpdk: symmetric_mp polishing
1 parent d73f34e commit 087e515

File tree

2 files changed

+6
-15
lines changed

2 files changed

+6
-15
lines changed

microsoft/testsuites/dpdk/dpdksuite.py

Lines changed: 3 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -24,17 +24,7 @@
2424
from lisa.features import Gpu, Infiniband, IsolatedResource, Sriov
2525
from lisa.operating_system import BSD, CBLMariner, Ubuntu, Windows
2626
from lisa.testsuite import TestResult, simple_requirement
27-
from lisa.tools import (
28-
Echo,
29-
Git,
30-
Hugepages,
31-
Ip,
32-
Kill,
33-
Lscpu,
34-
Lsmod,
35-
Make,
36-
Modprobe,
37-
)
27+
from lisa.tools import Echo, Git, Hugepages, Ip, Kill, Lscpu, Lsmod, Make, Modprobe
3828
from lisa.tools.hugepages import HugePageSize
3929
from lisa.tools.lscpu import CpuArchitecture
4030
from lisa.util.constants import SIGINT
@@ -54,12 +44,12 @@
5444
generate_send_receive_run_info,
5545
init_nodes_concurrent,
5646
initialize_node_resources,
47+
run_dpdk_symmetric_mp,
5748
run_testpmd_concurrent,
5849
verify_dpdk_build,
5950
verify_dpdk_l3fwd_ntttcp_tcp,
6051
verify_dpdk_send_receive,
6152
verify_dpdk_send_receive_multi_txrx_queue,
62-
run_dpdk_symmetric_mp,
6353
)
6454
from microsoft.testsuites.dpdk.dpdkvpp import DpdkVpp
6555

@@ -1007,4 +997,4 @@ def _force_dpdk_default_source(self, variables: Dict[str, Any]) -> None:
1007997

1008998
def after_case(self, log: Logger, **kwargs: Any) -> None:
1009999
environment: Environment = kwargs.pop("environment")
1010-
# do_parallel_cleanup(environment)
1000+
do_parallel_cleanup(environment)

microsoft/testsuites/dpdk/dpdkutil.py

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -55,12 +55,12 @@
5555
Downloader,
5656
GitDownloader,
5757
Installer,
58+
PackageManagerInstall,
5859
TarDownloader,
5960
check_dpdk_support,
6061
is_url_for_git_repo,
6162
is_url_for_tarball,
6263
update_kernel_from_repo,
63-
PackageManagerInstall,
6464
)
6565
from microsoft.testsuites.dpdk.dpdktestpmd import PACKAGE_MANAGER_SOURCE, DpdkTestpmd
6666
from microsoft.testsuites.dpdk.rdmacore import (
@@ -1375,7 +1375,8 @@ def run_dpdk_symmetric_mp(
13751375
(
13761376
"HN_DRIVER: netvsc_hotplug_retry(): Found matching MAC address, "
13771377
f"adding device {test_nics[0].pci_device_name} "
1378-
f"network name {test_nics[0].lower} args"
1378+
f"network name {test_nics[0].lower} "
1379+
f"args mac={test_nics[0].mac_addr},mac={test_nics[1].mac_addr}"
13791380
),
13801381
delta_only=True,
13811382
) # relying on compiler defaults here, not great.

0 commit comments

Comments
 (0)