From f0784ce864764e15e818232485f24678522d9407 Mon Sep 17 00:00:00 2001 From: Julia Kreger Date: Wed, 6 Apr 2016 08:43:22 -0400 Subject: [PATCH] Rename juno name state modification method 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 --- ironic/api/controllers/v1/node.py | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/ironic/api/controllers/v1/node.py b/ironic/api/controllers/v1/node.py index 381eb3ce68..b7da393318 100644 --- a/ironic/api/controllers/v1/node.py +++ b/ironic/api/controllers/v1/node.py @@ -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 = (