openstack
/
ironic
Code Issues Proposed changes

Expose 'reservation' field of a node via API 

Reservation field added to node API representation and
to internal attributes list (for prevent modification
by PATCH)

Partial-Bug: #1250348
Change-Id: I01211bf2ae4cadb8e76f99f75caecac35a861b92
This commit is contained in:
Yuriy Zveryanskyy 2014-02-04 15:21:01 +02:00
parent 4f4b0c6c40
commit 98a399c3ca
2 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -51,8 +51,8 @@ class NodePatchType(types.JsonPatchType):
def internal_attrs():
defaults = types.JsonPatchType.internal_attrs()
return defaults + ['/last_error', '/maintenance', '/power_state',
'/provision_state', '/target_power_state',
'/target_provision_state']
'/provision_state', '/reservation',
'/target_power_state', '/target_provision_state']
@staticmethod
def mandatory_attrs():
@ -243,6 +243,10 @@ class Node(base.APIBase):
provision_state = wtypes.text
"Represent the current (not transition) provision state of the node"
# TODO(yuriyz): make 'reservation' read-only for users
reservation = wtypes.text
"The hostname of the conductor that holds an exclusive lock on the node."
maintenance = wsme.wsattr(bool, default=False)
"Indicates whether the node is in maintenance mode."
@ -326,7 +330,7 @@ class Node(base.APIBase):
target_power_state=ir_states.NOSTATE,
last_error=None, provision_state=ir_states.ACTIVE,
target_provision_state=ir_states.NOSTATE,
driver='fake', driver_info={}, extra={},
reservation=None, driver='fake', driver_info={}, extra={},
properties={'memory_mb': '1024', 'local_gb': '10',
'cpus': '1'}, updated_at=time, created_at=time)
# NOTE(matty_dubs): The chassis_uuid getter() is based on the

2
ironic/tests/api/test_nodes.py
View File

@ -84,6 +84,7 @@ class TestListNodes(base.FunctionalTest):
self.assertNotIn('extra', data['nodes'][0])
self.assertNotIn('properties', data['nodes'][0])
self.assertNotIn('chassis_uuid', data['nodes'][0])
self.assertNotIn('reservation', data['nodes'][0])
# never expose the chassis_id
self.assertNotIn('chassis_id', data['nodes'][0])
@ -97,6 +98,7 @@ class TestListNodes(base.FunctionalTest):
self.assertIn('extra', data['nodes'][0])
self.assertIn('properties', data['nodes'][0])
self.assertIn('chassis_uuid', data['nodes'][0])
self.assertIn('reservation', data['nodes'][0])
# never expose the chassis_id
self.assertNotIn('chassis_id', data['nodes'][0])