openstack/ironic
Code Issues Proposed changes

Rename juno name state modification method

Browse Source 
The provision name state modification method exiplicitly has juno
in the name of the method. Since this is a method to convert the
returned states to clients in backwards compatible ways and
it will be present until the end of time, we should name it
something that does not have a connotation with a specific
release.

Change-Id: Ie3c7c2b1e7557f9187885f623e12ab0da2d63bbf
This commit is contained in:
Julia Kreger 2016-04-06 08:43:22 -04:00
parent 2502eba2d4
commit f0784ce864
1 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
ironic/api/controllers/v1/node.py
View File

@ -118,7 +118,12 @@ def hide_fields_in_newer_versions(obj):
obj.target_raid_config = wsme.Unset
def assert_juno_provision_state_name(obj):
def update_state_in_older_versions(obj):
"""Change provision state names for API backwards compatability.
:param obj: The object being returned to the API client that is
to be updated by this method.
"""
# if requested version is < 1.2, convert AVAILABLE to the old NOSTATE
if (pecan.request.version.minor < versions.MINOR_2_AVAILABLE_STATE and
obj.provision_state == ir_states.AVAILABLE):
@ -306,7 +311,7 @@ class NodeStates(base.APIBase):
states = NodeStates()
for attr in attr_list:
setattr(states, attr, getattr(rpc_node, attr))
assert_juno_provision_state_name(states)
update_state_in_older_versions(states)
return states
@classmethod
@ -748,7 +753,7 @@ class Node(base.APIBase):
if fields is not None:
api_utils.check_for_invalid_fields(fields, node.as_dict())
assert_juno_provision_state_name(node)
update_state_in_older_versions(node)
hide_fields_in_newer_versions(node)
show_password = pecan.request.context.show_password
show_states_links = (