diff --git a/monitoring/alarms/tables.py b/monitoring/alarms/tables.py index b9048afc..3aec8048 100644 --- a/monitoring/alarms/tables.py +++ b/monitoring/alarms/tables.py @@ -40,15 +40,15 @@ def get_status(index): def show_status(data): status = data - img_tag = '' + img_tag = '{label}' if status == 'CRITICAL': - return img_tag % (constants.CRITICAL_ICON, status) + return img_tag.format(img=constants.CRITICAL_ICON, label=status) if status in ('LOW', 'MEDIUM', 'HIGH'): - return img_tag % (constants.WARNING_ICON, status) + return img_tag.format(img=constants.WARNING_ICON, label=status) if status == 'OK': - return img_tag % (constants.OK_ICON, status) + return img_tag.format(img=constants.OK_ICON, label=status) if status == 'UNKNOWN' or status == 'UNDETERMINED': - return img_tag % (constants.UNKNOWN_ICON, status) + return img_tag.format(img=constants.UNKNOWN_ICON, label=status) return status diff --git a/monitoring/alarms/templates/alarms/alarm.html b/monitoring/alarms/templates/alarms/alarm.html index a092c3df..3a7b30c9 100644 --- a/monitoring/alarms/templates/alarms/alarm.html +++ b/monitoring/alarms/templates/alarms/alarm.html @@ -16,4 +16,10 @@ {% block main %} {{ table.render }} + {% endblock %} diff --git a/test-requirements.txt b/test-requirements.txt index b6e9e670..cfeef866 100644 --- a/test-requirements.txt +++ b/test-requirements.txt @@ -16,4 +16,4 @@ selenium sphinx>=1.1.2,!=1.2.0,!=1.3b1,<1.3 oslosphinx -http://tarballs.openstack.org/horizon/horizon-master.tar.gz#egg=horizon +http://tarballs.openstack.org/horizon/horizon-2014.2.tar.gz#egg=horizon