From 965e551e3b3242b2a8c1eadbd4c9b76108e38e05 Mon Sep 17 00:00:00 2001 From: Jacky Hu Date: Wed, 16 May 2018 20:08:47 +0800 Subject: [PATCH] Allow member name to be set and updated Also use correct compare types for l7 rule of file type Change-Id: I68ab95fbd197f9621bdb0f770a6f7d50918b7a91 --- octavia_dashboard/api/rest/lbaasv2.py | 12 +++-- .../actions/edit-member/modal.controller.js | 6 ++- .../edit-member/modal.controller.spec.js | 6 ++- .../members/actions/edit-member/modal.html | 13 ++++- .../workflow/l7policy/l7policy.controller.js | 5 -- .../l7policy/l7policy.controller.spec.js | 5 +- .../lbaasv2/workflow/l7policy/l7policy.html | 2 +- .../workflow/l7rule/l7rule.controller.js | 49 ------------------- .../workflow/l7rule/l7rule.controller.spec.js | 37 -------------- .../lbaasv2/workflow/l7rule/l7rule.html | 22 +++++++-- .../workflow/listener/listener.controller.js | 5 -- .../lbaasv2/workflow/listener/listener.html | 2 +- .../loadbalancer/loadbalancer.controller.js | 5 -- .../workflow/loadbalancer/loadbalancer.html | 2 +- .../workflow/members/members.controller.js | 8 +-- .../lbaasv2/workflow/members/members.html | 18 +++++-- .../project/lbaasv2/workflow/model.service.js | 14 ++++-- .../lbaasv2/workflow/model.service.spec.js | 6 +-- .../workflow/monitor/monitor.controller.js | 5 -- .../lbaasv2/workflow/monitor/monitor.html | 12 ++++- .../lbaasv2/workflow/pool/pool.controller.js | 49 ------------------- .../workflow/pool/pool.controller.spec.js | 37 -------------- .../project/lbaasv2/workflow/pool/pool.html | 4 +- 23 files changed, 95 insertions(+), 229 deletions(-) delete mode 100644 octavia_dashboard/static/dashboard/project/lbaasv2/workflow/l7rule/l7rule.controller.js delete mode 100644 octavia_dashboard/static/dashboard/project/lbaasv2/workflow/l7rule/l7rule.controller.spec.js delete mode 100644 octavia_dashboard/static/dashboard/project/lbaasv2/workflow/pool/pool.controller.js delete mode 100644 octavia_dashboard/static/dashboard/project/lbaasv2/workflow/pool/pool.controller.spec.js diff --git a/octavia_dashboard/api/rest/lbaasv2.py b/octavia_dashboard/api/rest/lbaasv2.py index 6200ac2b..5ac9b970 100644 --- a/octavia_dashboard/api/rest/lbaasv2.py +++ b/octavia_dashboard/api/rest/lbaasv2.py @@ -270,7 +270,8 @@ def create_health_monitor(request, **kwargs): http_method=data['monitor'].get('http_method'), url_path=data['monitor'].get('url_path'), expected_codes=data['monitor'].get('expected_codes'), - admin_state_up=data['monitor'].get('admin_state_up') + admin_state_up=data['monitor'].get('admin_state_up'), + name=data['monitor'].get('name') ) return _get_sdk_object_dict(health_mon) @@ -305,7 +306,8 @@ def add_member(request, **kwargs): weight=member.get('weight'), monitor_address=monitor_address if monitor_address else None, monitor_port=member.get('monitor_port'), - admin_state_up=member.get('admin_state_up') + admin_state_up=member.get('admin_state_up'), + name=member.get('name'), ) index += 1 @@ -506,7 +508,8 @@ def update_monitor(request, **kwargs): http_method=data['monitor'].get('http_method'), url_path=data['monitor'].get('url_path'), expected_codes=data['monitor'].get('expected_codes'), - admin_state_up=data['monitor'].get('admin_state_up') + admin_state_up=data['monitor'].get('admin_state_up'), + name=data['monitor'].get('name') ) return _get_sdk_object_dict(healthmonitor) @@ -1075,7 +1078,8 @@ class Member(generic.View): member_id, pool_id, weight=data.get('weight'), monitor_address=monitor_address if monitor_address else None, monitor_port=data.get('monitor_port'), - admin_state_up=data.get('admin_state_up') + admin_state_up=data.get('admin_state_up'), + name=data.get('name'), ) return _get_sdk_object_dict(member) diff --git a/octavia_dashboard/static/dashboard/project/lbaasv2/members/actions/edit-member/modal.controller.js b/octavia_dashboard/static/dashboard/project/lbaasv2/members/actions/edit-member/modal.controller.js index 768b6699..3de43a2f 100644 --- a/octavia_dashboard/static/dashboard/project/lbaasv2/members/actions/edit-member/modal.controller.js +++ b/octavia_dashboard/static/dashboard/project/lbaasv2/members/actions/edit-member/modal.controller.js @@ -50,7 +50,7 @@ patterns, gettext, poolId, member) { var ctrl = this; - ctrl.adminStateUpOptions = [ + ctrl.yesNoOptions = [ { label: gettext('Yes'), value: true }, { label: gettext('No'), value: false } ]; @@ -64,6 +64,7 @@ ctrl.monitor_address = member.monitor_address; ctrl.monitor_port = member.monitor_port; ctrl.admin_state_up = member.admin_state_up; + ctrl.name = member.name; ctrl.cancel = cancel; ctrl.save = save; ctrl.saving = false; @@ -79,7 +80,8 @@ weight: ctrl.weight, monitor_address: ctrl.monitor_address, monitor_port: ctrl.monitor_port, - admin_state_up: ctrl.admin_state_up + admin_state_up: ctrl.admin_state_up, + name: ctrl.name }).then(onSuccess, onFailure); } diff --git a/octavia_dashboard/static/dashboard/project/lbaasv2/members/actions/edit-member/modal.controller.spec.js b/octavia_dashboard/static/dashboard/project/lbaasv2/members/actions/edit-member/modal.controller.spec.js index 0165ac3c..81bdd633 100644 --- a/octavia_dashboard/static/dashboard/project/lbaasv2/members/actions/edit-member/modal.controller.spec.js +++ b/octavia_dashboard/static/dashboard/project/lbaasv2/members/actions/edit-member/modal.controller.spec.js @@ -42,7 +42,8 @@ weight: 1, monitor_address: '1.1.1.1', monitor_port: 80, - admin_state_up: true + admin_state_up: true, + name: 'member name' }); $provide.value('horizon.app.core.openstack-service-api.lbaasv2', { editMember: function() { @@ -84,7 +85,8 @@ weight: 1, monitor_address: '1.1.1.1', monitor_port: 80, - admin_state_up: true + admin_state_up: true, + name: 'member name' }); expect($uibModalInstance.close).toHaveBeenCalled(); }); diff --git a/octavia_dashboard/static/dashboard/project/lbaasv2/members/actions/edit-member/modal.html b/octavia_dashboard/static/dashboard/project/lbaasv2/members/actions/edit-member/modal.html index 7d19a14c..f05337b0 100644 --- a/octavia_dashboard/static/dashboard/project/lbaasv2/members/actions/edit-member/modal.html +++ b/octavia_dashboard/static/dashboard/project/lbaasv2/members/actions/edit-member/modal.html @@ -8,6 +8,15 @@

