diff --git a/openstack_dashboard/dashboards/project/static/dashboard/project/workflow/launch-instance/security-groups/security-group-details.html b/openstack_dashboard/dashboards/project/static/dashboard/project/workflow/launch-instance/security-groups/security-group-details.html index 720ca6f49b..c76f11b2d1 100644 --- a/openstack_dashboard/dashboards/project/static/dashboard/project/workflow/launch-instance/security-groups/security-group-details.html +++ b/openstack_dashboard/dashboards/project/static/dashboard/project/workflow/launch-instance/security-groups/security-group-details.html @@ -1,12 +1,12 @@ - - - - - - + + + + + + @@ -17,4 +17,4 @@ -
{$ ctrl.tableLabels.direction $}{$ ctrl.tableLabels.ethertype $}{$ ctrl.tableLabels.protocol $}{$ ctrl.tableLabels.port_range_min $}{$ ctrl.tableLabels.port_range_max $}{$ ctrl.tableLabels.remote_ip_prefix $}DirectionEther TypeProtocolMin PortMax PortRemote
{$ d.port_range_max || '-' $} {$ d.remote_ip_prefix || '-' $}
\ No newline at end of file + diff --git a/openstack_dashboard/dashboards/project/static/dashboard/project/workflow/launch-instance/security-groups/security-groups-help.controller.js b/openstack_dashboard/dashboards/project/static/dashboard/project/workflow/launch-instance/security-groups/security-groups-help.controller.js deleted file mode 100644 index 427ac7e4f6..0000000000 --- a/openstack_dashboard/dashboards/project/static/dashboard/project/workflow/launch-instance/security-groups/security-groups-help.controller.js +++ /dev/null @@ -1,41 +0,0 @@ -/* - * 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. - */ -(function () { - 'use strict'; - - angular - .module('horizon.dashboard.project.workflow.launch-instance') - .controller('LaunchInstanceSecurityGroupsHelpController', - LaunchInstanceSecurityGroupsHelpController); - - /** - * @ngdoc controller - * @name horizon.dashboard.project.workflow.launch-instance.LaunchInstanceSecurityGroupsHelpController - * @description - * Provide help for selection of security groups and key pairs. - */ - function LaunchInstanceSecurityGroupsHelpController() { - var ctrl = this; - - ctrl.title = gettext('Security Groups Help'); - - ctrl.paragraphs = [ - /*eslint-disable max-len */ - gettext('Security groups define a set of IP filter rules that determine how network traffic flows to and from an instance. Users can add additional rules to an existing security group to further define the access options for an instance. To create additional rules, go to the Compute | Access & Security view, then find the security group and click Manage Rules.'), - gettext('Security groups are project-specific and cannot be shared across projects.'), - gettext('If a security group is not associated with an instance before it is launched, then you will have very limited access to the instance after it is deployed. You will only be able to access the instance from a VNC console.') - /*eslint-enable max-len */ - ]; - } -})(); diff --git a/openstack_dashboard/dashboards/project/static/dashboard/project/workflow/launch-instance/security-groups/security-groups.controller.js b/openstack_dashboard/dashboards/project/static/dashboard/project/workflow/launch-instance/security-groups/security-groups.controller.js index 824c965601..b356df3b0c 100644 --- a/openstack_dashboard/dashboards/project/static/dashboard/project/workflow/launch-instance/security-groups/security-groups.controller.js +++ b/openstack_dashboard/dashboards/project/static/dashboard/project/workflow/launch-instance/security-groups/security-groups.controller.js @@ -32,22 +32,6 @@ function LaunchInstanceSecurityGroupsController(launchInstanceModel, basePath) { var ctrl = this; - ctrl.label = { - title: gettext('Security Groups'), - subtitle: gettext('Select the security groups.'), - name: gettext('Name'), - description: gettext('Description') - }; - - ctrl.tableLabels = { - direction: gettext('Direction'), - ethertype: gettext('Ether Type'), - protocol: gettext('Protocol'), - port_range_min: gettext('Min Port'), - port_range_max: gettext('Max Port'), - remote_ip_prefix: gettext('Remote') - }; - ctrl.tableData = { available: launchInstanceModel.securityGroups, allocated: launchInstanceModel.newInstanceSpec.security_groups, diff --git a/openstack_dashboard/dashboards/project/static/dashboard/project/workflow/launch-instance/security-groups/security-groups.help.html b/openstack_dashboard/dashboards/project/static/dashboard/project/workflow/launch-instance/security-groups/security-groups.help.html index 07ab520557..5617aca7fa 100644 --- a/openstack_dashboard/dashboards/project/static/dashboard/project/workflow/launch-instance/security-groups/security-groups.help.html +++ b/openstack_dashboard/dashboards/project/static/dashboard/project/workflow/launch-instance/security-groups/security-groups.help.html @@ -1,5 +1,6 @@ -
-

{$ ::helpCtrl.title $}

-

+
+

Security Groups Help

+

Security groups define a set of IP filter rules that determine how network traffic flows to and from an instance. Users can add additional rules to an existing security group to further define the access options for an instance. To create additional rules, go to the Compute | Access & Security view, then find the security group and click Manage Rules.

+

Security groups are project-specific and cannot be shared across projects.

+

If a security group is not associated with an instance before it is launched, then you will have very limited access to the instance after it is deployed. You will only be able to access the instance from a VNC console.

diff --git a/openstack_dashboard/dashboards/project/static/dashboard/project/workflow/launch-instance/security-groups/security-groups.html b/openstack_dashboard/dashboards/project/static/dashboard/project/workflow/launch-instance/security-groups/security-groups.html index 437611b9e9..9a3638f7c1 100644 --- a/openstack_dashboard/dashboards/project/static/dashboard/project/workflow/launch-instance/security-groups/security-groups.html +++ b/openstack_dashboard/dashboards/project/static/dashboard/project/workflow/launch-instance/security-groups/security-groups.html @@ -1,8 +1,8 @@
-

{$ ::ctrl.label.title $}

+

Security Groups

-
{$ ::ctrl.label.subtitle $}
+
Select the security groups.
- {$ ::ctrl.label.name $} - {$ ::ctrl.label.description $} + Name + Description @@ -69,8 +69,8 @@ - {$ ::ctrl.label.name $} - {$ ::ctrl.label.description $} + Name + Description diff --git a/openstack_dashboard/dashboards/project/static/dashboard/project/workflow/launch-instance/security-groups/security-groups.spec.js b/openstack_dashboard/dashboards/project/static/dashboard/project/workflow/launch-instance/security-groups/security-groups.spec.js index f6967e13e4..d68cb42d35 100644 --- a/openstack_dashboard/dashboards/project/static/dashboard/project/workflow/launch-instance/security-groups/security-groups.spec.js +++ b/openstack_dashboard/dashboards/project/static/dashboard/project/workflow/launch-instance/security-groups/security-groups.spec.js @@ -38,11 +38,6 @@ }); })); - it('contains its general labels', function() { - expect(ctrl.label).toBeDefined(); - expect(Object.keys(ctrl.label).length).toBeGreaterThan(0); - }); - it('contains its table labels', function() { expect(ctrl.tableData).toBeDefined(); expect(Object.keys(ctrl.tableData).length).toBeGreaterThan(0); @@ -75,23 +70,5 @@ }); }); - describe('LaunchInstanceSecurityGroupsHelpController', function() { - var ctrl; - - beforeEach(module('horizon.dashboard.project')); - - beforeEach(inject(function($controller) { - ctrl = $controller('LaunchInstanceSecurityGroupsHelpController'); - })); - - it('defines the title', function() { - expect(ctrl.title).toBeDefined(); - }); - - it('has paragraphs', function() { - expect(ctrl.paragraphs).toBeDefined(); - expect(ctrl.paragraphs.length).toBeGreaterThan(0); - }); - }); }); })();