openstack/senlin
Code Issues Proposed changes

Merge "Add engine support for node_list2"

Browse Source
This commit is contained in:
Jenkins 2016-10-28 02:20:32 +00:00 committed by Gerrit Code Review
commit 83f01583c5
2 changed files with 138 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
senlin/engine/service.py
View File

@ -1574,6 +1574,40 @@ class EngineService(service.Service):
return [node.to_dict() for node in nodes]
@request_context2
def node_list2(self, ctx, req):
"""List node records matching the specified criteria.
:param ctx: An instance of the request context.
:param req: An instance of the NodeListRequestBody object.
:return: A list of `Node` object representations.
"""
req.obj_set_defaults()
if not req.project_safe and not ctx.is_admin:
raise exception.Forbidden()
query = {'project_safe': req.project_safe}
if req.obj_attr_is_set('limit'):
query['limit'] = req.limit
if req.obj_attr_is_set('marker'):
query['marker'] = req.marker
if req.obj_attr_is_set('sort') and req.sort is not None:
query['sort'] = req.sort
if req.obj_attr_is_set('cluster_id') and req.cluster_id:
db_cluster = self.cluster_find(ctx, req.cluster_id)
query['cluster_id'] = db_cluster.id
filters = {}
if req.obj_attr_is_set('name'):
filters['name'] = req.name
if req.obj_attr_is_set('status'):
filters['status'] = req.status
if filters:
query['filters'] = filters
nodes = node_mod.Node.load_all(ctx, **query)
return [node.to_dict() for node in nodes]
@request_context2
def node_create2(self, ctx, req):
"""Create a node.

104
senlin/tests/unit/engine/service/test_nodes.py
View File

@ -244,6 +244,110 @@ class NodeTest(base.SenlinTestCase):
limit=None, marker=None,
project_safe=True)
@mock.patch.object(node_mod.Node, 'load_all')
def test_node_list2(self, mock_load):
obj_1 = mock.Mock()
obj_1.to_dict.return_value = {'k': 'v1'}
obj_2 = mock.Mock()
obj_2.to_dict.return_value = {'k': 'v2'}
mock_load.return_value = [obj_1, obj_2]
req = orno.NodeListRequestBody()
result = self.eng.node_list2(self.ctx, req.obj_to_primitive())
self.assertEqual([{'k': 'v1'}, {'k': 'v2'}], result)
mock_load.assert_called_once_with(self.ctx, project_safe=True)
@mock.patch.object(service.EngineService, 'cluster_find')
@mock.patch.object(node_mod.Node, 'load_all')
def test_node_list2_with_cluster_id(self, mock_load, mock_find):
obj_1 = mock.Mock()
obj_1.to_dict.return_value = {'k': 'v1'}
obj_2 = mock.Mock()
obj_2.to_dict.return_value = {'k': 'v2'}
mock_load.return_value = [obj_1, obj_2]
mock_find.return_value = mock.Mock(id='CLUSTER_ID')
req = orno.NodeListRequestBody(cluster_id='MY_CLUSTER_NAME',
project_safe=True)
result = self.eng.node_list2(self.ctx, req.obj_to_primitive())
self.assertEqual([{'k': 'v1'}, {'k': 'v2'}], result)
mock_find.assert_called_once_with(self.ctx, 'MY_CLUSTER_NAME')
mock_load.assert_called_once_with(self.ctx, cluster_id='CLUSTER_ID',
project_safe=True)
@mock.patch.object(node_mod.Node, 'load_all')
def test_node_list2_with_params(self, mock_load):
obj_1 = mock.Mock()
obj_1.to_dict.return_value = {'k': 'v1'}
obj_2 = mock.Mock()
obj_2.to_dict.return_value = {'k': 'v2'}
mock_load.return_value = [obj_1, obj_2]
MARKER_UUID = '2fd5b45f-bae4-4cdb-b283-a71e9f9805c7'
req = orno.NodeListRequestBody(status=['ACTIVE'], sort='status',
limit=123,
marker=MARKER_UUID,
project_safe=True)
result = self.eng.node_list2(self.ctx, req.obj_to_primitive())
self.assertEqual([{'k': 'v1'}, {'k': 'v2'}], result)
mock_load.assert_called_once_with(self.ctx, sort='status', limit=123,
marker=MARKER_UUID,
project_safe=True,
filters={'status': ['ACTIVE']})
@mock.patch.object(service.EngineService, 'cluster_find')
def test_node_list2_cluster_not_found(self, mock_find):
mock_find.side_effect = exc.ResourceNotFound(type='cluster',
id='BOGUS')
req = orno.NodeListRequestBody(cluster_id='BOGUS',
project_safe=True)
ex = self.assertRaises(rpc.ExpectedException,
self.eng.node_list2,
self.ctx, req.obj_to_primitive())
self.assertEqual(exc.ResourceNotFound, ex.exc_info[0])
self.assertEqual("The cluster (BOGUS) could not be found.",
six.text_type(ex.exc_info[1]))
mock_find.assert_called_once_with(self.ctx, 'BOGUS')
@mock.patch.object(node_mod.Node, 'load_all')
def test_node_list2_with_project_safe(self, mock_load):
mock_load.return_value = []
req = orno.NodeListRequestBody(project_safe=True)
result = self.eng.node_list2(self.ctx, req.obj_to_primitive())
self.assertEqual([], result)
mock_load.assert_called_once_with(self.ctx, project_safe=True)
mock_load.reset_mock()
req = orno.NodeListRequestBody(project_safe=False)
ex = self.assertRaises(rpc.ExpectedException,
self.eng.node_list2,
self.ctx, req.obj_to_primitive())
self.assertEqual(exc.Forbidden, ex.exc_info[0])
self.ctx.is_admin = True
req = orno.NodeListRequestBody(project_safe=False)
result = self.eng.node_list2(self.ctx, req.obj_to_primitive())
self.assertEqual([], result)
mock_load.assert_called_once_with(self.ctx, project_safe=False)
mock_load.reset_mock()
@mock.patch.object(node_mod.Node, 'load_all')
def test_node_list2_empty(self, mock_load):
mock_load.return_value = []
req = orno.NodeListRequestBody()
result = self.eng.node_list2(self.ctx, req.obj_to_primitive())
self.assertEqual([], result)
mock_load.assert_called_once_with(self.ctx, project_safe=True)
@mock.patch.object(action_mod.Action, 'create')
@mock.patch('senlin.engine.node.Node')
@mock.patch.object(service.EngineService, 'profile_find')