From db411a56eb46b8f45be4b8057c3dbdbd91f70141 Mon Sep 17 00:00:00 2001 From: Amrith Kumar Date: Tue, 29 Nov 2016 11:36:51 -0500 Subject: [PATCH] Don't import ceilometer_data This import is apparently not used and now no longer exists. don't import it any longer. a bigger fix is required to get rid of all unneeded imports (like Ic121ac52d261b1f4eb972a0075cd3a09883fb100). Also due to change in legacy swift panel we need to reverse some logic in detecting the legacy panel. Change-Id: Ifbb3424bc174829d66518c4a167a03a0cd1feb1c Co-Authored-By: Duk Loi --- trove_dashboard/content/database_backups/tables.py | 9 +++++---- trove_dashboard/test/test_data/utils.py | 2 -- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/trove_dashboard/content/database_backups/tables.py b/trove_dashboard/content/database_backups/tables.py index e6ef137d..1e05b8c6 100644 --- a/trove_dashboard/content/database_backups/tables.py +++ b/trove_dashboard/content/database_backups/tables.py @@ -87,11 +87,12 @@ class DownloadBackup(tables.LinkAction): 'object_path': object_path}) def allowed(self, request, datum): - legacy_swift_panel_enabled = True + legacy_swift_panel_enabled = False if ('swift_panel' in settings.HORIZON_CONFIG and - settings.HORIZON_CONFIG['swift_panel'] == 'angular'): - legacy_swift_panel_enabled = False - return legacy_swift_panel_enabled and datum.status == 'COMPLETED' + settings.HORIZON_CONFIG['swift_panel'] == 'legacy' and + datum.status == 'COMPLETED'): + legacy_swift_panel_enabled = True + return legacy_swift_panel_enabled class DeleteBackup(tables.DeleteAction): diff --git a/trove_dashboard/test/test_data/utils.py b/trove_dashboard/test/test_data/utils.py index e7836605..c7daf477 100644 --- a/trove_dashboard/test/test_data/utils.py +++ b/trove_dashboard/test/test_data/utils.py @@ -15,7 +15,6 @@ from openstack_dashboard.test.test_data import utils def load_test_data(load_onto=None): - from openstack_dashboard.test.test_data import ceilometer_data from openstack_dashboard.test.test_data import cinder_data from openstack_dashboard.test.test_data import exceptions from openstack_dashboard.test.test_data import glance_data @@ -42,7 +41,6 @@ def load_test_data(load_onto=None): neutron_data.data, swift_data.data, heat_data.data, - ceilometer_data.data, trove_data.data, trove_keystone_data.data, )