Skip to content

DAOS-15518 control: Fix dmg network scan for UCX. #17636

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
jgmoore-or wants to merge 21 commits into
base: master
Choose a base branch
from
Open

DAOS-15518 control: Fix dmg network scan for UCX. #17636

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
21 commits
Select commit Hold shift + click to select a range
d2ff421
DAOS-15518 control: Fix dmg_network_scan for UCX.
jgmoore-or Mar 3, 2026
8bd5a02
DAOS-15518 control: Fix dmg network scan for UCX.
jgmoore-or Mar 3, 2026
ba8f266
DAOS-15518 control: Fix dmg network scan for UCX.
jgmoore-or Mar 3, 2026
a0b599f
DAOS-15518 control: Fix dmg network scan for UCX.
jgmoore-or Mar 3, 2026
5ec135a
DAOS-15518 control: Fix dmg network scan for UCX.
jgmoore-or Mar 3, 2026
886ecc7
DAOS-15518 control: Fix dmg network scan for UCX.
jgmoore-or Mar 3, 2026
6713dc3
DAOS-15518 control: Fix dmg network scan for UCX.
jgmoore-or Mar 3, 2026
6f15d09
DAOS-15518 control: Fix dmg network scan for ucx.
jgmoore-or Mar 3, 2026
c57707b
DAOS-15518 control: Fix dng network scan for UCX.
jgmoore-or Mar 3, 2026
ed77ad9
DAOS-15518 control: Fix dmg network scan for UCX.
jgmoore-or Mar 4, 2026
741ca3f
DAOS-15518 control: Fix dmg network scan for UCX.
jgmoore-or Mar 19, 2026
dd0a0d9
DAOS-15518 control: Fix dmg network scan for UCX.
jgmoore-or Mar 19, 2026
dac9c88
DAOS-15518 control: Fix dmg network scan for UCX.
jgmoore-or Mar 19, 2026
e83d91a
DAOS-15518 control: Fix dmg network scan for UCX.
jgmoore-or Mar 19, 2026
dd1592e
DAOS-15518 control: Fix dmg network scan for UCX.
jgmoore-or Mar 20, 2026
7378be5
DAOS-15518 control: Fix dmg network scan for UCX.
jgmoore-or Mar 20, 2026
2f8ea11
DAOS- 15518 control: Fix dmg network scan for UCX.
jgmoore-or Mar 20, 2026
23ad777
DAOS-15518 control: Fix dmg network scan for UCX.
jgmoore-or Mar 20, 2026
f3726bd
Merge branch 'master' into jgm/DAOS-15518
jgmoore-or Mar 20, 2026
9b1d2e4
DAOS015518 control: Fix dmg network scan for UCX.
jgmoore-or Mar 20, 2026
715c589
DAOS-15518 control: Fix dmg network scan for UCX.
jgmoore-or Apr 10, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 1 addition & 8 deletions src/control/lib/hardware/cart/cart_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
//
// (C) Copyright 2024 Intel Corporation.
// (C) Copyright 2025-2026 Hewlett Packard Enterprise Development LP
//
// SPDX-License-Identifier: BSD-2-Clause-Patent
//
Expand Down Expand Up @@ -180,10 +181,6 @@ func TestCart_Provider_GetFabricInterfaces(t *testing.T) {
&hardware.FabricProvider{
Name: "ucx+ud",
},
&hardware.FabricProvider{
Name: "ucx+all",
Priority: ucxCatchallPriority,
},
),
},
&hardware.FabricInterface{
Expand All @@ -198,10 +195,6 @@ func TestCart_Provider_GetFabricInterfaces(t *testing.T) {
Name: "ucx+tcp",
Priority: ucxTCPPriority,
},
&hardware.FabricProvider{
Name: "ucx+all",
Priority: ucxCatchallPriority,
},
),
},
&hardware.FabricInterface{
Expand Down
6 changes: 1 addition & 5 deletions src/control/lib/hardware/cart/ucx.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
//
// (C) Copyright 2022-2024 Intel Corporation.
// (C) Copyright 2025-2026 Hewlett Packard Enterprise Development LP
//
// SPDX-License-Identifier: BSD-2-Clause-Patent
//
Expand Down Expand Up @@ -50,11 +51,6 @@ func getProviderSetFromUCXTransport(transport string) *hardware.FabricProviderSe
Priority: priority,
})
}
// Any interface with at least one provider should allow ucx+all
providers.Add(&hardware.FabricProvider{
Name: "ucx+all",
Priority: ucxCatchallPriority,
})
return providers
}

