From: Henry Gessau <gessau@cisco.com>
Date: Sun, 21 Jun 2015 05:30:05 +0000 (-0400)
Subject: Allow setting Agents description to None
X-Git-Url: https://review.fuel-infra.org/gitweb?a=commitdiff_plain;h=ee14186fbb2486f9088103e9621bc366cc64c552;p=openstack-build%2Fneutron-build.git

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
---

diff --git a/neutron/extensions/agent.py b/neutron/extensions/agent.py
index c2fab0bcc..3ef07fd7e 100644
--- a/neutron/extensions/agent.py
+++ b/neutron/extensions/agent.py
@@ -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}},
     },
 }
 
diff --git a/neutron/tests/api/admin/test_agent_management.py b/neutron/tests/api/admin/test_agent_management.py
index 013f3e44b..4136c3e99 100644
--- a/neutron/tests/api/admin/test_agent_management.py
+++ b/neutron/tests/api/admin/test_agent_management.py
@@ -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)