openstack/ironic
Code Issues Proposed changes

Merge "Report provisioned state where appropiate when raising InvalidState* Exceptions"

Browse Source
This commit is contained in:
Zuul
2025-06-16 19:19:12 +00:00
committed by Gerrit Code Review
parent c5d274d31a d4cf0e76a6
commit 08614b5420
2 changed files with 20 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
ironic/conductor/manager.py
View File

@ -223,7 +223,8 @@ class ConductorManager(base_manager.BaseConductorManager):
states.AVAILABLE]
action = _("Node %(node)s can not have %(field)s "
"updated unless it is in one of allowed "
"(%(allowed)s) states or in maintenance mode.")
"(%(allowed)s) states or in maintenance mode. "
"Current state is '%(state)s'.")
updating_driver = 'driver' in delta
check_interfaces = updating_driver
for iface in drivers_base.ALL_INTERFACES:
@ -239,7 +240,8 @@ class ConductorManager(base_manager.BaseConductorManager):
raise exception.InvalidState(
action % {'node': node_obj.uuid,
'allowed': ', '.join(allowed_update_states),
'field': interface_field})
'field': interface_field,
'state': node_obj.provision_state})
check_interfaces = True
@ -268,10 +270,12 @@ class ConductorManager(base_manager.BaseConductorManager):
not in allowed_update_states):
action = _("Node %(node)s can not have resource_class "
"updated unless it is in one of allowed "
"(%(allowed)s) states.")
"(%(allowed)s) states. "
"Current state is '%(state)s'.")
raise exception.InvalidState(
action % {'node': node_obj.uuid,
'allowed': ', '.join(allowed_update_states)})
'allowed': ', '.join(allowed_update_states),
'state': task.node.provision_state})
if ('instance_uuid' in delta and task.node.allocation_id
and not node_obj.instance_uuid):
@ -280,10 +284,12 @@ class ConductorManager(base_manager.BaseConductorManager):
action = _("Node %(node)s with an allocation can not have "
"instance_uuid removed unless it is in one of "
"allowed (%(allowed)s) states or in "
"maintenance mode.")
"maintenance mode. "
"Current state is '%(state)s'.")
raise exception.InvalidState(
action % {'node': node_obj.uuid,
'allowed': ', '.join(allowed_update_states)})
'allowed': ', '.join(allowed_update_states),
'state': task.node.provision_state})
try:
allocation = objects.Allocation.get_by_id(
@ -2611,12 +2617,14 @@ class ConductorManager(base_manager.BaseConductorManager):
and not node.maintenance):
action = _("Portgroup %(portgroup)s can not be associated "
"to node %(node)s unless the node is in a "
"%(allowed)s state or in maintenance mode.")
"%(allowed)s state or in maintenance mode. "
"Current state is '%(state)s'.")
raise exception.InvalidState(
action % {'portgroup': portgroup_uuid,
'node': node.uuid,
'allowed': ', '.join(allowed_update_states)})
'allowed': ', '.join(allowed_update_states),
'state': node.provision_state})
# NOTE(zhenguo): If portgroup update is modifying the
# portgroup-node association then there should not be

6
ironic/tests/unit/conductor/test_manager.py
View File

@ -1278,8 +1278,10 @@ class UpdateNodeTestCase(mgr_utils.ServiceSetUpMixin, db_base.DbTestCase):
expected_msg_regex = \
(r'^Node {} can not have resource_class updated unless it is '
r'in one of allowed \(.*\) states.$').format(
re.escape(node.uuid))
r'in one of allowed \(.*\) states. '
r'Current state is \'{}\'.$').format(
re.escape(node.uuid),
re.escape(node.provision_state))
self.assertRegex(str(exc.exc_info[1]), expected_msg_regex)
# verify change did not happen