Merge "Fix the raise error in list services process"
This commit is contained in:
commit
64c7c8f989
|
@ -88,9 +88,9 @@ class ServiceController(wsgi.Controller):
|
||||||
try:
|
try:
|
||||||
services = objects.ServiceList.get_all_by_args(
|
services = objects.ServiceList.get_all_by_args(
|
||||||
context, host, binary)
|
context, host, binary)
|
||||||
except exception as e:
|
except Exception as e:
|
||||||
LOG.error('List service failed, reason: %s' % e)
|
msg = (_('List service failed, reason: %s') % e)
|
||||||
raise
|
raise exc.HTTPBadRequest(explanation=msg)
|
||||||
return self._view_builder.detail_list(req, services)
|
return self._view_builder.detail_list(req, services)
|
||||||
|
|
||||||
def update(self, req, id, body):
|
def update(self, req, id, body):
|
||||||
|
|
|
@ -25,21 +25,30 @@ class ServiceApiTest(base.TestCase):
|
||||||
|
|
||||||
@mock.patch('karbor.objects.service.ServiceList.get_all_by_args')
|
@mock.patch('karbor.objects.service.ServiceList.get_all_by_args')
|
||||||
def test_service_list_with_admin_context(self, mock_get_all_by_args):
|
def test_service_list_with_admin_context(self, mock_get_all_by_args):
|
||||||
req = fakes.HTTPRequest.blank('/v1/services?host=host1',
|
req = fakes.HTTPRequest.blank('/v1/os-services?host=host1',
|
||||||
use_admin_context=True)
|
use_admin_context=True)
|
||||||
self.controller.index(req)
|
self.controller.index(req)
|
||||||
self.assertTrue(mock_get_all_by_args.called)
|
self.assertTrue(mock_get_all_by_args.called)
|
||||||
|
|
||||||
def test_service_list_with_non_admin_context(self):
|
def test_service_list_with_non_admin_context(self):
|
||||||
req = fakes.HTTPRequest.blank('/v1/services', use_admin_context=False)
|
req = fakes.HTTPRequest.blank('/v1/os-services',
|
||||||
|
use_admin_context=False)
|
||||||
self.assertRaises(
|
self.assertRaises(
|
||||||
exception.PolicyNotAuthorized, self.controller.index, req)
|
exception.PolicyNotAuthorized, self.controller.index, req)
|
||||||
|
|
||||||
|
@mock.patch('karbor.objects.service.ServiceList.get_all_by_args')
|
||||||
|
def test_service_list_with_invalid_services(self, mock_get_all_by_args):
|
||||||
|
req = fakes.HTTPRequest.blank('/v1/os-services',
|
||||||
|
use_admin_context=True)
|
||||||
|
mock_get_all_by_args.side_effect = exception.NotFound()
|
||||||
|
self.assertRaises(exc.HTTPBadRequest, self.controller.index, req)
|
||||||
|
|
||||||
@mock.patch('karbor.utils.service_is_up')
|
@mock.patch('karbor.utils.service_is_up')
|
||||||
@mock.patch('karbor.objects.service.Service.get_by_id')
|
@mock.patch('karbor.objects.service.Service.get_by_id')
|
||||||
def test_service_update_with_admin_context(
|
def test_service_update_with_admin_context(
|
||||||
self, mock_get_by_id, mock_service_is_up):
|
self, mock_get_by_id, mock_service_is_up):
|
||||||
req = fakes.HTTPRequest.blank('/v1/services/1', use_admin_context=True)
|
req = fakes.HTTPRequest.blank('/v1/os-services/1',
|
||||||
|
use_admin_context=True)
|
||||||
body = {
|
body = {
|
||||||
"status": 'disabled',
|
"status": 'disabled',
|
||||||
'disabled_reason': 'reason'
|
'disabled_reason': 'reason'
|
||||||
|
@ -53,7 +62,7 @@ class ServiceApiTest(base.TestCase):
|
||||||
self.assertTrue(mock_service.save.called)
|
self.assertTrue(mock_service.save.called)
|
||||||
|
|
||||||
def test_service_update_with_non_admin_context(self):
|
def test_service_update_with_non_admin_context(self):
|
||||||
req = fakes.HTTPRequest.blank('/v1/services/1',
|
req = fakes.HTTPRequest.blank('/v1/os-services/1',
|
||||||
use_admin_context=False)
|
use_admin_context=False)
|
||||||
body = {
|
body = {
|
||||||
"status": 'disabled',
|
"status": 'disabled',
|
||||||
|
@ -69,7 +78,8 @@ class ServiceApiTest(base.TestCase):
|
||||||
|
|
||||||
@mock.patch('karbor.objects.service.Service.get_by_id')
|
@mock.patch('karbor.objects.service.Service.get_by_id')
|
||||||
def test_update_protection_services(self, mock_get_by_id):
|
def test_update_protection_services(self, mock_get_by_id):
|
||||||
req = fakes.HTTPRequest.blank('/v1/services/1', use_admin_context=True)
|
req = fakes.HTTPRequest.blank('/v1/os-services/1',
|
||||||
|
use_admin_context=True)
|
||||||
body = {
|
body = {
|
||||||
"status": 'disabled',
|
"status": 'disabled',
|
||||||
'disabled_reason': 'reason'
|
'disabled_reason': 'reason'
|
||||||
|
|
Loading…
Reference in New Issue