Remove unused bits from node management code in utils/node.py
* Removed set_nodes_state and wait_for_provision_state functions as this code was moved to workflows * Removed "provide", "keystone_client" and "blocking" arguments and default value for "client" argument from register_all_nodes. * Removed "blocking" argument and default value for "client" argument from register_ironic_node. Change-Id: I23896b649958fdabf5cc0e2488101e56c4d5b313 Related-Bug: #1637310
This commit is contained in:
Dmitry Tantsur
parent
51086a645c
commit
a2e6c7d603
|
|
@ -64,8 +64,7 @@ class RegisterOrUpdateNodes(base.TripleOAction):
|
|||
remove=self.remove,
|
||||
glance_client=image_client,
|
||||
kernel_name=self.kernel_name,
|
||||
ramdisk_name=self.ramdisk_name,
|
||||
provide=False)
|
||||
ramdisk_name=self.ramdisk_name)
|
||||
except Exception as err:
|
||||
LOG.exception("Error registering nodes with ironic.")
|
||||
return mistral_workflow_utils.Result(
|
||||
|
|
|
|||
|
|
@ -182,66 +182,6 @@ class FindNodeHandlerTest(base.TestCase):
|
|||
nodes._find_node_handler, {'pm_type': 'foobar'})
|
||||
|
||||
|
||||
class NodeProvisionStateTest(base.TestCase):
|
||||
|
||||
def test_wait_for_provision_state(self):
|
||||
baremetal_client = mock.Mock()
|
||||
baremetal_client.node.get.return_value = mock.Mock(
|
||||
provision_state="available", last_error=None)
|
||||
nodes.wait_for_provision_state(baremetal_client, 'UUID', "available")
|
||||
|
||||
def test_wait_for_provision_state_not_found(self):
|
||||
baremetal_client = mock.Mock()
|
||||
baremetal_client.node.get.side_effect = exception.InvalidNode("boom")
|
||||
self.assertRaises(
|
||||
exception.InvalidNode,
|
||||
nodes.wait_for_provision_state,
|
||||
baremetal_client, 'UUID', "enroll")
|
||||
|
||||
def test_wait_for_provision_state_timeout(self):
|
||||
baremetal_client = mock.Mock()
|
||||
baremetal_client.node.get.return_value = mock.Mock(
|
||||
provision_state="not what we want", last_error=None)
|
||||
self.assertRaises(
|
||||
exception.Timeout,
|
||||
nodes.wait_for_provision_state,
|
||||
baremetal_client, 'UUID', "available", loops=1, sleep=0.01)
|
||||
|
||||
def test_wait_for_provision_state_fail(self):
|
||||
baremetal_client = mock.Mock()
|
||||
baremetal_client.node.get.return_value = mock.Mock(
|
||||
provision_state="enroll",
|
||||
last_error="node on fire; returning to previous state.")
|
||||
self.assertRaises(
|
||||
exception.StateTransitionFailed,
|
||||
nodes.wait_for_provision_state,
|
||||
baremetal_client, 'UUID', "available", loops=1, sleep=0.01)
|
||||
|
||||
@mock.patch('tripleo_common.utils.nodes.wait_for_provision_state')
|
||||
def test_set_nodes_state(self, wait_for_state_mock):
|
||||
|
||||
wait_for_state_mock.return_value = True
|
||||
bm_client = mock.Mock()
|
||||
|
||||
# One node already deployed, one in the manageable state after
|
||||
# introspection.
|
||||
node_list = [
|
||||
mock.Mock(uuid="ABCDEFGH", provision_state="active"),
|
||||
mock.Mock(uuid="IJKLMNOP", provision_state="manageable")
|
||||
]
|
||||
|
||||
skipped_states = ('active', 'available')
|
||||
affected_nodes = nodes.set_nodes_state(bm_client, node_list, 'provide',
|
||||
'available', skipped_states)
|
||||
uuids = [node.uuid for node in affected_nodes]
|
||||
|
||||
bm_client.node.set_provision_state.assert_has_calls([
|
||||
mock.call('IJKLMNOP', 'provide'),
|
||||
])
|
||||
|
||||
self.assertEqual(uuids, ['IJKLMNOP', ])
|
||||
|
||||
|
||||
class NodesTest(base.TestCase):
|
||||
|
||||
def _get_node(self):
|
||||
|
|
|
|||
|
|
@ -15,7 +15,6 @@
|
|||
|
||||
import logging
|
||||
import re
|
||||
import time
|
||||
|
||||
import six
|
||||
|
||||
|
|
@ -207,11 +206,7 @@ def _find_node_handler(fields):
|
|||
return _find_driver_handler(driver)
|
||||
|
||||
|
||||
def register_ironic_node(node, client=None, blocking=None):
|
||||
if blocking is not None:
|
||||
LOG.warning('blocking argument to register_ironic_node is deprecated '
|
||||
'and does nothing')
|
||||
|
||||
def register_ironic_node(node, client):
|
||||
driver_info = {}
|
||||
handler = _find_node_handler(node)
|
||||
|
||||
|
|
@ -304,7 +299,7 @@ def _get_node_id(node, handler, node_map):
|
|||
return list(candidates)[0]
|
||||
|
||||
|
||||
def _update_or_register_ironic_node(node, node_map, client=None):
|
||||
def _update_or_register_ironic_node(node, node_map, client):
|
||||
handler = _find_node_handler(node)
|
||||
node_uuid = _get_node_id(node, handler, node_map)
|
||||
|
||||
|
|
@ -354,129 +349,16 @@ def _clean_up_extra_nodes(seen, client, remove=False):
|
|||
LOG.debug('Extra registered node %s found.' % node)
|
||||
|
||||
|
||||
def wait_for_provision_state(baremetal_client, node_uuid, provision_state,
|
||||
loops=10, sleep=1):
|
||||
"""Wait for a given Provisioning state in Ironic
|
||||
|
||||
Updating the provisioning state is an async operation, we
|
||||
need to wait for it to be completed.
|
||||
|
||||
:param baremetal_client: Instance of Ironic client
|
||||
:type baremetal_client: ironicclient.v1.client.Client
|
||||
|
||||
:param node_uuid: The Ironic node UUID
|
||||
:type node_uuid: str
|
||||
|
||||
:param provision_state: The provisioning state name to wait for
|
||||
:type provision_state: str
|
||||
|
||||
:param loops: How many times to loop
|
||||
:type loops: int
|
||||
|
||||
:param sleep: How long to sleep between loops
|
||||
:type sleep: int
|
||||
|
||||
:raises exceptions.StateTransitionFailed: if node.last_error is set
|
||||
"""
|
||||
|
||||
for _l in range(0, loops):
|
||||
|
||||
# This will throw an exception if the UUID is not found, so no need to
|
||||
# check for node == None
|
||||
node = baremetal_client.node.get(node_uuid)
|
||||
|
||||
if node.provision_state == provision_state:
|
||||
LOG.info('Node %s set to provision state %s',
|
||||
node_uuid, provision_state)
|
||||
return
|
||||
|
||||
# node.last_error should be None after any successful operation
|
||||
if node.last_error:
|
||||
raise exception.StateTransitionFailed(node, provision_state)
|
||||
|
||||
time.sleep(sleep)
|
||||
|
||||
raise exception.Timeout(
|
||||
"Node %(uuid)s did not reach provision state %(state)s. "
|
||||
"Now in state %(actual)s." % {
|
||||
'uuid': node_uuid,
|
||||
'state': provision_state,
|
||||
'actual': node.provision_state
|
||||
}
|
||||
)
|
||||
|
||||
|
||||
def set_nodes_state(baremetal_client, nodes, transition, target_state,
|
||||
skipped_states=()):
|
||||
"""Make all nodes available in the baremetal service for a deployment
|
||||
|
||||
For each node whose provision_state is not in skipped_states, apply the
|
||||
specified transition and wait until its provision_state is target_state.
|
||||
|
||||
:param baremetal_client: Instance of Ironic client
|
||||
:type baremetal_client: ironicclient.v1.client.Client
|
||||
|
||||
:param nodes: List of Baremetal Nodes
|
||||
:type nodes: [ironicclient.v1.node.Node]
|
||||
|
||||
:param transition: The state to set for a node. The full list of states
|
||||
can be found in ironic.common.states.
|
||||
:type transition: string
|
||||
|
||||
:param target_state: The expected result state for a node. For example when
|
||||
transitioning to 'manage' the result is 'manageable'
|
||||
:type target_state: string
|
||||
|
||||
:param skipped_states: A set of states to skip, for example 'active' nodes
|
||||
are already deployed and the state can't always be
|
||||
changed.
|
||||
:type skipped_states: iterable of strings
|
||||
|
||||
:raises exception.Timeout: if a node takes too long to reach target state
|
||||
|
||||
:return List of nodes whose provision states have been altered. These
|
||||
objects will be stale, and will not reflect the real node's current
|
||||
provision_state.
|
||||
"""
|
||||
|
||||
log = logging.getLogger(__name__ + ".set_nodes_state")
|
||||
altered_nodes = []
|
||||
|
||||
for node in nodes:
|
||||
|
||||
if node.provision_state in skipped_states:
|
||||
continue
|
||||
|
||||
log.debug(
|
||||
"Setting provision state from '{0}' to '{1}' for Node {2}"
|
||||
.format(node.provision_state, transition, node.uuid))
|
||||
|
||||
baremetal_client.node.set_provision_state(node.uuid, transition)
|
||||
try:
|
||||
wait_for_provision_state(baremetal_client, node.uuid, target_state)
|
||||
except exception.StateTransitionFailed as e:
|
||||
log.error("FAIL: {0}".format(e))
|
||||
except exception.Timeout as e:
|
||||
log.error("FAIL: {0}".format(e))
|
||||
altered_nodes.append(node)
|
||||
|
||||
return altered_nodes
|
||||
|
||||
|
||||
def register_all_nodes(nodes_list, client=None, remove=False, blocking=True,
|
||||
keystone_client=None, glance_client=None,
|
||||
kernel_name=None, ramdisk_name=None, provide=True):
|
||||
def register_all_nodes(nodes_list, client, remove=False, glance_client=None,
|
||||
kernel_name=None, ramdisk_name=None):
|
||||
"""Register all nodes in nodes_list in the baremetal service.
|
||||
|
||||
:param nodes_list: The list of nodes to register.
|
||||
:param client: An Ironic client object.
|
||||
:param remove: Should nodes not in the list be removed?
|
||||
:param blocking: Ignored.
|
||||
:param keystone_client: Ignored.
|
||||
:param glance_client: A Glance client object, for fetching ramdisk images.
|
||||
:param kernel_name: Glance ID of the kernel to use for the nodes.
|
||||
:param ramdisk_name: Glance ID of the ramdisk to use for the nodes.
|
||||
:param provide: Should the node be transitioned to AVAILABLE state?
|
||||
:return: list of node objects representing the new nodes.
|
||||
"""
|
||||
|
||||
|
|
@ -500,16 +382,6 @@ def register_all_nodes(nodes_list, client=None, remove=False, blocking=True,
|
|||
|
||||
_clean_up_extra_nodes(seen, client, remove=remove)
|
||||
|
||||
if provide:
|
||||
manageable_nodes = set_nodes_state(
|
||||
client, seen, "manage", "manageable",
|
||||
skipped_states={'manageable', 'available'}
|
||||
)
|
||||
set_nodes_state(
|
||||
client, manageable_nodes, "provide", "available",
|
||||
skipped_states={'available'}
|
||||
)
|
||||
|
||||
return seen
|
||||
|
||||
|
||||
|
|
|
|||
Loading…
Reference in New Issue