Merge "Fix service-get-log to respect server filters" into stable/train

This commit is contained in:
Zuul 2020-11-14 19:42:29 +00:00 committed by Gerrit Code Review
commit b7a2c0d28a
2 changed files with 37 additions and 5 deletions

View File

@ -202,11 +202,14 @@ class ServiceController(wsgi.Controller):
log_req = objects.LogLevel(context, prefix=prefix) log_req = objects.LogLevel(context, prefix=prefix)
if constants.API_BINARY in binaries: # Avoid showing constants if 'server' is set.
levels = utils.get_log_levels(prefix) server_filter = body.get('server')
result.append({'host': CONF.host, if not server_filter or server_filter == CONF.host:
'binary': constants.API_BINARY, if constants.API_BINARY in binaries:
'levels': levels}) levels = utils.get_log_levels(prefix)
result.append({'host': CONF.host,
'binary': constants.API_BINARY,
'levels': levels})
for service in services: for service in services:
levels = self.rpc_apis[service.binary].get_log_levels(context, levels = self.rpc_apis[service.binary].get_log_levels(context,
service, service,

View File

@ -825,6 +825,35 @@ class ServicesTest(test.TestCase):
self.controller._get_log, req, self.context, self.controller._get_log, req, self.context,
body=body) body=body)
def test_get_log_w_server_filter_same_host(self):
server_filter = 'controller-0'
CONF.set_override('host', server_filter)
body = {'binary': constants.API_BINARY, 'server': server_filter}
req = FakeRequest(version=mv.LOG_LEVEL)
log_levels = self.controller._get_log(
req=req, context=mock.sentinel.context, body=body)
log_levels = log_levels['log_levels']
self.assertEqual(1, len(log_levels))
self.assertEqual('controller-0', log_levels[0]['host'])
self.assertEqual('cinder-api', log_levels[0]['binary'])
# since there are a lot of log levels, we just check if the key-value
# exists for levels
self.assertIsNotNone(log_levels[0]['levels'])
def test_get_log_w_server_filter_different_host(self):
server_filter = 'controller-0'
CONF.set_override('host', 'controller-different-host')
body = {'binary': constants.API_BINARY, 'server': server_filter}
req = FakeRequest(version=mv.LOG_LEVEL)
log_levels = self.controller._get_log(
req=req, context=mock.sentinel.context, body=body)
log_levels = log_levels['log_levels']
self.assertEqual(0, len(log_levels))
@ddt.data(None, '', '*') @ddt.data(None, '', '*')
@mock.patch('cinder.objects.ServiceList.get_all') @mock.patch('cinder.objects.ServiceList.get_all')
def test__log_params_binaries_service_all(self, binary, service_list_mock): def test__log_params_binaries_service_all(self, binary, service_list_mock):