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

spdkcli: Add try-except section to delete_all commands 



Call delete method for all objects in delete_all commands

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


Tested-by: default avatarSPDK CI Jenkins <sys_sgci@intel.com>
Reviewed-by: default avatarPawel Wodkowski <pawelx.wodkowski@intel.com>
Reviewed-by: default avatarBen Walker <benjamin.walker@intel.com>
Reviewed-by: default avatarJim Harris <james.r.harris@intel.com>
parent e1218463

scripts/spdkcli/ui_node.py

+12 −3
Original line number Diff line number Diff line
@@ -117,7 +117,10 @@ class UILvolStores(UINode): 


    def ui_command_delete_all(self):

        for lvs in self._children:

            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
@@ -140,7 +143,10 @@ class UIBdev(UINode): 
    def ui_command_delete_all(self):

        """Delete all bdevs from this tree node."""

        for bdev in self._children:

            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
@@ -286,7 +292,10 @@ class UINvmeBdev(UIBdev): 
        ctrlrs = [x.rsplit("n", 1)[0] for x in ctrlrs]

        ctrlrs = set(ctrlrs)

        for ctrlr in ctrlrs:

            try:

                self.delete(ctrlr)

            except JSONRPCException as e:

                self.shell.log.error(e.message)



    def ui_command_delete(self, name):

        """

scripts/spdkcli/ui_node_iscsi.py

+24 −6
Original line number Diff line number Diff line
@@ -126,7 +126,10 @@ class UIISCSIDevices(UINode): 
    def ui_command_delete_all(self):

        """Delete all target nodes"""

        for device in self.scsi_devices:

            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:

            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:

            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:

            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:

            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']:

                    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

scripts/spdkcli/ui_node_nvmf.py

+16 −4
Original line number Diff line number Diff line
@@ -103,7 +103,10 @@ class UINVMfSubsystems(UINode): 
    def ui_command_delete_all(self):

        """Delete all subsystems"""

        for child in self._children:

            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:

            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:

            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:

            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