openstack/neutron-lbaas-dashboard
Code Issues Proposed changes

Use static file auto-discovery

Browse Source 
This moves around the REST API module import so that it gets
imported correctly and does not mess up the static file auto
discovery process. Individual files can then be removed from
the plugin file.

Partially-Implements: blueprint horizon-lbaas-v2-ui
Change-Id: Iadc1dae0019d00d1fd13f875ab75da9e8d20f3bb
This commit is contained in:
Justin Pomeroy
2016-02-13 08:44:22 -06:00
parent b16542e6a0
commit d065a53474
3 changed files with 19 additions and 81 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
neutron_lbaas_dashboard/__init__.py
View File

@@ -12,9 +12,5 @@
import pbr.version
# Register the REST API URLs so they can be called from the JavaScript files
import neutron_lbaas_dashboard.api.rest # noqa
__version__ = pbr.version.VersionInfo(
'neutron_lbaas_dashboard').version_string()

16
neutron_lbaas_dashboard/dashboards/project/ngloadbalancersv2/__init__.py
View File

@@ -0,0 +1,16 @@
# Copyright 2016 IBM Corp.
#
# 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.
# Register the REST API URLs so they can be called from the JavaScript files
from neutron_lbaas_dashboard.api import rest # noqa

80
neutron_lbaas_dashboard/enabled/_1481_project_ng_loadbalancersv2_panel.py
View File

@@ -14,7 +14,7 @@
# The slug of the panel to be added to HORIZON_CONFIG. Required.
PANEL = 'ngloadbalancersv2'
# The slug of the dashboard the PANEL associated with. Required.
# The slug of the dashboard the PANEL is associated with. Required.
PANEL_DASHBOARD = 'project'
# The slug of the panel group the PANEL is associated with.
PANEL_GROUP = 'network'
@@ -28,80 +28,6 @@ ADD_INSTALLED_APPS = ['neutron_lbaas_dashboard']
ADD_ANGULAR_MODULES = ['horizon.dashboard.project.lbaasv2']
# AUTO_DISCOVER_STATIC_FILES = True
ADD_SCSS_FILES = ['dashboard/project/lbaasv2/lbaasv2.scss']
ADD_JS_FILES = [
'app/core/openstack-service-api/lbaasv2.service.js',
'dashboard/project/lbaasv2/lbaasv2.module.js',
'dashboard/project/lbaasv2/loadbalancers/loadbalancers.module.js',
'dashboard/project/lbaasv2/loadbalancers/table.controller.js',
'dashboard/project/lbaasv2/loadbalancers/detail.controller.js',
'dashboard/project/lbaasv2/loadbalancers/filters.js',
'dashboard/project/lbaasv2/loadbalancers/actions/batch-actions.service.js',
'dashboard/project/lbaasv2/loadbalancers/actions/row-actions.service.js',
('dashboard/project/lbaasv2/loadbalancers/actions/create/'
'wizard.controller.js'),
('dashboard/project/lbaasv2/loadbalancers/actions/edit/'
'wizard.controller.js'),
'dashboard/project/lbaasv2/workflow/modal.service.js',
'dashboard/project/lbaasv2/workflow/model.service.js',
'dashboard/project/lbaasv2/workflow/workflow.service.js',
('dashboard/project/lbaasv2/workflow/loadbalancer/'
'loadbalancer.controller.js'),
'dashboard/project/lbaasv2/workflow/listener/listener.controller.js',
'dashboard/project/lbaasv2/workflow/pool/pool.controller.js',
'dashboard/project/lbaasv2/workflow/members/members.controller.js',
'dashboard/project/lbaasv2/workflow/monitor/monitor.controller.js',
'dashboard/project/lbaasv2/listeners/listeners.module.js',
'dashboard/project/lbaasv2/listeners/table.controller.js',
'dashboard/project/lbaasv2/listeners/detail.controller.js',
'dashboard/project/lbaasv2/listeners/filters.js',
'dashboard/project/lbaasv2/pools/pools.module.js',
'dashboard/project/lbaasv2/pools/detail.controller.js',
'dashboard/project/lbaasv2/members/members.module.js',
'dashboard/project/lbaasv2/members/detail.controller.js',
'dashboard/project/lbaasv2/members/table.controller.js',
'dashboard/project/lbaasv2/healthmonitors/healthmonitors.module.js',
'dashboard/project/lbaasv2/healthmonitors/detail.controller.js'
]
ADD_JS_SPEC_FILES = [
'app/core/openstack-service-api/lbaasv2.service.spec.js',
'dashboard/project/lbaasv2/lbaasv2.module.spec.js',
'dashboard/project/lbaasv2/loadbalancers/loadbalancers.module.spec.js',
'dashboard/project/lbaasv2/loadbalancers/table.controller.spec.js',
'dashboard/project/lbaasv2/loadbalancers/detail.controller.spec.js',
'dashboard/project/lbaasv2/loadbalancers/filters.spec.js',
('dashboard/project/lbaasv2/loadbalancers/actions/'
'batch-actions.service.spec.js'),
('dashboard/project/lbaasv2/loadbalancers/actions/'
'row-actions.service.spec.js'),
('dashboard/project/lbaasv2/loadbalancers/actions/create/'
'wizard.controller.spec.js'),
('dashboard/project/lbaasv2/loadbalancers/actions/edit/'
'wizard.controller.spec.js'),
'dashboard/project/lbaasv2/workflow/modal.service.spec.js',
'dashboard/project/lbaasv2/workflow/model.service.spec.js',
'dashboard/project/lbaasv2/workflow/workflow.service.spec.js',
('dashboard/project/lbaasv2/workflow/loadbalancer/'
'loadbalancer.controller.spec.js'),
'dashboard/project/lbaasv2/workflow/listener/listener.controller.spec.js',
'dashboard/project/lbaasv2/workflow/pool/pool.controller.spec.js',
'dashboard/project/lbaasv2/workflow/members/members.controller.spec.js',
'dashboard/project/lbaasv2/workflow/monitor/monitor.controller.spec.js',
'dashboard/project/lbaasv2/listeners/listeners.module.spec.js',
'dashboard/project/lbaasv2/listeners/table.controller.spec.js',
'dashboard/project/lbaasv2/listeners/detail.controller.spec.js',
'dashboard/project/lbassv2/listeners/filters.spec.js',
'dashboard/project/lbaasv2/pools/pools.module.spec.js',
'dashboard/project/lbaasv2/pools/detail.controller.spec.js',
'dashboard/project/lbaasv2/members/members.module.spec.js',
'dashboard/project/lbaasv2/members/detail.controller.spec.js',
'dashboard/project/lbaasv2/members/table.controller.spec.js',
'dashboard/project/lbaasv2/healthmonitors/healthmonitors.module.spec.js',
'dashboard/project/lbaasv2/healthmonitors/detail.controller.spec.js'
]
ADD_SCSS_FILES = [
'dashboard/project/lbaasv2/lbaasv2.scss',
]
AUTO_DISCOVER_STATIC_FILES = True