Provide the details for the member.

+
+
+ + +
+
@@ -79,13 +88,13 @@
-
+
diff --git a/octavia_dashboard/static/dashboard/project/lbaasv2/workflow/l7policy/l7policy.controller.js b/octavia_dashboard/static/dashboard/project/lbaasv2/workflow/l7policy/l7policy.controller.js index 6a552dd9..2bdcb54f 100644 --- a/octavia_dashboard/static/dashboard/project/lbaasv2/workflow/l7policy/l7policy.controller.js +++ b/octavia_dashboard/static/dashboard/project/lbaasv2/workflow/l7policy/l7policy.controller.js @@ -40,11 +40,6 @@ var ctrl = this; - ctrl.adminStateUpOptions = [ - { label: gettext('Yes'), value: true }, - { label: gettext('No'), value: false } - ]; - ctrl.redirectUrlError = gettext('The redirect url must be a valid http or https url.'); ctrl.positionError = gettext('The position must be a number between 1 and 2147483647.'); diff --git a/octavia_dashboard/static/dashboard/project/lbaasv2/workflow/l7policy/l7policy.controller.spec.js b/octavia_dashboard/static/dashboard/project/lbaasv2/workflow/l7policy/l7policy.controller.spec.js index 7c4dfb21..f11c04f7 100644 --- a/octavia_dashboard/static/dashboard/project/lbaasv2/workflow/l7policy/l7policy.controller.spec.js +++ b/octavia_dashboard/static/dashboard/project/lbaasv2/workflow/l7policy/l7policy.controller.spec.js @@ -28,8 +28,9 @@ ctrl = $controller('L7PolicyDetailsController'); })); - it('should define adminStateUpOptions', function() { - expect(ctrl.adminStateUpOptions).toBeDefined(); + it('should define error messages', function() { + expect(ctrl.redirectUrlError).toBeDefined(); + expect(ctrl.positionError).toBeDefined(); }); }); diff --git a/octavia_dashboard/static/dashboard/project/lbaasv2/workflow/l7policy/l7policy.html b/octavia_dashboard/static/dashboard/project/lbaasv2/workflow/l7policy/l7policy.html index 62c919d7..95419278 100644 --- a/octavia_dashboard/static/dashboard/project/lbaasv2/workflow/l7policy/l7policy.html +++ b/octavia_dashboard/static/dashboard/project/lbaasv2/workflow/l7policy/l7policy.html @@ -91,7 +91,7 @@
diff --git a/octavia_dashboard/static/dashboard/project/lbaasv2/workflow/l7rule/l7rule.controller.js b/octavia_dashboard/static/dashboard/project/lbaasv2/workflow/l7rule/l7rule.controller.js deleted file mode 100644 index d98971e7..00000000 --- a/octavia_dashboard/static/dashboard/project/lbaasv2/workflow/l7rule/l7rule.controller.js +++ /dev/null @@ -1,49 +0,0 @@ -/* - * Copyright 2018 Walmart. - * - * 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.lbaasv2') - .controller('L7RuleDetailsController', L7RuleDetailsController); - - L7RuleDetailsController.$inject = [ - 'horizon.dashboard.project.lbaasv2.patterns', - 'horizon.framework.util.i18n.gettext' - ]; - - /** - * @ngdoc controller - * @name L7RuleDetailsController - * @description - * The `L7RuleDetailsController` controller provides functions for - * configuring the l7rule step of the LBaaS wizard. - * @param patterns The LBaaS v2 patterns constant. - * @param gettext The horizon gettext function for translation. - * @returns undefined - */ - - function L7RuleDetailsController(patterns, gettext) { - - var ctrl = this; - - ctrl.adminStateUpOptions = [ - { label: gettext('Yes'), value: true }, - { label: gettext('No'), value: false } - ]; - - } -})(); diff --git a/octavia_dashboard/static/dashboard/project/lbaasv2/workflow/l7rule/l7rule.controller.spec.js b/octavia_dashboard/static/dashboard/project/lbaasv2/workflow/l7rule/l7rule.controller.spec.js deleted file mode 100644 index 9eb3a6ff..00000000 --- a/octavia_dashboard/static/dashboard/project/lbaasv2/workflow/l7rule/l7rule.controller.spec.js +++ /dev/null @@ -1,37 +0,0 @@ -/* - * Copyright 2018 Walmart. - * - * 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'; - - describe('L7Rule Details Step', function() { - - beforeEach(module('horizon.framework.util')); - beforeEach(module('horizon.dashboard.project.lbaasv2')); - - describe('L7RuleDetailsController', function() { - var ctrl; - - beforeEach(inject(function($controller) { - ctrl = $controller('L7RuleDetailsController'); - })); - - it('should define adminStateUpOptions', function() { - expect(ctrl.adminStateUpOptions).toBeDefined(); - }); - - }); - }); -})(); diff --git a/octavia_dashboard/static/dashboard/project/lbaasv2/workflow/l7rule/l7rule.html b/octavia_dashboard/static/dashboard/project/lbaasv2/workflow/l7rule/l7rule.html index b5b637f0..81144add 100644 --- a/octavia_dashboard/static/dashboard/project/lbaasv2/workflow/l7rule/l7rule.html +++ b/octavia_dashboard/static/dashboard/project/lbaasv2/workflow/l7rule/l7rule.html @@ -1,4 +1,4 @@ -
+

Provide the details for the l7 rule.

@@ -9,7 +9,7 @@
@@ -47,7 +47,21 @@
-
+
+
+ + +
+
+ +