Expand Down
21 changes: 1 addition & 20 deletions src/control/lib/hardware/cart/ucx_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
//
// (C) Copyright 2022-2024 Intel Corporation.
// (C) Copyright 2025-2026 Hewlett Packard Enterprise Development LP
//
// SPDX-License-Identifier: BSD-2-Clause-Patent
//
Expand Down Expand Up @@ -50,10 +51,6 @@ func TestCart_getProviderSetFromUCXTransport(t *testing.T) {
&hardware.FabricProvider{
Name: "ucx+custom",
},
&hardware.FabricProvider{
Name: "ucx+all",
Priority: ucxCatchallPriority,
},
),
},
"dc": {
Expand All @@ -68,10 +65,6 @@ func TestCart_getProviderSetFromUCXTransport(t *testing.T) {
&hardware.FabricProvider{
Name: "ucx+dc",
},
&hardware.FabricProvider{
Name: "ucx+all",
Priority: ucxCatchallPriority,
},
),
},
"tcp": {
Expand All @@ -81,10 +74,6 @@ func TestCart_getProviderSetFromUCXTransport(t *testing.T) {
Name: "ucx+tcp",
Priority: ucxTCPPriority,
},
&hardware.FabricProvider{
Name: "ucx+all",
Priority: ucxCatchallPriority,
},
),
},
"add generic rc": {
Expand All @@ -99,10 +88,6 @@ func TestCart_getProviderSetFromUCXTransport(t *testing.T) {
&hardware.FabricProvider{
Name: "ucx+rc",
},
&hardware.FabricProvider{
Name: "ucx+all",
Priority: ucxCatchallPriority,
},
),
},
"add generic ud": {
Expand All @@ -117,10 +102,6 @@ func TestCart_getProviderSetFromUCXTransport(t *testing.T) {
&hardware.FabricProvider{
Name: "ucx+ud",
},
&hardware.FabricProvider{
Name: "ucx+all",
Priority: ucxCatchallPriority,
},
),
},
} {
Expand Down
14 changes: 13 additions & 1 deletion src/tests/ftest/control/dmg_network_scan.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,12 @@
"""
(C) Copyright 2020-2023 Intel Corporation.
(C) Copyright 2025-2026 Hewlett Packard Enterprise Development LP

SPDX-License-Identifier: BSD-2-Clause-Patent
"""
import re
import copy

from apricot import TestWithServers
from ClusterShell.NodeSet import NodeSet
from exception_utils import CommandFailure
Expand Down Expand Up @@ -32,9 +36,17 @@
server_provider = self.server_managers[0].get_config_value("provider")
sys_info = []
for entry in get_network_information(self.log, self.hostlist_servers, SUPPORTED_PROVIDERS):
if server_provider == entry.provider:
if (server_provider == entry.provider or server_provider[0:3] == "ucx"
and server_provider[0:6] == entry.provider[0:6]):
entry.device = None
sys_info.append(entry)
if server_provider[0:3] == "ucx" and server_provider[0:6] == entry.provider[0:6]:
dup_entry = copy.deepcopy(entry)
dup_entry.provider = re.sub(r"mlx[0-9]+", "x", dup_entry.provider)
sys_info.append(dup_entry)
dup_entry2 = copy.deepcopy(entry)
dup_entry2.provider = entry.provider[0:6]
sys_info.append(dup_entry2)
Comment on lines -35 to +49
Copy link
Copy Markdown
Contributor

@kjacque kjacque Apr 2, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I find this really hard to understand as a reader... I believe you that it works, but @daos-stack/ftest-owners should weigh in on how to make this test implementation better.

Copy link
Copy Markdown
Contributor Author

@jgmoore-or jgmoore-or Apr 10, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The changed test verification has to add two additional entries to what the test code that looks at ucx_info output comes up with (to match up with "provider:" value in server.yml).  The changed code does a couple of deep copy duplicates entries of the existing entries on the sys_info list,  and modify the dups to augment the list with the other synonym variants.

return sys_info

def get_dmg_info(self):
Expand Down
11 changes: 7 additions & 4 deletions src/tests/ftest/util/network_utils.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
"""
(C) Copyright 2022-2024 Intel Corporation.
(C) Copyright 2025 Hewlett Packard Enterprise Development LP
(C) Copyright 2025-2026 Hewlett Packard Enterprise Development LP

SPDX-License-Identifier: BSD-2-Clause-Patent
"""
Expand All @@ -18,7 +18,11 @@
"ofi+cxi",
"ofi+verbs;ofi_rxm",
"ucx+dc_x",
"ucx+dc_mlx5",
"ucx+dc",
"ucx+ud_x",
"ucx+ud_mlx5",
"ucx+ud",
"ofi+tcp",
"ofi+tcp;ofi_rxm",
"ofi+opx"
Expand Down Expand Up @@ -340,9 +344,8 @@ def get_ucx_info(logger, hosts, supported=None, verbose=True):
if not transport or not device:
continue

# Add 'ucx+' to the provider and replace 'mlx[0-9]' with 'x'
transport = [
"+".join(["ucx", re.sub(r"mlx[0-9]+", "x", item)]) for item in transport]
# Add 'ucx+' to the provider
transport = ["+".join(["ucx", item]) for item in transport]

# Only include supported providers if a supported list is provided
if supported and transport[0] not in supported:
Expand Down
Loading