From dd345707c1b7b877f623322c00ed7969edc15189 Mon Sep 17 00:00:00 2001
From: Gregory Thiemonge <gthiemon@redhat.com>
Date: Tue, 27 Sep 2022 16:02:07 +0200
Subject: [PATCH] Fix certificate list in listener edit box

octavia-dashboard only handles the default_tls_container_ref parameter
when adding TLS/updating certs (no sni_container_refs support), but the
Edit listener box was showing the sni_container_refs instead of the
default_tls_container_ref.

Change-Id: I95421c7de8be3198a2da3ab9e231524631d82e9e
---
 .../project/lbaasv2/workflow/model.service.js         | 11 +++++------
 .../project/lbaasv2/workflow/model.service.spec.js    |  2 +-
 ...rtificate-list-listener-edit-1d9775d23692c34b.yaml |  5 +++++
 3 files changed, 11 insertions(+), 7 deletions(-)
 create mode 100644 releasenotes/notes/fix-certificate-list-listener-edit-1d9775d23692c34b.yaml

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 bd97cfd6..7232c2bb 100644
--- a/octavia_dashboard/static/dashboard/project/lbaasv2/workflow/model.service.js
+++ b/octavia_dashboard/static/dashboard/project/lbaasv2/workflow/model.service.js
@@ -733,12 +733,11 @@
 
         if (result.listener.protocol === 'TERMINATED_HTTPS') {
           keymanagerPromise.then(prepareCertificates).then(function addAvailableCertificates() {
-            result.listener.sni_container_refs.forEach(function addAvailableCertificate(ref) {
-              model.certificates.filter(function matchCertificate(cert) {
-                return cert.id === ref;
-              }).forEach(function addCertificate(cert) {
-                model.spec.certificates.push(cert);
-              });
+            var ref = result.listener.default_tls_container_ref;
+            model.certificates.filter(function matchCertificate(cert) {
+              return cert.id === ref;
+            }).forEach(function addCertificate(cert) {
+              model.spec.certificates.push(cert);
             });
           }, certificatesError);
           $('#wizard-side-nav ul li:last').show();
diff --git a/octavia_dashboard/static/dashboard/project/lbaasv2/workflow/model.service.spec.js b/octavia_dashboard/static/dashboard/project/lbaasv2/workflow/model.service.spec.js
index a0e2a8b3..76b7d946 100644
--- a/octavia_dashboard/static/dashboard/project/lbaasv2/workflow/model.service.spec.js
+++ b/octavia_dashboard/static/dashboard/project/lbaasv2/workflow/model.service.spec.js
@@ -36,7 +36,7 @@
           protocol_port: 80,
           connection_limit: 999,
           load_balancers: [{id: '1234'}],
-          sni_container_refs: ['container2'],
+          default_tls_container_ref: 'container2',
           insert_headers: {
             'X-Forwarded-For': 'True',
             'X-Forwarded-Port': 'True',
diff --git a/releasenotes/notes/fix-certificate-list-listener-edit-1d9775d23692c34b.yaml b/releasenotes/notes/fix-certificate-list-listener-edit-1d9775d23692c34b.yaml
new file mode 100644
index 00000000..fcabdb0e
--- /dev/null
+++ b/releasenotes/notes/fix-certificate-list-listener-edit-1d9775d23692c34b.yaml
@@ -0,0 +1,5 @@
+---
+fixes:
+  - |
+    Fix a bug that prevented to display the ``default_tls_container_ref`` when
+    editing an HTTP_TERMINATED listener.