8303782f1e
The root cause of 1479018 was the mixed method for loading content in horizon. This patch moves horizon to load purely from enabled files. There are a couple of things that were required to allow this change. 1) Adding a mechanism, can_register() to horizon/base.py to handle the configuration based loading checks that had been accumulating in the panel.py files. This is an optional static method in Panel to encapsulate such configuration (read settings) based panel loading logic. And added testing for and documentation for this addition. 2) Create a numbering scheme for plugins. Moved the base dashboards to _1000_project.py _2000_admin.py _3000_identity.py _5000_settings.py. then populated the required panel_group and panel enabled files sparsely in those ranges. The sparseness is to allow for future additions. Additionally, I moved the already added Angular based panels next to their Django counterparts. Once the configuration loading was normalized, the bug reported in 1479018 was resolved and tests work with plugins panels in all dashboards. Close-Bug: #1479018 Partially implements: blueprint plugin-sanity Change-Id: I657e7ce37b2593a901a859cebf3d6ff8ada91941
80 lines
3.4 KiB
Python
80 lines
3.4 KiB
Python
# Licensed under the Apache License, Version 2.0 (the "License"); you may
|
|
# not use this file except in compliance with the License. You may obtain
|
|
# a copy of the License at
|
|
#
|
|
# http://www.apache.org/licenses/LICENSE-2.0
|
|
#
|
|
# Unless required by applicable law or agreed to in writing, software
|
|
# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
|
|
# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
|
|
# License for the specific language governing permissions and limitations
|
|
# under the License.
|
|
|
|
import copy
|
|
|
|
from django.conf import settings
|
|
from django.test.utils import override_settings
|
|
|
|
import horizon
|
|
|
|
from openstack_dashboard.dashboards.admin.info import panel as info_panel
|
|
from openstack_dashboard.test import helpers as test
|
|
from openstack_dashboard.test.test_panels.plugin_panel \
|
|
import panel as plugin_panel
|
|
from openstack_dashboard.test.test_panels.nonloading_panel \
|
|
import panel as nonloading_panel
|
|
from openstack_dashboard.test.test_plugins import panel_config
|
|
from openstack_dashboard.utils import settings as util_settings
|
|
|
|
|
|
HORIZON_CONFIG = copy.deepcopy(settings.HORIZON_CONFIG)
|
|
INSTALLED_APPS = list(settings.INSTALLED_APPS)
|
|
|
|
# NOTE: Ensure dashboards and default_dashboard are not included in
|
|
# HORIZON_CONFIG to ensure warning messages from update_dashboards below.
|
|
HORIZON_CONFIG.pop('dashboards', None)
|
|
HORIZON_CONFIG.pop('default_dashboard', None)
|
|
HORIZON_CONFIG.pop('js_files', None)
|
|
HORIZON_CONFIG.pop('js_spec_files', None)
|
|
HORIZON_CONFIG.pop('scss_files', None)
|
|
|
|
util_settings.update_dashboards([panel_config,], HORIZON_CONFIG, INSTALLED_APPS)
|
|
|
|
|
|
@override_settings(HORIZON_CONFIG=HORIZON_CONFIG,
|
|
INSTALLED_APPS=INSTALLED_APPS)
|
|
class PanelPluginTests(test.PluginTestCase):
|
|
def test_add_panel(self):
|
|
dashboard = horizon.get_dashboard("admin")
|
|
panel_group = dashboard.get_panel_group('admin')
|
|
# Check that the panel is in its configured dashboard.
|
|
self.assertIn(plugin_panel.PluginPanel,
|
|
[p.__class__ for p in dashboard.get_panels()])
|
|
# Check that the panel is in its configured panel group.
|
|
self.assertIn(plugin_panel.PluginPanel,
|
|
[p.__class__ for p in panel_group])
|
|
# Ensure that static resources are properly injected
|
|
pc = panel_config._10_admin_add_panel
|
|
self.assertEquals(pc.ADD_JS_FILES, HORIZON_CONFIG['js_files'])
|
|
self.assertEquals(pc.ADD_JS_SPEC_FILES, HORIZON_CONFIG['js_spec_files'])
|
|
self.assertEquals(pc.ADD_SCSS_FILES, HORIZON_CONFIG['scss_files'])
|
|
|
|
def test_remove_panel(self):
|
|
dashboard = horizon.get_dashboard("admin")
|
|
panel_group = dashboard.get_panel_group('admin')
|
|
# Check that the panel is no longer in the configured dashboard.
|
|
self.assertNotIn(info_panel.Info,
|
|
[p.__class__ for p in dashboard.get_panels()])
|
|
# Check that the panel is no longer in the configured panel group.
|
|
self.assertNotIn(info_panel.Info,
|
|
[p.__class__ for p in panel_group])
|
|
|
|
def test_default_panel(self):
|
|
dashboard = horizon.get_dashboard("admin")
|
|
self.assertEqual('defaults', dashboard.default_panel)
|
|
|
|
def test_panel_not_added(self):
|
|
dashboard = horizon.get_dashboard("admin")
|
|
self.assertNotIn(nonloading_panel.NonloadingPanel,
|
|
[p.__class__ for p in dashboard.get_panels()])
|