From 2d8a1d185abbd4a963ec0bf8579ad530ab7184ed Mon Sep 17 00:00:00 2001 From: bmeagherix <118192357+bmeagherix@users.noreply.github.com> Date: Mon, 13 Jan 2025 10:31:45 -0800 Subject: [PATCH] NAS-133536 / 25.04 / Add iSER to rdma.capable_protocols (#15381) * Add ISER to rdma.capable_protocols --- src/middlewared/middlewared/api/v25_04_0/rdma.py | 2 +- src/middlewared/middlewared/plugins/rdma/constants.py | 2 +- src/middlewared/middlewared/plugins/rdma/rdma.py | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/middlewared/middlewared/api/v25_04_0/rdma.py b/src/middlewared/middlewared/api/v25_04_0/rdma.py index a16ab034518e2..ab62f3d2f672c 100644 --- a/src/middlewared/middlewared/api/v25_04_0/rdma.py +++ b/src/middlewared/middlewared/api/v25_04_0/rdma.py @@ -42,4 +42,4 @@ class RdmaCapableProtocolsArgs(BaseModel): class RdmaCapableProtocolsResult(BaseModel): - result: list[Literal["NFS"]] + result: list[Literal["ISER", "NFS"]] diff --git a/src/middlewared/middlewared/plugins/rdma/constants.py b/src/middlewared/middlewared/plugins/rdma/constants.py index d71095bdca973..a424a06a05859 100644 --- a/src/middlewared/middlewared/plugins/rdma/constants.py +++ b/src/middlewared/middlewared/plugins/rdma/constants.py @@ -3,7 +3,7 @@ class RDMAprotocols(enum.Enum): NFS = 'NFS' - ISER = 'iSER' + ISER = 'ISER' def values(): return [a.value for a in RDMAprotocols] diff --git a/src/middlewared/middlewared/plugins/rdma/rdma.py b/src/middlewared/middlewared/plugins/rdma/rdma.py index 1360fd047b767..a7eb6723cb1e0 100644 --- a/src/middlewared/middlewared/plugins/rdma/rdma.py +++ b/src/middlewared/middlewared/plugins/rdma/rdma.py @@ -132,5 +132,5 @@ async def capable_protocols(self): is_ent = await self.middleware.call('system.is_enterprise') if is_ent and 'MINI' not in await self.middleware.call('truenas.get_chassis_hardware'): if await self.middleware.call('rdma.get_link_choices', True): - result.append(RDMAprotocols.NFS.value) + result.extend([RDMAprotocols.NFS.value, RDMAprotocols.ISER.value]) return result