Use 'node' directly in update_port()
Change-Id: I8ad95206f81bdf806f196994be669667d92566ff
This commit is contained in:
parent
a70b5365d3
commit
bfb5e5431a
@ -1733,8 +1733,8 @@ class ConductorManager(base_manager.BaseConductorManager):
|
|||||||
states.INSPECTING,
|
states.INSPECTING,
|
||||||
states.MANAGEABLE]
|
states.MANAGEABLE]
|
||||||
if (set(port_obj.obj_what_changed()) & connectivity_attr
|
if (set(port_obj.obj_what_changed()) & connectivity_attr
|
||||||
and not (task.node.provision_state in allowed_update_states
|
and not (node.provision_state in allowed_update_states
|
||||||
or task.node.maintenance)):
|
or node.maintenance)):
|
||||||
action = _("Port %(port)s can not have any connectivity "
|
action = _("Port %(port)s can not have any connectivity "
|
||||||
"attributes (%(connect)s) updated unless "
|
"attributes (%(connect)s) updated unless "
|
||||||
"node %(node)s is in a %(allowed)s state "
|
"node %(node)s is in a %(allowed)s state "
|
||||||
@ -1742,7 +1742,7 @@ class ConductorManager(base_manager.BaseConductorManager):
|
|||||||
|
|
||||||
raise exception.InvalidState(
|
raise exception.InvalidState(
|
||||||
action % {'port': port_uuid,
|
action % {'port': port_uuid,
|
||||||
'node': task.node.uuid,
|
'node': node.uuid,
|
||||||
'connect': ', '.join(connectivity_attr),
|
'connect': ', '.join(connectivity_attr),
|
||||||
'allowed': ', '.join(allowed_update_states)})
|
'allowed': ', '.join(allowed_update_states)})
|
||||||
|
|
||||||
|
Loading…
x
Reference in New Issue
Block a user