From 09c132dcc763ba205ea2bc95848f416642579157 Mon Sep 17 00:00:00 2001
From: Pawel Kaminski <pawelx.kaminski@intel.com>
Date: Thu, 29 Nov 2018 10:42:55 -0500
Subject: [PATCH] spdkcli: Remove uuid when displaying namespaces.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Not all bdevs have uuid attribute.
Fixes #510.

Change-Id: Ie3055563c8b88c002b5af45eb528ffbef5ec2166
Signed-off-by: Pawel Kaminski <pawelx.kaminski@intel.com>
Reviewed-on: https://review.gerrithub.io/435466
Tested-by: SPDK CI Jenkins <sys_sgci@intel.com>
Reviewed-by: Paweł Niedźwiecki <pawelx.niedzwiecki@intel.com>
Reviewed-by: Jim Harris <james.r.harris@intel.com>
Reviewed-by: Shuhei Matsumoto <shuhei.matsumoto.xt@hitachi.com>
Chandler-Test-Pool: SPDK Automated Test System <sys_sgsw@intel.com>
---
 scripts/spdkcli/ui_node_nvmf.py                  |  3 +--
 test/spdkcli/match_files/spdkcli_nvmf.test.match | 12 ++++++------
 2 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/scripts/spdkcli/ui_node_nvmf.py b/scripts/spdkcli/ui_node_nvmf.py
index ff152850f..c979c2478 100644
--- a/scripts/spdkcli/ui_node_nvmf.py
+++ b/scripts/spdkcli/ui_node_nvmf.py
@@ -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
diff --git a/test/spdkcli/match_files/spdkcli_nvmf.test.match b/test/spdkcli/match_files/spdkcli_nvmf.test.match
index 951c192b9..736c53090 100644
--- a/test/spdkcli/match_files/spdkcli_nvmf.test.match
+++ b/test/spdkcli/match_files/spdkcli_nvmf.test.match
@@ -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 .................................................................................................................. [...]