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.
Provide the details for the l7 rule.