]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
Merge PR #67844 into tentacle tentacle
authorPatrick Donnelly <pdonnell@ibm.com>
Tue, 14 Jul 2026 02:25:53 +0000 (22:25 -0400)
committerPatrick Donnelly <pdonnell@ibm.com>
Tue, 14 Jul 2026 02:25:53 +0000 (22:25 -0400)
* refs/pull/67844/head:
mgr/dashboard: Add "connection get_io_statistics" to NVMeoF CLI

1  2 
src/pybind/mgr/dashboard/controllers/nvmeof.py
src/pybind/mgr/dashboard/model/nvmeof.py
src/pybind/mgr/dashboard/openapi.yaml

index 19fd561f3e322d4e77746136c3444faab196bf83,73307844593c983a68c80b9059b92d585003cb2b..b7428b2013a8a96e6fb22ccd6aca72b441811adc
@@@ -413,26 -259,16 +433,26 @@@ else
          )
          @convert_to_model(model.SubsystemStatus)
          @handle_nvmeof_error
-         def create(self, nqn: str, enable_ha: Optional[bool] = True,
+         def create(self, nqn: str,
                     max_namespaces: Optional[int] = None, no_group_append: Optional[bool] = False,
                     serial_number: Optional[str] = None, dhchap_key: Optional[str] = None,
 -                   gw_group: Optional[str] = None, traddr: Optional[str] = None):
 -            return NVMeoFClient(gw_group=gw_group, traddr=traddr).stub.create_subsystem(
 +                   gw_group: Optional[str] = None, server_address: Optional[str] = None,
 +                   traddr: Optional[str] = None, network_mask: Optional[List[str]] = None,
 +                   port: Optional[int] = None, secure_listeners: Optional[bool] = False):
 +            server_address = resolve_nvmeof_server_address(
 +                server_address=server_address,
 +                traddr=traddr
 +            )
 +            return NVMeoFClient(
 +                gw_group=gw_group,
 +                server_address=server_address
 +            ).stub.create_subsystem(
                  NVMeoFClient.pb2.create_subsystem_req(
                      subsystem_nqn=nqn, serial_number=serial_number,
-                     max_namespaces=max_namespaces, enable_ha=enable_ha,
+                     max_namespaces=max_namespaces, enable_ha=True,
                      no_group_append=no_group_append,
 -                    dhchap_key=dhchap_key
 +                    dhchap_key=dhchap_key, network_mask=network_mask,
 +                    port=port, secure_listeners=secure_listeners
                  )
              )
  
Simple merge