Merge "Client addition for Active Node Creation verb adopt"

ironicclient/tests/unit/v1/test_node_shell.py

@@ -673,6 +673,18 @@ class NodeShellTest(utils.BaseTestCase):
         client_mock.node.set_provision_state.assert_called_once_with(
             'node_uuid', 'abort', configdrive=None, cleansteps=None)
 
+    def test_do_node_set_provision_state_adopt(self):
+        client_mock = mock.MagicMock()
+        args = mock.MagicMock()
+        args.node = 'node_uuid'
+        args.provision_state = 'adopt'
+        args.config_drive = None
+        args.clean_steps = None
+
+        n_shell.do_node_set_provision_state(client_mock, args)
+        client_mock.node.set_provision_state.assert_called_once_with(
+            'node_uuid', 'adopt', cleansteps=None, configdrive=None)
+
     def test_do_node_set_console_mode(self):
         client_mock = mock.MagicMock()
         args = mock.MagicMock()

ironicclient/v1/node_shell.py

@@ -472,9 +472,10 @@ def do_node_set_target_raid_config(cc, args):
     'provision_state',
     metavar='<provision-state>',
     choices=['active', 'deleted', 'rebuild', 'inspect', 'provide',
-             'manage', 'clean', 'abort'],
+             'manage', 'clean', 'abort', 'adopt'],
     help="Supported states: 'active', 'deleted', 'rebuild', "
-         "'inspect', 'provide', 'manage', 'clean' or 'abort'.")
+         "'inspect', 'provide', 'manage', 'clean', 'abort', "
+         "or 'adopt'.")
 @cliutils.arg(
     '--config-drive',
     metavar='<config-drive>',

releasenotes/notes/provision-state-adopt-d07b838813cecfb1.yaml

@@ -0,0 +1,6 @@
+---
+features:
+  - Support has been added for the node-set-provision-state verb
+    ``adopt`` which requires API version 1.17. This feature allows
+    an operator move a node from ``MANAGABLE`` state to ``ACTIVE``
+    state without performing cleaning or a deployment operation.