From 3adff90a373dd81d3471182f7ab07acf7e93826a Mon Sep 17 00:00:00 2001 From: Akihiro Motoki Date: Sat, 17 Feb 2018 23:24:18 +0900 Subject: [PATCH] Add "Edit Port Security Groups" action This commit adds a new action "Edit Port Security Groups" which jumps the interfaces tab of the instance detail page. In addition, a warning message is added to the "Edit Security Groups" form because if a user change security groups as an instance level the change will be applied to all interfaces of the instance, so it would be nice if we can provide a good navigation to a page of editting security groups per port. Previously, UpdateMembersStep does not support help_text_template option. To use a bold tag in the added help message, we need to use a template instead of help_text, so _workflow_step_update_members.html is updated. Closes-Bug: #1750147 Change-Id: I71437a376b94cab90df0e423aa7e1d2d0d8387ee --- .../common/_workflow_step_update_members.html | 2 +- .../dashboards/project/instances/tables.py | 15 ++++++++++++++- .../instances/_edit_security_group_help.html | 15 +++++++++++++++ .../instances/workflows/update_instance.py | 3 +-- ...dit-port-security-groups-f650fc98f5e10eb8.yaml | 2 ++ 5 files changed, 33 insertions(+), 4 deletions(-) create mode 100644 openstack_dashboard/dashboards/project/instances/templates/instances/_edit_security_group_help.html diff --git a/horizon/templates/horizon/common/_workflow_step_update_members.html b/horizon/templates/horizon/common/_workflow_step_update_members.html index 9a438b34d1..38e9dc9ef4 100644 --- a/horizon/templates/horizon/common/_workflow_step_update_members.html +++ b/horizon/templates/horizon/common/_workflow_step_update_members.html @@ -4,7 +4,7 @@
-
{{ step.help_text }}
+
{{ step.get_help_text }}
diff --git a/openstack_dashboard/dashboards/project/instances/tables.py b/openstack_dashboard/dashboards/project/instances/tables.py index 7de62a3ef4..55d1e2690a 100644 --- a/openstack_dashboard/dashboards/project/instances/tables.py +++ b/openstack_dashboard/dashboards/project/instances/tables.py @@ -478,6 +478,17 @@ class EditInstanceSecurityGroups(EditInstance): request.user.tenant_id == instance.tenant_id) +class EditPortSecurityGroups(tables.LinkAction): + name = "edit_port_secgroups" + verbose_name = _("Edit Port Security Groups") + url = "horizon:project:instances:detail" + icon = "pencil" + + def get_link_url(self, instance): + base_url = urls.reverse(self.url, args=[instance.id]) + return '%s?tab=%s__%s' % (base_url, 'instance_details', 'interfaces') + + class CreateSnapshot(policy.PolicyTargetMixin, tables.LinkAction): name = "snapshot" verbose_name = _("Create Snapshot") @@ -1253,7 +1264,9 @@ class InstancesTable(tables.DataTable): AttachInterface, DetachInterface, EditInstance, AttachVolume, DetachVolume, UpdateMetadata, DecryptInstancePassword, - EditInstanceSecurityGroups, ConsoleLink, LogLink, + EditInstanceSecurityGroups, + EditPortSecurityGroups, + ConsoleLink, LogLink, TogglePause, ToggleSuspend, ToggleShelve, ResizeLink, LockInstance, UnlockInstance, SoftRebootInstance, RebootInstance, diff --git a/openstack_dashboard/dashboards/project/instances/templates/instances/_edit_security_group_help.html b/openstack_dashboard/dashboards/project/instances/templates/instances/_edit_security_group_help.html new file mode 100644 index 0000000000..ed757d1d33 --- /dev/null +++ b/openstack_dashboard/dashboards/project/instances/templates/instances/_edit_security_group_help.html @@ -0,0 +1,15 @@ +{% load i18n %} +

+ {% blocktrans trimmed %} + Add and remove security groups to this instance from the list of available + security groups. + {% endblocktrans %} +

+

+ {% blocktrans trimmed %} + Warning: If you change security groups here, the change will be applied to + all interfaces of the instance. If you have multiple interfaces on this + instance and apply different security groups per port, + use "Edit Port Security Groups" action instead. + {% endblocktrans %} +

diff --git a/openstack_dashboard/dashboards/project/instances/workflows/update_instance.py b/openstack_dashboard/dashboards/project/instances/workflows/update_instance.py index f053f45b64..ca164031e5 100644 --- a/openstack_dashboard/dashboards/project/instances/workflows/update_instance.py +++ b/openstack_dashboard/dashboards/project/instances/workflows/update_instance.py @@ -54,13 +54,12 @@ class UpdateInstanceSecurityGroupsAction(sg_base.BaseSecurityGroupsAction): class Meta(object): name = _("Security Groups") slug = INSTANCE_SEC_GROUP_SLUG + help_text_template = 'project/instances/_edit_security_group_help.html' class UpdateInstanceSecurityGroups(sg_base.BaseSecurityGroups): action_class = UpdateInstanceSecurityGroupsAction members_list_title = _("Instance Security Groups") - help_text = _("Add and remove security groups to this instance " - "from the list of available security groups.") depends_on = ("instance_id", "target_tenant_id") def allowed(self, request): diff --git a/releasenotes/notes/edit-port-security-groups-f650fc98f5e10eb8.yaml b/releasenotes/notes/edit-port-security-groups-f650fc98f5e10eb8.yaml index 4d3ce01824..9f4b9a5c1a 100644 --- a/releasenotes/notes/edit-port-security-groups-f650fc98f5e10eb8.yaml +++ b/releasenotes/notes/edit-port-security-groups-f650fc98f5e10eb8.yaml @@ -4,3 +4,5 @@ features: "Interfaces" tab is added to the instance detail page. The new tab shows a list of ports attached to an instance. Users now have an easy way to access the list of ports of the instance and edit security groups per port. + In addition, "Edit Port Security Groups" menu is added as an action of + the instance table.