openstack
/
nova
Code Issues Proposed changes

rework warning messages for extension whitelist/blacklist 

The API v2.1 extension loader was issuing a WARN for every single
extension that was listed in a white or blacklist. This is not a
warning for the administrator, this is a thing they chose to do. We
already have an INFO message that says all the extensions that got loaded.

The only WARN we should consider is when they put items in both the
white and black lists, and we decided to ignore the whitelist. That
warning message is added, as that's one of those things that could
drive people nuts trying to figure out why something didn't load when
added to the whitelist.

The function is denormalized and renamed to be more explicit about
what's going on.

Change-Id: I3ee8f04867509072c7cd6c0f1c1a87f893706595
This commit is contained in:
Sean Dague 2015-12-11 11:55:23 -05:00
parent b5890b3c36
commit d291821f4d
1 changed files with 23 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
nova/api/openstack/compute/servers.py
View File

@ -103,25 +103,32 @@ class ServersController(wsgi.Controller):
def __init__(self, **kwargs):
def _check_load_extension(required_function):
def check_whiteblack_lists(ext):
def should_load_extension(ext):
# Check whitelist is either empty or if not then the extension
# is in the whitelist
if (not CONF.osapi_v21.extensions_whitelist or
ext.obj.alias in CONF.osapi_v21.extensions_whitelist):
# Check the extension is not in the blacklist
extensions_blacklist = CONF.osapi_v21.extensions_blacklist
if ext.obj.alias not in extensions_blacklist:
return True
else:
LOG.warning(_LW("Not loading %s because it is "
"in the blacklist"), ext.obj.alias)
whitelist = CONF.osapi_v21.extensions_whitelist
blacklist = CONF.osapi_v21.extensions_blacklist
if not whitelist:
# if there is no whitelist, we accept everything,
# so we only care about the blacklist.
if ext.obj.alias in blacklist:
return False
else:
return True
else:
LOG.warning(
_LW("Not loading %s because it is not in the "
"whitelist"), ext.obj.alias)
return False
if ext.obj.alias in whitelist:
if ext.obj.alias in blacklist:
LOG.warn(
_LW(
"Extension %s is both in whitelist and "
"blacklist, blacklisting takes precedence"
),
ext.obj.alias)
return False
else:
return True
else:
return False
def check_load_extension(ext):
if isinstance(ext.obj, extensions.V21APIExtensionBase):
@ -136,7 +143,7 @@ class ServersController(wsgi.Controller):
'servers extension for function %(func)s',
{'ext_alias': ext.obj.alias,
'func': required_function})
return check_whiteblack_lists(ext)
return should_load_extension(ext)
else:
LOG.debug(
'extension %(ext_alias)s is missing %(func)s',