openstack
/
horizon
Code Issues Proposed changes

Fixing permissions for data processing panels 

Recently, the data processing service was renamed to
"data-processing" rather than "data_processing".  Each
panel needs to be updated so that it will show up when
the data-processing service is enabled.  Also updated
the underlying test data to reflect the update.

Change-Id: I38d7350215cbe5c5f406d75d6be7c9057957bc69
Closes-Bug:  #1429987
This commit is contained in:
Chad Roberts 2015-03-09 15:32:13 -04:00
parent 4bdbd5c873
commit f4781d8796
12 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
openstack_dashboard/dashboards/admin/info/tests.py
View File

@ -73,7 +73,7 @@ class SystemInfoViewTests(test.BaseAdminViewTests):
'<Service: metering>',
'<Service: orchestration>',
'<Service: database>',
'<Service: data_processing>', ])
'<Service: data-processing>', ])
self.mox.VerifyAll()

2
openstack_dashboard/dashboards/project/data_processing/cluster_templates/panel.py
View File

@ -21,7 +21,7 @@ from openstack_dashboard.dashboards.project import dashboard
class ClusterTemplatesPanel(horizon.Panel):
name = _("Cluster Templates")
slug = 'data_processing.cluster_templates'
permissions = ('openstack.services.data_processing',)
permissions = ('openstack.services.data-processing',)
dashboard.Project.register(ClusterTemplatesPanel)

2
openstack_dashboard/dashboards/project/data_processing/clusters/panel.py
View File

@ -21,7 +21,7 @@ from openstack_dashboard.dashboards.project import dashboard
class ClustersPanel(horizon.Panel):
name = _("Clusters")
slug = 'data_processing.clusters'
permissions = ('openstack.services.data_processing',)
permissions = ('openstack.services.data-processing',)
dashboard.Project.register(ClustersPanel)

2
openstack_dashboard/dashboards/project/data_processing/data_image_registry/panel.py
View File

@ -21,7 +21,7 @@ from openstack_dashboard.dashboards.project import dashboard
class ImageRegistryPanel(horizon.Panel):
name = _("Image Registry")
slug = 'data_processing.data_image_registry'
permissions = ('openstack.services.data_processing',)
permissions = ('openstack.services.data-processing',)
dashboard.Project.register(ImageRegistryPanel)

2
openstack_dashboard/dashboards/project/data_processing/data_plugins/panel.py
View File

@ -21,6 +21,6 @@ from openstack_dashboard.dashboards.project import dashboard
class PluginsPanel(horizon.Panel):
name = _("Plugins")
slug = 'data_processing.data_plugins'
permissions = ('openstack.services.data_processing',)
permissions = ('openstack.services.data-processing',)
dashboard.Project.register(PluginsPanel)

2
openstack_dashboard/dashboards/project/data_processing/data_sources/panel.py
View File

@ -21,7 +21,7 @@ from openstack_dashboard.dashboards.project import dashboard
class DataSourcesPanel(horizon.Panel):
name = _("Data Sources")
slug = 'data_processing.data_sources'
permissions = ('openstack.services.data_processing',)
permissions = ('openstack.services.data-processing',)
dashboard.Project.register(DataSourcesPanel)

2
openstack_dashboard/dashboards/project/data_processing/job_binaries/panel.py
View File

@ -21,7 +21,7 @@ from openstack_dashboard.dashboards.project import dashboard
class JobBinariesPanel(horizon.Panel):
name = _("Job Binaries")
slug = 'data_processing.job_binaries'
permissions = ('openstack.services.data_processing',)
permissions = ('openstack.services.data-processing',)
dashboard.Project.register(JobBinariesPanel)

2
openstack_dashboard/dashboards/project/data_processing/job_executions/panel.py
View File

@ -21,7 +21,7 @@ from openstack_dashboard.dashboards.project import dashboard
class JobExecutionsPanel(horizon.Panel):
name = _("Job Executions")
slug = 'data_processing.job_executions'
permissions = ('openstack.services.data_processing',)
permissions = ('openstack.services.data-processing',)
dashboard.Project.register(JobExecutionsPanel)

2
openstack_dashboard/dashboards/project/data_processing/jobs/panel.py
View File

@ -21,7 +21,7 @@ from openstack_dashboard.dashboards.project import dashboard
class JobsPanel(horizon.Panel):
name = _("Jobs")
slug = 'data_processing.jobs'
permissions = ('openstack.services.data_processing',)
permissions = ('openstack.services.data-processing',)
dashboard.Project.register(JobsPanel)

2
openstack_dashboard/dashboards/project/data_processing/nodegroup_templates/panel.py
View File

@ -21,7 +21,7 @@ from openstack_dashboard.dashboards.project import dashboard
class NodegroupTemplatesPanel(horizon.Panel):
name = _("Node Group Templates")
slug = 'data_processing.nodegroup_templates'
permissions = ('openstack.services.data_processing',)
permissions = ('openstack.services.data-processing',)
dashboard.Project.register(NodegroupTemplatesPanel)

2
openstack_dashboard/test/api_tests/base_tests.py
View File

@ -157,7 +157,7 @@ class ApiVersionTests(test.TestCase):
super(ApiVersionTests, self).setUp()
self.previous_settings = settings.OPENSTACK_API_VERSIONS
settings.OPENSTACK_API_VERSIONS = {
"data_processing": 1.1,
"data-processing": 1.1,
"identity": "2.0",
"volume": 1
}

2
openstack_dashboard/test/test_data/keystone_data.py
View File

@ -136,7 +136,7 @@ SERVICE_CATALOG = [
"adminURL": "http://admin.trove.example.com:8779/v1.0",
"publicURL": "http://public.trove.example.com:8779/v1.0",
"internalURL": "http://int.trove.example.com:8779/v1.0"}]},
{"type": "data_processing",
{"type": "data-processing",
"name": "Sahara",
"endpoints_links": [],
"endpoints": [