openstack
/
freezer-web-ui
Code Issues Proposed changes

Fixed retrieval of freezer url from keystone catalog 

fixed an incorrect placement for when to look for the fallback url
which caused to look for FREEZER_API_URL even if it is present on the
catalog.

Change-Id: I171e80198e6cb91d056a7d3261a34a0f96b10eb4
This commit is contained in:
memo 2015-10-14 16:33:06 +01:00
parent c68c14d952
commit 018f308f43
1 changed files with 17 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
freezer_ui/api/api.py
View File

@ -17,6 +17,7 @@
import warnings import warnings
from django.conf import settings from django.conf import settings
from django.utils.translation import ugettext_lazy as _
from horizon.utils import functions as utils from horizon.utils import functions as utils
from horizon.utils.memoized import memoized # noqa from horizon.utils.memoized import memoized # noqa
@ -34,31 +35,34 @@ from freezer_ui.utils import create_dict_action
from freezer_ui.utils import create_dummy_id from freezer_ui.utils import create_dummy_id
from freezer_ui.utils import assign_value_from_source from freezer_ui.utils import assign_value_from_source
@memoized
def get_hardcoded_url():
"""Get FREEZER_API_URL from local_settings.py"""
try:
warnings.warn(_('Using hardcoded FREEZER_API_URL at {0}')
.format(settings.FREEZER_API_URL))
return getattr(settings, 'FREEZER_API_URL', None)
except (AttributeError, TypeError):
warnings.warn(_('No FREEZER_API_URL was found in local_settings.py'))
raise
@memoized @memoized
def get_service_url(request): def get_service_url(request):
"""Get Freezer API url from keystone catalog. """Get Freezer API url from keystone catalog or local_settings.py
if Freezer is not set in keystone, the fallback will be if Freezer is not set in keystone, the fallback will be
'FREEZER_API_URL' in local_settings.py 'FREEZER_API_URL' in local_settings.py
""" """
url = None
catalog = (getattr(request.user, "service_catalog", None)) catalog = (getattr(request.user, "service_catalog", None))
if not catalog: if not catalog:
warnings.warn('Using hardcoded FREEZER_API_URL at {0}' return get_hardcoded_url()
.format(settings.FREEZER_API_URL))
return getattr(settings, 'FREEZER_API_URL', None)
for c in catalog: for c in catalog:
if c['name'] == 'freezer': if c['name'] == 'freezer':
for e in c['endpoints']: for e in c['endpoints']:
url = e['publicURL'] return e['publicURL']
else: else:
warnings.warn('Using hardcoded FREEZER_API_URL at {0}' return get_hardcoded_url()
.format(settings.FREEZER_API_URL))
return getattr(settings, 'FREEZER_API_URL', None)
return url
@memoized @memoized