From 171ffb7dda66825fc0c28b858222bf18f76de5fb Mon Sep 17 00:00:00 2001
From: Gregory Thiemonge <gthiemon@redhat.com>
Date: Fri, 3 Apr 2020 10:43:36 +0200
Subject: [PATCH] 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 9a425869750045add5f62cee725ed3492763aa16)
(cherry picked from commit 35d0a3536241f511d1e2e73d66b1f3b3119bcdc5)
(cherry picked from commit bceefa888c7c9e3f5c1731fcce29952cd852444d)
---
 .../static/dashboard/project/lbaasv2/workflow/model.service.js  | 2 +-
 .../dashboard/project/lbaasv2/workflow/monitor/monitor.html     | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/octavia_dashboard/static/dashboard/project/lbaasv2/workflow/model.service.js b/octavia_dashboard/static/dashboard/project/lbaasv2/workflow/model.service.js
index 987a353e..8ec29ab0 100644
--- a/octavia_dashboard/static/dashboard/project/lbaasv2/workflow/model.service.js
+++ b/octavia_dashboard/static/dashboard/project/lbaasv2/workflow/model.service.js
@@ -550,7 +550,7 @@
       }
 
       // 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.expected_codes;
         delete finalSpec.monitor.url_path;
diff --git a/octavia_dashboard/static/dashboard/project/lbaasv2/workflow/monitor/monitor.html b/octavia_dashboard/static/dashboard/project/lbaasv2/workflow/monitor/monitor.html
index 286966a9..633ef92e 100644
--- a/octavia_dashboard/static/dashboard/project/lbaasv2/workflow/monitor/monitor.html
+++ b/octavia_dashboard/static/dashboard/project/lbaasv2/workflow/monitor/monitor.html
@@ -97,7 +97,7 @@
 
   </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="form-group">