openstack
/
senlin
Code Issues Proposed changes

API support for profile_type_ops 

This is the API layer patch for listing operations supported by a
specific profile type.

Change-Id: Iadf975552142e964f7cbde24f55ed60798fd671f
This commit is contained in:
tengqm 2016-12-24 04:25:52 -05:00
parent 11f456338c
commit 57b7c144c1
5 changed files with 114 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
etc/senlin/policy.json
View File

@ -5,6 +5,7 @@
"build_info:build_info": "",
"profile_types:index": "",
"profile_types:get": "",
"profile_types:ops": "",
"policy_types:index": "",
"policy_types:get": "",
"clusters:index": "",

5
senlin/api/openstack/history.rst
View File

@ -33,3 +33,8 @@ it can be used by both users and developers.
---
Added ``cluster_replace_nodes`` API.
1.4
---
Added ``profile_type_ops`` API.

9
senlin/api/openstack/v1/profile_types.py
View File

@ -39,3 +39,12 @@ class ProfileTypeController(wsgi.Controller):
'ProfileTypeGetRequest', req, {'type_name': type_name})
content = self.rpc_client.call2(req.context, 'profile_type_get2', obj)
return {'profile_type': content}
@wsgi.Controller.api_version('1.4')
@util.policy_enforce
def ops(self, req, type_name):
"""Lists the operations supported by the specified profile type."""
obj = util.parse_request(
'ProfileTypeOpListRequest', req, {'type_name': type_name})
return self.rpc_client.call2(req.context, 'profile_type_ops', obj)

4
senlin/api/openstack/v1/router.py
View File

@ -57,6 +57,10 @@ class API(wsgi.Router):
"/profile-types/{type_name}",
action="get",
conditions={'method': 'GET'})
sub_mapper.connect("profile_type_ops",
"/profile-types/{type_name}/ops",
action="ops",
conditions={'method': 'GET'})
# Profiles
res = wsgi.Resource(profiles.ProfileController(conf))

95
senlin/tests/unit/api/openstack/v1/test_profile_types.py
View File

@ -144,3 +144,98 @@ class ProfileTypeControllerTest(shared.ControllerTest, base.SenlinTestCase):
req, type_name=type_name)
self.assertEqual(403, resp.status_int)
self.assertIn('403 Forbidden', six.text_type(resp))
@mock.patch.object(util, 'parse_request')
@mock.patch.object(rpc_client.EngineClient, 'call2')
def test_profile_type_ops(self, mock_call, mock_parse, mock_enforce):
self._mock_enforce_setup(mock_enforce, 'ops', True)
type_name = 'SimpleProfile'
req = self._get('/profile_types/%(type)s/ops' % {'type': type_name},
version='1.4')
engine_response = {
'operations': {
'Foo': {}, 'Bar': {},
}
}
mock_call.return_value = engine_response
obj = mock.Mock()
mock_parse.return_value = obj
response = self.controller.ops(req, type_name=type_name)
self.assertEqual(engine_response, response)
mock_parse.assert_called_once_with(
'ProfileTypeOpListRequest', req, {'type_name': type_name})
mock_call.assert_called_once_with(
req.context, 'profile_type_ops', mock.ANY)
@mock.patch.object(util, 'parse_request')
@mock.patch.object(rpc_client.EngineClient, 'call2')
def test_profile_type_ops_with_bad_param(self, mock_call, mock_parse,
mock_enforce):
self._mock_enforce_setup(mock_enforce, 'ops', True)
type_name = 100
req = self._get('/profile_types/%(type)s/ops' % {'type': type_name},
version='1.4')
mock_parse.side_effect = exc.HTTPBadRequest("bad param")
ex = self.assertRaises(exc.HTTPBadRequest,
self.controller.ops,
req, type_name=type_name)
self.assertEqual("bad param", six.text_type(ex))
mock_parse.assert_called_once_with(
'ProfileTypeOpListRequest', req, {'type_name': type_name})
mock_call.assert_not_called()
@mock.patch.object(util, 'parse_request')
@mock.patch.object(rpc_client.EngineClient, 'call2')
def test_profile_type_ops_not_found(self, mock_call, mock_parse,
mock_enforce):
self._mock_enforce_setup(mock_enforce, 'ops', True)
type_name = 'BogusProfileType'
req = self._get('/profile_types/%(type)s/ops' % {'type': type_name},
version='1.4')
error = senlin_exc.ResourceNotFound(type='profile_type', id=type_name)
mock_call.side_effect = shared.to_remote_error(error)
resp = shared.request_with_middleware(fault.FaultWrapper,
self.controller.ops,
req, type_name=type_name)
self.assertEqual(404, resp.json['code'])
self.assertEqual('ResourceNotFound', resp.json['error']['type'])
mock_parse.assert_called_once_with(
'ProfileTypeOpListRequest', mock.ANY, {'type_name': type_name})
mock_call.assert_called_once_with(
req.context, 'profile_type_ops', mock.ANY)
@mock.patch.object(rpc_client.EngineClient, 'call2')
def test_profile_type_ops_version_mismatch(self, mock_call, mock_enforce):
type_name = 'fake'
req = self._get('/profile_types/%(type)s/ops' % {'type': type_name},
version='1.1')
ex = self.assertRaises(senlin_exc.MethodVersionNotFound,
self.controller.ops,
req, type_name=type_name)
self.assertEqual(0, mock_call.call_count)
self.assertEqual('API version 1.1 is not supported on this method.',
six.text_type(ex))
def test_profile_type_ops_err_denied_policy(self, mock_enforce):
self._mock_enforce_setup(mock_enforce, 'ops', False)
type_name = 'BogusProfileType'
req = self._get('/profile_types/%(type)s/ops' % {'type': type_name},
version='1.4')
resp = shared.request_with_middleware(fault.FaultWrapper,
self.controller.ops,
req, type_name=type_name)
self.assertEqual(403, resp.status_int)
self.assertIn('403 Forbidden', six.text_type(resp))