openstack/ironic
Code Issues Proposed changes

Merge "Show maintenance field in GET /nodes"

Browse Source
This commit is contained in:
Jenkins 2014-04-07 19:27:22 +00:00 committed by Gerrit Code Review
commit 07fa9faaf4
2 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -340,7 +340,7 @@ class Node(base.APIBase):
@classmethod
def _convert_with_links(cls, node, url, expand=True):
if not expand:
except_list = ['instance_uuid', 'power_state',
except_list = ['instance_uuid', 'maintenance', 'power_state',
'provision_state', 'uuid']
node.unset_fields_except(except_list)
else:

6
ironic/tests/api/v1/test_nodes.py
View File

@ -82,6 +82,11 @@ class TestListNodes(base.FunctionalTest):
ndict = dbutils.get_test_node()
node = self.dbapi.create_node(ndict)
data = self.get_json('/nodes')
self.assertIn('instance_uuid', data['nodes'][0])
self.assertIn('maintenance', data['nodes'][0])
self.assertIn('power_state', data['nodes'][0])
self.assertIn('provision_state', data['nodes'][0])
self.assertIn('uuid', data['nodes'][0])
self.assertEqual(node['uuid'], data['nodes'][0]["uuid"])
self.assertNotIn('driver', data['nodes'][0])
self.assertNotIn('driver_info', data['nodes'][0])
@ -89,7 +94,6 @@ class TestListNodes(base.FunctionalTest):
self.assertNotIn('properties', data['nodes'][0])
self.assertNotIn('chassis_uuid', data['nodes'][0])
self.assertNotIn('reservation', data['nodes'][0])
self.assertNotIn('maintenance', data['nodes'][0])
self.assertNotIn('console_enabled', data['nodes'][0])
self.assertNotIn('target_power_state', data['nodes'][0])
self.assertNotIn('target_provision_state', data['nodes'][0])