Skip to content

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

Open
jgmoore-or wants to merge 21 commits intomasterfrom
jgm/DAOS-15518
Open

DAOS-15518 control: Fix dmg network scan for UCX.#17636
jgmoore-or wants to merge 21 commits intomasterfrom
jgm/DAOS-15518

Conversation

@jgmoore-or
Copy link
Copy Markdown
Contributor

Test-provider: ucx+dc_x
Skip-func-hw-test-medium-verbs-provider: true
Allow-unstable-test: true

Steps for the author:

  • Commit message follows the guidelines.
  • Appropriate Features or Test-tag pragmas were used.
  • Appropriate Functional Test Stages were run.
  • At least two positive code reviews including at least one code owner from each category referenced in the PR.
  • Testing is complete. If necessary, forced-landing label added and a reason added in a comment.

After all prior steps are complete:

  • Gatekeeper requested (daos-gatekeeper added as a reviewer).

Test-provider: ucx+dc_x
Skip-func-hw-test-medium-verbs-provider: true
Allow-unstable-test: true

Signed-off-by: Joseph Moore <joseph.moore@hpe.com>
@jgmoore-or jgmoore-or requested review from a team as code owners March 3, 2026 20:31
@github-actions
Copy link
Copy Markdown

github-actions bot commented Mar 3, 2026

Errors are Unable to load ticket data
https://daosio.atlassian.net/browse/DAOS-15518

@jgmoore-or jgmoore-or marked this pull request as draft March 3, 2026 20:32
Test-provider: ucx+dc_x
Skip-func-hw-test-medium-verbs-provider: true
Allow-unstable-test: true

Signed-off-by: Joseph Moore <joseph.moore@hpe.com>
Test-provider: ucx+dc_x
Skip-func-hw-test-medium-verbs-provider: true
Allow-unstable-test: true

Signed-off-by: Joseph Moore <joseph.moore@hpe.com>
Test-provider: ucx+dc_x
Skip-func-hw-test-medium-verbs-provider: true
Allow-unstable-test: true

Signed-off-by: Joseph Moore <joseph.moore@hpe.com>
Test-provider: ucx+dc_x
Skip-func-hw-test-medium-verbs-provider: true
Allow-unstable-test: true

Signed-off-by: Joseph Moore <joseph.moore@hpe.com>
Test-provider: ucx+dc_x
Skip-func-hw-test-medium-verbs-provider: true
Allow-unstable-test: true

Signed-off-by: Joseph Moore <joseph.moore@hpe.com>
Signed-off-by: Joseph Moore <joseph.moore@hpe.com>
Test-provider: ucx+dc_x
Skip-func-hw-test-medium-verbs-provider: true
Allow-unstable-test: true

Signed-off-by: Joseph Moore <joseph.moore@hpe.com>
@daosbuild3
Copy link
Copy Markdown
Collaborator

Test-provider: ucx+dc_x
Skip-func-hw-test-medium-verbs-provider: true
Allow-unstable-test: true

Signed-off-by: Joseph Moore <joseph.moore@hpe.com>
@daosbuild3
Copy link
Copy Markdown
Collaborator

Test-provider: ucx+dc_x
Skip-func-hw-test-medium-verbs-provider: true
Allow-unstable-test: true

Signed-off-by: Joseph Moore <joseph.moore@hpe.com>
@daosbuild3
Copy link
Copy Markdown
Collaborator

@daosbuild3
Copy link
Copy Markdown
Collaborator

@daosbuild3
Copy link
Copy Markdown
Collaborator

Test-provider: ucx+dc_x
Skip-func-hw-test-medium-verbs-provider: true
Skip-func-test-vm: true
Allow-unstable-test: true

Signed-off-by: Joseph Moore <joseph.moore@hpe.com>
Test-provider: ucx+dc_x
Skip-func-hw-test-medium-verbs-provider: true
Skip-func-test-vm: true
Allow-unstable-test: true

Signed-off-by: Joseph Moore <joseph.moore@hpe.com>
Test-provider: ucx+dc_x
Skip-func-hw-test-medium-verbs-provider: true
Skip-func-test-vm: true
Allow-unstable-test: true

Signed-off-by: Joseph Moore <joseph.moore@hpe.com>
Test-provider: ucx+dc_x
Skip-func-hw-test-medium-verbs-provider: true
Skip-func-test-vm: true
Allow-unstable-test: true

Signed-off-by: Joseph Moore <joseph.moore@hpe.com>
Test-provider: ucx+dc_x
Skip-func-hw-test-medium-verbs-provider: true
Skip-func-test-vm: true
Allow-unstable-test: true

Signed-off-by: Joseph Moore <joseph.moore@hpe.com>
Test-provider: ucx+dc_x
Skip-func-hw-test-medium-verbs-provider: true
Skip-func-test-vm: true
Allow-unstable-test: true

Signed-off-by: Joseph Moore <joseph.moore@hpe.com>
Test-provider: ucx+dc_x
Skip-func-hw-test-medium-verbs-provider: true
Skip-func-test-vm: true
Allow-unstable-test: true

Signed-off-by: Joseph Moore <joseph.moore@hpe.com>
Test-provider: ucx+dc_x
Skip-func-hw-test-medium-verbs-provider: true
Skip-func-test-vm: true
Allow-unstable-test: true

Signed-off-by: Joseph Moore <joseph.moore@hpe.com>
Test-provider: ucx+dc_x
Skip-func-hw-test-medium-verbs-provider: true
Skip-func-test-vm: true
Allow-unstable-test: true
Test-provider: ucx+dc_x
Skip-func-hw-test-medium-verbs-provider: true
Skip-func-test-vm: true
Allow-unstable-test: true

Signed-off-by: Joseph Moore <joseph.moore@hpe.com>
@daosbuild3
Copy link
Copy Markdown
Collaborator

Test stage Functional Hardware Medium MD on SSD completed with status UNSTABLE. https://jenkins-3.daos.hpc.amslabs.hpecorp.net/job/daos-stack/job/daos//view/change-requests/job/PR-17636/25/testReport/

@jgmoore-or jgmoore-or changed the title DAOS-15518 control: Fix dmg_network_scan for UCX. DAOS-15518 control: Fix dmg network scan for UCX. Mar 23, 2026
@jgmoore-or jgmoore-or marked this pull request as ready for review April 1, 2026 20:03
@jgmoore-or jgmoore-or requested a review from kjacque April 1, 2026 20:03
Copy link
Copy Markdown
Contributor

@kjacque kjacque left a comment

Choose a reason for hiding this comment

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

Control plane stuff LGTM. I think the Python test changes need to be clarified a bit... really tough to read and understand.

@@ -1,5 +1,6 @@
//
// (C) Copyright 2024 Intel Corporation.
// (C) Copyright 2025-2026 Hewlett Packard Enterprise Development LP
Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

Looks like this copyright line got added automatically though nothing else is changed in the file.

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

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

I will remove this changed file from the PR.

Comment on lines -35 to +49
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)
Copy link
Copy Markdown
Contributor

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

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.

@jgmoore-or jgmoore-or requested a review from phender April 10, 2026 18:52
Test-provider: ucx+dc_x
Skip-func-hw-test-medium-verbs-provider: true
Skip-func-test-vm: true
Allow-unstable-test: true

Signed-off-by: Joseph Moore <joseph.moore@hpe.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Development

Successfully merging this pull request may close these issues.

3 participants