openstack
/
octavia-dashboard
Code Issues Proposed changes

Add missing fields for HTTPS health monitors 

Some fields (http method, expected codes, url path) are missing in
health monitor form when type is HTTPS.
These are valid parameters for HTTP and HTTPS health monitors.

Change-Id: I3668f3dc5d3eb6a288994386294cc018035540c8
Story: 2007512
Task: 39292
(cherry picked from commit 9a42586975)
(cherry picked from commit 35d0a35362)
(cherry picked from commit bceefa888c)
This commit is contained in:
Gregory Thiemonge 2020-04-03 10:43:36 +02:00
parent 0e14846f71
commit 171ffb7dda
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
octavia_dashboard/static/dashboard/project/lbaasv2/workflow/model.service.js
View File

@ -550,7 +550,7 @@
} }
// Only include necessary monitor properties // Only include necessary monitor properties
if (finalSpec.monitor.type !== 'HTTP') { if (finalSpec.monitor.type !== 'HTTP' && finalSpec.monitor.type !== 'HTTPS') {
delete finalSpec.monitor.http_method; delete finalSpec.monitor.http_method;
delete finalSpec.monitor.expected_codes; delete finalSpec.monitor.expected_codes;
delete finalSpec.monitor.url_path; delete finalSpec.monitor.url_path;

2
octavia_dashboard/static/dashboard/project/lbaasv2/workflow/monitor/monitor.html
View File

@ -97,7 +97,7 @@
</div> </div>
<div class="row" ng-if="model.spec.monitor.type === 'HTTP'"> <div class="row" ng-if="model.spec.monitor.type === 'HTTP' || model.spec.monitor.type === 'HTTPS'">
<div class="col-xs-12 col-sm-8 col-md-6 col-lg-4"> <div class="col-xs-12 col-sm-8 col-md-6 col-lg-4">
<div class="form-group"> <div class="form-group">