diff --git a/scripts/spdkcli/ui_node.py b/scripts/spdkcli/ui_node.py index 432bf3fc7..f0f41f6ac 100644 --- a/scripts/spdkcli/ui_node.py +++ b/scripts/spdkcli/ui_node.py @@ -119,7 +119,10 @@ class UILvolStores(UINode): def ui_command_delete_all(self): for lvs in self._children: - self.delete(None, lvs.lvs.uuid) + try: + self.delete(None, lvs.lvs.uuid) + except JSONRPCException as e: + self.shell.log.error(e.message) def summary(self): return "Lvol stores: %s" % len(self.children), None @@ -142,7 +145,10 @@ class UIBdev(UINode): def ui_command_delete_all(self): """Delete all bdevs from this tree node.""" for bdev in self._children: - self.delete(bdev.name) + try: + self.delete(bdev.name) + except JSONRPCException as e: + self.shell.log.error(e.message) def summary(self): return "Bdevs: %d" % len(self.children), None @@ -288,7 +294,10 @@ class UINvmeBdev(UIBdev): ctrlrs = [x.rsplit("n", 1)[0] for x in ctrlrs] ctrlrs = set(ctrlrs) for ctrlr in ctrlrs: - self.delete(ctrlr) + try: + self.delete(ctrlr) + except JSONRPCException as e: + self.shell.log.error(e.message) def ui_command_delete(self, name): """ diff --git a/scripts/spdkcli/ui_node_iscsi.py b/scripts/spdkcli/ui_node_iscsi.py index d3e153675..212c39530 100644 --- a/scripts/spdkcli/ui_node_iscsi.py +++ b/scripts/spdkcli/ui_node_iscsi.py @@ -126,7 +126,10 @@ class UIISCSIDevices(UINode): def ui_command_delete_all(self): """Delete all target nodes""" for device in self.scsi_devices: - self.delete(device.device_name) + try: + self.delete(device.device_name) + except JSONRPCException as e: + self.shell.log.error(e.message) def ui_command_add_lun(self, name, bdev_name, lun_id=None): """Add lun to the target node. @@ -315,13 +318,19 @@ class UIPortalGroups(UINode): def ui_command_delete_all(self): """Delete all portal groups""" for pg in self.pgs: - self.delete(pg.tag) + try: + self.delete(pg.tag) + except JSONRPCException as e: + self.shell.log.error(e.message) def refresh(self): self._children = set([]) self.pgs = list(self.get_root().get_portal_groups()) for pg in self.pgs: - UIPortalGroup(pg, self) + try: + UIPortalGroup(pg, self) + except JSONRPCException as e: + self.shell.log.error(e.message) def summary(self): return "Portal groups: %d" % len(self.pgs), None @@ -384,7 +393,10 @@ class UIInitiatorGroups(UINode): def ui_command_delete_all(self): """Delete all initiator groups""" for ig in self.igs: - self.delete(ig.tag) + try: + self.delete(ig.tag) + except JSONRPCException as e: + self.shell.log.error(e.message) def ui_command_add_initiator(self, tag, initiators, netmasks): """Add initiators to an existing initiator group. @@ -531,7 +543,10 @@ class UIISCSIAuthGroups(UINode): def ui_command_delete_all(self): """Delete all authentication groups.""" for iscsi_auth_group in self.iscsi_auth_groups: - self.delete(iscsi_auth_group['tag']) + try: + self.delete(iscsi_auth_group['tag']) + except JSONRPCException as e: + self.shell.log.error(e.message) def ui_command_add_secret(self, tag, user, secret, muser=None, msecret=None): @@ -570,7 +585,10 @@ class UIISCSIAuthGroups(UINode): for ag in self.iscsi_auth_groups: if ag['tag'] == tag: for secret in ag['secrets']: - self.delete_secret(tag, secret['user']) + try: + self.delete_secret(tag, secret['user']) + except JSONRPCException as e: + self.shell.log.error(e.message) def summary(self): return "Groups: %s" % len(self.iscsi_auth_groups), None diff --git a/scripts/spdkcli/ui_node_nvmf.py b/scripts/spdkcli/ui_node_nvmf.py index b689e23d0..8388de15e 100644 --- a/scripts/spdkcli/ui_node_nvmf.py +++ b/scripts/spdkcli/ui_node_nvmf.py @@ -103,7 +103,10 @@ class UINVMfSubsystems(UINode): def ui_command_delete_all(self): """Delete all subsystems""" for child in self._children: - self.delete(child.subsystem.nqn) + try: + self.delete(child.subsystem.nqn) + except JSONRPCException as e: + self.shell.log.error(e.message) def summary(self): return "Subsystems: %s" % len(self.children), None @@ -204,7 +207,10 @@ class UINVMfSubsystemListeners(UINode): def ui_command_delete_all(self): """Remove all address listeners from subsystem.""" for la in self.listen_addresses: - self.delete(la['trtype'], la['traddr'], la['trsvcid'], la['adrfam']) + try: + self.delete(la['trtype'], la['traddr'], la['trsvcid'], la['adrfam']) + except JSONRPCException as e: + self.shell.log.error(e.message) def summary(self): return "Addresses: %s" % len(self.listen_addresses), None @@ -261,7 +267,10 @@ class UINVMfSubsystemHosts(UINode): def ui_command_delete_all(self): """Delete host from subsystem""" for host in self.hosts: - self.delete(host['nqn']) + try: + self.delete(host['nqn']) + except JSONRPCException as e: + self.shell.log.error(e.message) def summary(self): return "Hosts: %s" % len(self.hosts), None @@ -323,7 +332,10 @@ class UINVMfSubsystemNamespaces(UINode): def ui_command_delete_all(self): """Delete all namespaces from subsystem.""" for namespace in self.namespaces: - self.delete(namespace['nsid']) + try: + self.delete(namespace['nsid']) + except JSONRPCException as e: + self.shell.log.error(e.message) def summary(self): return "Namespaces: %s" % len(self.namespaces), None