Commit 09c132dc authored by Pawel Kaminski's avatar Pawel Kaminski Committed by Jim Harris
Browse files

spdkcli: Remove uuid when displaying namespaces. 



Not all bdevs have uuid attribute.
Fixes #510.

Change-Id: Ie3055563c8b88c002b5af45eb528ffbef5ec2166
Signed-off-by: default avatarPawel Kaminski <pawelx.kaminski@intel.com>
Reviewed-on: https://review.gerrithub.io/435466


Tested-by: default avatarSPDK CI Jenkins <sys_sgci@intel.com>
Reviewed-by: default avatarPaweł Niedźwiecki <pawelx.niedzwiecki@intel.com>
Reviewed-by: default avatarJim Harris <james.r.harris@intel.com>
Reviewed-by: default avatarShuhei Matsumoto <shuhei.matsumoto.xt@hitachi.com>
Chandler-Test-Pool: SPDK Automated Test System <sys_sgsw@intel.com>
parent 5aca5cd7

scripts/spdkcli/ui_node_nvmf.py

+1 −2
Original line number Diff line number Diff line
@@ -388,6 +388,5 @@ class UINVMfSubsystemNamespace(UINode): 
        self.namespace = namespace



    def summary(self):

        info = ", ".join([str(self.namespace['uuid']), self.namespace['name'],

                          str(self.namespace['nsid'])])

        info = ", ".join([self.namespace['name'], str(self.namespace['nsid'])])

        return info, None

test/spdkcli/match_files/spdkcli_nvmf.test.match

+6 −6
Original line number Diff line number Diff line
@@ -11,16 +11,16 @@ o- nvmf ........................................................................ 
  | | | o- $(N).$(N).$(N).$(N):4261 $(S) [RDMA]

  | | | o- $(N).$(N).$(N).$(N):4262 $(S) [RDMA]

  | | o- namespaces ................................................................................................ [Namespaces: 4]

  | |   o- Malloc3 .............................................................. [$(X)-$(X)-$(X)-$(X)-$(X), Malloc3, 1]

  | |   o- Malloc4 .............................................................. [$(X)-$(X)-$(X)-$(X)-$(X), Malloc4, 2]

  | |   o- Malloc5 .............................................................. [$(X)-$(X)-$(X)-$(X)-$(X), Malloc5, 3]

  | |   o- Malloc6 .............................................................. [$(X)-$(X)-$(X)-$(X)-$(X), Malloc6, 4]

  | |   o- Malloc3 .................................................................................................... [Malloc3, 1]

  | |   o- Malloc4 .................................................................................................... [Malloc4, 2]

  | |   o- Malloc5 .................................................................................................... [Malloc5, 3]

  | |   o- Malloc6 .................................................................................................... [Malloc6, 4]

  | o- nqn.2014-08.org.spdk:cnode2 ...................................................... [sn=$(S), st=NVMe, Allow any host]

  | | o- hosts .......................................................................................................... [Hosts: 0]

  | | o- listen_addresses ........................................................................................... [Addresses: 1]

  | | | o- $(N).$(N).$(N).$(N):4260 $(S) [RDMA]

  | | o- namespaces ................................................................................................ [Namespaces: 1]

  | |   o- Malloc2 .............................................................. [$(X)-$(X)-$(X)-$(X)-$(X), Malloc2, 1]

  | |   o- Malloc2 .................................................................................................... [Malloc2, 1]

  | o- nqn.2014-08.org.spdk:cnode3 ...................................................... [sn=$(S), st=NVMe, Allow any host]

  |   o- hosts .......................................................................................................... [Hosts: 2]

  |   | o- nqn.2014-08.org.spdk:cnode1 ....................................................................................... [...]
@@ -29,6 +29,6 @@ o- nvmf ........................................................................ 
  |   | o- $(N).$(N).$(N).$(N):4260 $(S) [RDMA]

  |   | o- $(N).$(N).$(N).$(N):4261 $(S) [RDMA]

  |   o- namespaces ................................................................................................ [Namespaces: 1]

  |     o- Malloc1 .............................................................. [$(X)-$(X)-$(X)-$(X)-$(X), Malloc1, 1]

  |     o- Malloc1 .................................................................................................... [Malloc1, 1]

  o- transport ..................................................................................................... [Transports: 1]

    o- RDMA .................................................................................................................. [...]