openstack
/
neutron
Code Issues Proposed changes

Allow setting Agents description to None 

Fix the validator for the 'description' attribute of Agents, allowing
it to be set to None.

Fix an API test that had two problems:
 1. It was not restoring the description to the agent it had updated
 2. It was retoring the description to '' instead of None.

Closes-Bug: #1466642

Change-Id: I50723e1346be0953d26216ba24907bac008ccfb6
(cherry picked from commit ee14186fbb)
This commit is contained in:
Henry Gessau 2015-06-21 01:30:05 -04:00 committed by Ihar Hrachyshka
parent 516877025e
commit 834279c8f5
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
neutron/extensions/agent.py
View File

@ -52,7 +52,8 @@ RESOURCE_ATTRIBUTE_MAP = {
'is_visible': True},
'description': {'allow_post': False, 'allow_put': True,
'is_visible': True,
'validate': {'type:string': attr.DESCRIPTION_MAX_LEN}},
'validate': {
'type:string_or_none': attr.DESCRIPTION_MAX_LEN}},
},
}

4
neutron/tests/api/admin/test_agent_management.py
View File

@ -84,7 +84,7 @@ class AgentManagementTestJSON(base.BaseAdminNetworkTest):
"""
Restore the agent description after update test.
"""
description = self.agent['description'] or ''
description = self.dyn_agent['description']
origin_agent = {'description': description}
self.admin_client.update_agent(agent_id=self.agent['id'],
self.admin_client.update_agent(agent_id=self.dyn_agent['id'],
agent_info=origin_agent)