openstack
/
neutron
Code Issues Proposed changes

Merge "Allow setting Agents description to None" into stable/kilo

This commit is contained in:
Jenkins 2015-10-07 23:50:13 +00:00 committed by Gerrit Code Review
parent 78eb2c5b69 834279c8f5
commit d9398261ce
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}, 'is_visible': True},
'description': {'allow_post': False, 'allow_put': True, 'description': {'allow_post': False, 'allow_put': True,
'is_visible': 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. Restore the agent description after update test.
""" """
description = self.agent['description'] or '' description = self.dyn_agent['description']
origin_agent = {'description': 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) agent_info=origin_agent)