Skip to content

Commit d0dcdce

Browse files
authored
Merge pull request ceph#63366 from Hezko/nvmeof-cli-align-part-2
mgr/dashboard: align cli commands listener list, ns list, host list
2 parents deab7d4 + 0e9c69a commit d0dcdce

File tree

1 file changed

+9
-3
lines changed

1 file changed

+9
-3
lines changed

src/pybind/mgr/dashboard/model/nvmeof.py

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -91,8 +91,6 @@ class NamespaceCreation(NamedTuple):
9191

9292

9393
class Namespace(NamedTuple):
94-
nsid: Optional[int]
95-
uuid: Optional[str]
9694
bdev_name: str
9795
rbd_image_name: str
9896
rbd_pool_name: str
@@ -103,7 +101,12 @@ class Namespace(NamedTuple):
103101
rw_mbytes_per_second: int
104102
r_mbytes_per_second: int
105103
w_mbytes_per_second: int
106-
trash_image: bool
104+
auto_visible: bool
105+
hosts: List[str]
106+
nsid: Optional[int]
107+
uuid: Optional[str]
108+
ns_subsystem_nqn: Optional[str]
109+
trash_image: Optional[bool]
107110

108111

109112
class NamespaceList(NamedTuple):
@@ -146,6 +149,7 @@ class Listener(NamedTuple):
146149
host_name: str
147150
trtype: str
148151
traddr: str
152+
secure: bool
149153
adrfam: int = 0 # 0: IPv4, 1: IPv6
150154
trsvcid: int = 4420
151155

@@ -158,6 +162,8 @@ class ListenerList(NamedTuple):
158162

159163
class Host(NamedTuple):
160164
nqn: str
165+
use_psk: Optional[bool]
166+
use_dhchap: Optional[bool]
161167

162168

163169
class HostsInfo(NamedTuple):

0 commit comments

Comments
 (0)