Skip to content
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

Jump to bottom

NAS-132534 / 25.04 / Add jbof and rdma #242

Merged
merged 5 commits into from
Nov 15, 2024
Merged

NAS-132534 / 25.04 / Add jbof and rdma #242

Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
ff18617
Add output from jbof.query
bmeagherix Nov 14, 2024
47ca65e
Add rdma output
bmeagherix Nov 14, 2024
b4aa9a5
flake8
bmeagherix Nov 14, 2024
8f15650
Fix all_link_choices
bmeagherix Nov 14, 2024
420baa8
Address review: use PythonMetric for rdma_link_choices
bmeagherix Nov 15, 2024
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
3 changes: 3 additions & 0 deletions ixdiagnose/plugins/hardware.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
import typing

from ixdiagnose.utils.command import Command
from ixdiagnose.utils.formatter import remove_keys
from ixdiagnose.utils.middleware import MiddlewareClient, MiddlewareCommand
from ixdiagnose.utils.run import run

Expand Down Expand Up @@ -49,6 +50,8 @@ class Hardware(Plugin):
MiddlewareClientMetric('enclosures', [MiddlewareCommand('enclosure.query')]),
MiddlewareClientMetric('virtualization_variant', [MiddlewareCommand('hardware.virtualization.variant')]),
MiddlewareClientMetric('is_virtualized', [MiddlewareCommand('hardware.virtualization.is_virtualized')]),
MiddlewareClientMetric('jbof_config', [MiddlewareCommand('jbof.query',
format_output=remove_keys(['mgmt_password']))]),
PythonMetric('nvdimm_info', nvdimm_info, serializable=False),
]
raw_metrics = [
Expand Down
9 changes: 9 additions & 0 deletions ixdiagnose/plugins/network.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,15 @@ class Network(Plugin):
MiddlewareCommand('route.system_routes'),
]
),
MiddlewareClientMetric(
'rdma_config', [
MiddlewareCommand('rdma.capable_protocols', result_key='capable_protocols'),
MiddlewareCommand('rdma.get_card_choices', result_key='card_choices'),
MiddlewareCommand('rdma.get_link_choices', [True], result_key='all_link_choices'),
MiddlewareCommand('rdma.get_link_choices', result_key='link_choices'),
Copy link
Contributor

Choose a reason for hiding this comment

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

What does link_choices show that all_link_choices doesn't?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

It makes it clear which links are currently configured (e.g. as a regular network interface).

MiddlewareCommand('rdma.interface.query', result_key='interfaces'),
]
),
]
raw_metrics = [
CommandMetric(
Expand Down
Loading