Add Project Information column in table
This patch add 'Project' column in volume-group table to the admin volume group panel.Now user would be able to list that group is created by admin or demo user. Change-Id: I5e4837a1a03b50bd6121aa0ab019829fd4a79dbb
This commit is contained in:
parent
0dfaeac7a3
commit
c871c65704
|
@ -175,7 +175,8 @@ class VolumePool(base.APIResourceWrapper):
|
||||||
class Group(base.APIResourceWrapper):
|
class Group(base.APIResourceWrapper):
|
||||||
_attrs = ['id', 'status', 'availability_zone', 'created_at', 'name',
|
_attrs = ['id', 'status', 'availability_zone', 'created_at', 'name',
|
||||||
'description', 'group_type', 'volume_types',
|
'description', 'group_type', 'volume_types',
|
||||||
'group_snapshot_id', 'source_group_id', 'replication_status']
|
'group_snapshot_id', 'source_group_id', 'replication_status',
|
||||||
|
'project_id']
|
||||||
|
|
||||||
|
|
||||||
class GroupSnapshot(base.APIResourceWrapper):
|
class GroupSnapshot(base.APIResourceWrapper):
|
||||||
|
|
|
@ -37,7 +37,7 @@ MICROVERSION_FEATURES = {
|
||||||
"auto_allocated_network": ["2.37", "2.42"],
|
"auto_allocated_network": ["2.37", "2.42"],
|
||||||
},
|
},
|
||||||
"cinder": {
|
"cinder": {
|
||||||
"groups": ["3.27", "3.43", "3.48"],
|
"groups": ["3.27", "3.43", "3.48", "3.58"],
|
||||||
"consistency_groups": ["2.0", "3.10"],
|
"consistency_groups": ["2.0", "3.10"],
|
||||||
"message_list": ["3.5", "3.29"]
|
"message_list": ["3.5", "3.29"]
|
||||||
}
|
}
|
||||||
|
|
|
@ -14,7 +14,11 @@
|
||||||
|
|
||||||
from django.utils.translation import ugettext_lazy as _
|
from django.utils.translation import ugettext_lazy as _
|
||||||
|
|
||||||
|
from horizon import exceptions
|
||||||
from horizon import tables
|
from horizon import tables
|
||||||
|
|
||||||
|
from openstack_dashboard.api import cinder
|
||||||
|
from openstack_dashboard.api import keystone
|
||||||
from openstack_dashboard.dashboards.project.volume_groups \
|
from openstack_dashboard.dashboards.project.volume_groups \
|
||||||
import tables as project_tables
|
import tables as project_tables
|
||||||
|
|
||||||
|
@ -27,15 +31,31 @@ class RemoveAllVolumes(project_tables.RemoveAllVolumes):
|
||||||
url = "horizon:admin:volume_groups:remove_volumes"
|
url = "horizon:admin:volume_groups:remove_volumes"
|
||||||
|
|
||||||
|
|
||||||
|
class UpdateRow(tables.Row):
|
||||||
|
ajax = True
|
||||||
|
|
||||||
|
def get_data(self, request, group_id):
|
||||||
|
groups = cinder.group_list_with_vol_type_names(request, group_id)
|
||||||
|
tenant_id = getattr(groups, 'project_id')
|
||||||
|
try:
|
||||||
|
tenant = keystone.tenant_get(request, tenant_id)
|
||||||
|
groups.tenant_name = getattr(tenant, "name")
|
||||||
|
except Exception:
|
||||||
|
msg = _('Unable to retrieve volume group project information.')
|
||||||
|
exceptions.handle(request, msg)
|
||||||
|
|
||||||
|
return groups
|
||||||
|
|
||||||
|
|
||||||
class ManageVolumes(project_tables.ManageVolumes):
|
class ManageVolumes(project_tables.ManageVolumes):
|
||||||
url = "horizon:admin:volume_groups:manage"
|
url = "horizon:admin:volume_groups:manage"
|
||||||
|
|
||||||
|
|
||||||
class GroupsTable(project_tables.GroupsTable):
|
class GroupsTable(project_tables.GroupsTable):
|
||||||
# TODO(vishalmanchanda): Add Project Info.column in table
|
|
||||||
name = tables.WrappingColumn("name_or_id",
|
name = tables.WrappingColumn("name_or_id",
|
||||||
verbose_name=_("Name"),
|
verbose_name=_("Name"),
|
||||||
link="horizon:admin:volume_groups:detail")
|
link="horizon:admin:volume_groups:detail")
|
||||||
|
project = tables.Column("tenant_name", verbose_name=_("Project"))
|
||||||
|
|
||||||
class Meta(object):
|
class Meta(object):
|
||||||
name = "volume_groups"
|
name = "volume_groups"
|
||||||
|
@ -48,5 +68,7 @@ class GroupsTable(project_tables.GroupsTable):
|
||||||
RemoveAllVolumes,
|
RemoveAllVolumes,
|
||||||
DeleteGroup,
|
DeleteGroup,
|
||||||
)
|
)
|
||||||
row_class = project_tables.UpdateRow
|
row_class = UpdateRow
|
||||||
status_columns = ("status",)
|
status_columns = ("status",)
|
||||||
|
columns = ('project', 'name', 'description', 'status',
|
||||||
|
'availability_zone', 'volume_type', 'has_snapshots',)
|
||||||
|
|
|
@ -3,11 +3,13 @@
|
||||||
<div class="detail">
|
<div class="detail">
|
||||||
<dl class="dl-horizontal">
|
<dl class="dl-horizontal">
|
||||||
<dt>{% trans "Name" %}</dt>
|
<dt>{% trans "Name" %}</dt>
|
||||||
<dd>{{ group.name|default:_("-") }}</dd>
|
<dd class="word-wrap">{{ group.name|default:_("-") }}</dd>
|
||||||
<dt>{% trans "ID" %}</dt>
|
<dt>{% trans "ID" %}</dt>
|
||||||
<dd>{{ group.id }}</dd>
|
<dd>{{ group.id }}</dd>
|
||||||
<dt>{% trans "Description" %}</dt>
|
<dt>{% trans "Description" %}</dt>
|
||||||
<dd>{{ group.description|default:_("-") }}</dd>
|
<dd>{{ group.description|default:_("-") }}</dd>
|
||||||
|
<dt>{% trans "Project ID" %}</dt>
|
||||||
|
<dd>{{ group.project_id|default:_("-") }}</dd>
|
||||||
<dt>{% trans "Status" %}</dt>
|
<dt>{% trans "Status" %}</dt>
|
||||||
<dd>{{ group.status|capfirst }}</dd>
|
<dd>{{ group.status|capfirst }}</dd>
|
||||||
<dt>{% trans "Availability Zone" %}</dt>
|
<dt>{% trans "Availability Zone" %}</dt>
|
||||||
|
|
|
@ -17,7 +17,6 @@ from django.urls import reverse
|
||||||
import mock
|
import mock
|
||||||
|
|
||||||
from openstack_dashboard import api
|
from openstack_dashboard import api
|
||||||
from openstack_dashboard.api import cinder
|
|
||||||
from openstack_dashboard.test import helpers as test
|
from openstack_dashboard.test import helpers as test
|
||||||
|
|
||||||
|
|
||||||
|
@ -26,13 +25,17 @@ INDEX_TEMPLATE = 'horizon/common/_data_table_view.html'
|
||||||
|
|
||||||
|
|
||||||
class AdminVolumeGroupTests(test.BaseAdminViewTests):
|
class AdminVolumeGroupTests(test.BaseAdminViewTests):
|
||||||
@test.create_mocks({api.cinder: ['group_list_with_vol_type_names',
|
@test.create_mocks({
|
||||||
'group_snapshot_list']})
|
api.keystone: ['tenant_list'],
|
||||||
|
api.cinder: ['group_list_with_vol_type_names',
|
||||||
|
'group_snapshot_list']})
|
||||||
def test_index(self):
|
def test_index(self):
|
||||||
group = self.cinder_groups.list()
|
group = self.cinder_groups.list()
|
||||||
vg_snapshot = self.cinder_group_snapshots.list()
|
vg_snapshot = self.cinder_group_snapshots.list()
|
||||||
|
tenants = self.tenants.list()
|
||||||
self.mock_group_list_with_vol_type_names.return_value = group
|
self.mock_group_list_with_vol_type_names.return_value = group
|
||||||
self.mock_group_snapshot_list.return_value = vg_snapshot
|
self.mock_group_snapshot_list.return_value = vg_snapshot
|
||||||
|
self.mock_tenant_list.return_value = [tenants, False]
|
||||||
|
|
||||||
res = self.client.get(INDEX_URL)
|
res = self.client.get(INDEX_URL)
|
||||||
self.assertTemplateUsed(res, INDEX_TEMPLATE)
|
self.assertTemplateUsed(res, INDEX_TEMPLATE)
|
||||||
|
@ -41,12 +44,13 @@ class AdminVolumeGroupTests(test.BaseAdminViewTests):
|
||||||
volume_groups = volume_groups_table.data
|
volume_groups = volume_groups_table.data
|
||||||
self.assertEqual(len(volume_groups), 1)
|
self.assertEqual(len(volume_groups), 1)
|
||||||
|
|
||||||
|
self.mock_tenant_list.assert_called_once_with(test.IsHttpRequest())
|
||||||
self.mock_group_list_with_vol_type_names.assert_called_once_with(
|
self.mock_group_list_with_vol_type_names.assert_called_once_with(
|
||||||
test.IsHttpRequest(), {'all_tenants': 1})
|
test.IsHttpRequest(), {'all_tenants': 1})
|
||||||
self.mock_group_snapshot_list.assert_called_once_with(
|
self.mock_group_snapshot_list.assert_called_once_with(
|
||||||
test.IsHttpRequest())
|
test.IsHttpRequest())
|
||||||
|
|
||||||
@test.create_mocks({cinder: ['group_get', 'group_delete']})
|
@test.create_mocks({api.cinder: ['group_get', 'group_delete']})
|
||||||
def test_delete_group(self):
|
def test_delete_group(self):
|
||||||
group = self.cinder_groups.first()
|
group = self.cinder_groups.first()
|
||||||
|
|
||||||
|
@ -65,7 +69,7 @@ class AdminVolumeGroupTests(test.BaseAdminViewTests):
|
||||||
group.id,
|
group.id,
|
||||||
delete_volumes=False)
|
delete_volumes=False)
|
||||||
|
|
||||||
@test.create_mocks({cinder: ['group_get', 'group_delete']})
|
@test.create_mocks({api.cinder: ['group_get', 'group_delete']})
|
||||||
def test_delete_group_delete_volumes_flag(self):
|
def test_delete_group_delete_volumes_flag(self):
|
||||||
group = self.cinder_consistencygroups.first()
|
group = self.cinder_consistencygroups.first()
|
||||||
formData = {'delete_volumes': True}
|
formData = {'delete_volumes': True}
|
||||||
|
@ -85,7 +89,7 @@ class AdminVolumeGroupTests(test.BaseAdminViewTests):
|
||||||
group.id,
|
group.id,
|
||||||
delete_volumes=True)
|
delete_volumes=True)
|
||||||
|
|
||||||
@test.create_mocks({cinder: ['group_get', 'group_delete']})
|
@test.create_mocks({api.cinder: ['group_get', 'group_delete']})
|
||||||
def test_delete_group_exception(self):
|
def test_delete_group_exception(self):
|
||||||
group = self.cinder_groups.first()
|
group = self.cinder_groups.first()
|
||||||
formData = {'delete_volumes': False}
|
formData = {'delete_volumes': False}
|
||||||
|
@ -111,10 +115,10 @@ class AdminVolumeGroupTests(test.BaseAdminViewTests):
|
||||||
def test_update_group_remove_vol(self):
|
def test_update_group_remove_vol(self):
|
||||||
self._test_update_group_add_remove_vol(add=False)
|
self._test_update_group_add_remove_vol(add=False)
|
||||||
|
|
||||||
@test.create_mocks({cinder: ['volume_list',
|
@test.create_mocks({api.cinder: ['volume_list',
|
||||||
'volume_type_list',
|
'volume_type_list',
|
||||||
'group_get',
|
'group_get',
|
||||||
'group_update']})
|
'group_update']})
|
||||||
def _test_update_group_add_remove_vol(self, add=True):
|
def _test_update_group_add_remove_vol(self, add=True):
|
||||||
group = self.cinder_groups.first()
|
group = self.cinder_groups.first()
|
||||||
volume_types = self.cinder_volume_types.list()
|
volume_types = self.cinder_volume_types.list()
|
||||||
|
@ -166,9 +170,9 @@ class AdminVolumeGroupTests(test.BaseAdminViewTests):
|
||||||
add_volumes=[],
|
add_volumes=[],
|
||||||
remove_volumes=assigned_volume_ids)
|
remove_volumes=assigned_volume_ids)
|
||||||
|
|
||||||
@test.create_mocks({cinder: ['group_get_with_vol_type_names',
|
@test.create_mocks({api.cinder: ['group_get_with_vol_type_names',
|
||||||
'volume_list',
|
'volume_list',
|
||||||
'group_snapshot_list']})
|
'group_snapshot_list']})
|
||||||
def test_detail_view(self):
|
def test_detail_view(self):
|
||||||
group = self.cinder_groups.first()
|
group = self.cinder_groups.first()
|
||||||
volumes = self.cinder_volumes.list()
|
volumes = self.cinder_volumes.list()
|
||||||
|
@ -193,7 +197,7 @@ class AdminVolumeGroupTests(test.BaseAdminViewTests):
|
||||||
self.mock_group_snapshot_list.assert_called_once_with(
|
self.mock_group_snapshot_list.assert_called_once_with(
|
||||||
test.IsHttpRequest(), search_opts=search_opts)
|
test.IsHttpRequest(), search_opts=search_opts)
|
||||||
|
|
||||||
@test.create_mocks({cinder: ['group_get']})
|
@test.create_mocks({api.cinder: ['group_get']})
|
||||||
def test_detail_view_with_exception(self):
|
def test_detail_view_with_exception(self):
|
||||||
group = self.cinder_groups.first()
|
group = self.cinder_groups.first()
|
||||||
|
|
||||||
|
|
|
@ -49,8 +49,25 @@ class IndexView(tables.DataTableView):
|
||||||
return groups
|
return groups
|
||||||
group_snapshots = api.cinder.group_snapshot_list(self.request)
|
group_snapshots = api.cinder.group_snapshot_list(self.request)
|
||||||
snapshot_groups = {gs.group_id for gs in group_snapshots}
|
snapshot_groups = {gs.group_id for gs in group_snapshots}
|
||||||
|
|
||||||
|
# Gather our tenants to correlate against Group IDs
|
||||||
|
try:
|
||||||
|
tenants, has_more = api.keystone.tenant_list(self.request)
|
||||||
|
except Exception:
|
||||||
|
tenants = []
|
||||||
|
msg = _('Unable to retrieve volume group project information.')
|
||||||
|
exceptions.handle(self.request, msg)
|
||||||
|
|
||||||
|
tenant_dict = dict((t.id, t) for t in tenants)
|
||||||
for g in groups:
|
for g in groups:
|
||||||
g.has_snapshots = g.id in snapshot_groups
|
g.has_snapshots = g.id in snapshot_groups
|
||||||
|
tenant_id = getattr(g, "project_id", None)
|
||||||
|
tenant = tenant_dict.get(tenant_id)
|
||||||
|
|
||||||
|
# NOTE: If horizon is using cinder API microversion below '3.58',
|
||||||
|
# it doesn't include any 'project id' information in group's
|
||||||
|
# object.
|
||||||
|
g.tenant_name = getattr(tenant, "name", None)
|
||||||
return groups
|
return groups
|
||||||
|
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue