summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAkihiro Motoki <amotoki@gmail.com>2019-05-29 21:22:23 +0900
committerVishal Manchanda <manchandavishal143@gmail.com>2019-06-07 10:29:05 +0000
commit721622d182ae95320825808e2a052428e3e83d90 (patch)
tree936665c18bf18a6ed367db4eadc5dd8663d639c8
parent8cc72010315b7e0db7a2e8a972d72692e7428545 (diff)
downloadhorizon-721622d182ae95320825808e2a052428e3e83d90.tar.gz
Make project volume group table work even with volumev3 only env
Previously the volume group table in the project dashboard checked if 'volume' endpoint is available and 'volumev3' endpoint was not checked. 'volumev3' is an endpoint name commonly used for Volume v3 API and it is not surprising that only volumev3 is configured in deployments, so we should ensure that horizon works with environments only with 'volumev3' endpoint. The service endpoints are already checked in panel.py, so there is no need to have the permission check (i.e., service check) in the table. Similar patterns are found in tables in project/snapshots and project/vg_snapshots. They are also cleanup by this commit. Change-Id: I12d03745bec5d8dec10a8e2b4306c595f2f39560 Closes-Bug: #1829461 (cherry picked from commit 0cb5167b99d418c7ce8cbc9adda24f228fdd42d0)
-rw-r--r--openstack_dashboard/dashboards/project/snapshots/tables.py4
-rw-r--r--openstack_dashboard/dashboards/project/vg_snapshots/tables.py3
-rw-r--r--openstack_dashboard/dashboards/project/volume_groups/tables.py1
3 files changed, 0 insertions, 8 deletions
diff --git a/openstack_dashboard/dashboards/project/snapshots/tables.py b/openstack_dashboard/dashboards/project/snapshots/tables.py
index f0a1e8c1c..7c6daf4d9 100644
--- a/openstack_dashboard/dashboards/project/snapshots/tables.py
+++ b/openstack_dashboard/dashboards/project/snapshots/tables.py
@@ -234,10 +234,6 @@ class VolumeDetailsSnapshotsTable(volume_tables.VolumesTableBase):
UpdateMetadata))
row_class = UpdateRow
status_columns = ("status",)
- permissions = [
- ('openstack.services.volume', 'openstack.services.volumev2',
- 'openstack.services.volumev3'),
- ]
class VolumeSnapshotsTable(VolumeDetailsSnapshotsTable):
diff --git a/openstack_dashboard/dashboards/project/vg_snapshots/tables.py b/openstack_dashboard/dashboards/project/vg_snapshots/tables.py
index 34cf9822b..82767bb61 100644
--- a/openstack_dashboard/dashboards/project/vg_snapshots/tables.py
+++ b/openstack_dashboard/dashboards/project/vg_snapshots/tables.py
@@ -136,6 +136,3 @@ class GroupSnapshotsTable(tables.DataTable):
DeleteGroupSnapshot,)
row_class = UpdateRow
status_columns = ("status",)
- permissions = [
- ('openstack.services.volume', 'openstack.services.volumev3')
- ]
diff --git a/openstack_dashboard/dashboards/project/volume_groups/tables.py b/openstack_dashboard/dashboards/project/volume_groups/tables.py
index 5c0395e57..becd66321 100644
--- a/openstack_dashboard/dashboards/project/volume_groups/tables.py
+++ b/openstack_dashboard/dashboards/project/volume_groups/tables.py
@@ -187,4 +187,3 @@ class GroupsTable(tables.DataTable):
)
row_class = UpdateRow
status_columns = ("status",)
- permissions = ['openstack.services.volume']