Merge "continue to delete next node if failed with previous one"

ironicclient/tests/unit/v1/test_node_shell.py

@@ -79,6 +79,17 @@ class NodeShellTest(utils.BaseTestCase):
         client_mock.node.delete.assert_has_calls(
             [mock.call('node_uuid1'), mock.call('node_uuid2')])
 
+    def test_do_node_delete_multiple_with_exception(self):
+        client_mock = mock.MagicMock()
+        client_mock.node.delete.side_effect = (
+            [exceptions.ClientException, None])
+        args = mock.MagicMock()
+        args.node = ['node_uuid1', 'node_uuid2']
+
+        n_shell.do_node_delete(client_mock, args)
+        client_mock.node.delete.assert_has_calls(
+            [mock.call('node_uuid1'), mock.call('node_uuid2')])
+
     def test_do_node_update(self):
         client_mock = mock.MagicMock()
         args = mock.MagicMock()

ironicclient/v1/node_shell.py

@@ -261,8 +261,12 @@ def do_node_create(cc, args):
 def do_node_delete(cc, args):
     """Unregister node(s) from the Ironic service."""
     for n in args.node:
-        cc.node.delete(n)
-        print(_('Deleted node %s') % n)
+        try:
+            cc.node.delete(n)
+            print(_('Deleted node %s') % n)
+        except exceptions.ClientException as e:
+            print(_("Failed to delete node %(node)s: %(error)s")
+                  % {'node': n, 'error': e})
 
 
 @cliutils.arg('node', metavar='<node>', help="Name or UUID of the node.")

releasenotes/notes/continue-del-next-node-8827e67e1c41a0a5.yaml

@@ -0,0 +1,3 @@
+---
+fixes:
+  - when deleting multiple nodes, continue with deletes even if one fails.