From 9ebea4b13baf35407f2819cc6811d0b11d7f0da2 Mon Sep 17 00:00:00 2001
From: Martin Kopec <mkopec@redhat.com>
Date: Wed, 20 Apr 2022 11:08:51 +0200
Subject: [PATCH] Add support for octavia

The commit edits refstack page so that it support load_balancer
add-on program.

Change-Id: Iab3e4e82506652405a0884e10e0faf9d7e8fc42a
---
 refstack-ui/app/components/guidelines/guidelines.html    | 1 +
 .../app/components/guidelines/guidelinesController.js    | 3 ++-
 .../app/components/products/partials/testsTable.html     | 1 +
 refstack-ui/app/components/products/productController.js | 3 ++-
 .../results-report/partials/editTestModal.html           | 1 +
 .../app/components/results-report/resultsReport.html     | 1 +
 .../components/results-report/resultsReportController.js | 9 ++++++---
 refstack-ui/app/components/results/results.html          | 1 +
 refstack-ui/app/components/results/resultsController.js  | 6 ++++--
 refstack/api/guidelines.py                               | 7 +++++--
 10 files changed, 24 insertions(+), 9 deletions(-)

diff --git a/refstack-ui/app/components/guidelines/guidelines.html b/refstack-ui/app/components/guidelines/guidelines.html
index 797a636e..41e55ef1 100644
--- a/refstack-ui/app/components/guidelines/guidelines.html
+++ b/refstack-ui/app/components/guidelines/guidelines.html
@@ -21,6 +21,7 @@
             <option value="dns">OpenStack with DNS</option>
             <option value="orchestration">OpenStack with Orchestration</option>
             <option value="shared_file_system">OpenStack with Shared File System</option>
+            <option value="load_balancer">OpenStack with Load Balancer</option>
         </select>
     </div>
 </div>
diff --git a/refstack-ui/app/components/guidelines/guidelinesController.js b/refstack-ui/app/components/guidelines/guidelinesController.js
index e76e4a2a..b92308cc 100644
--- a/refstack-ui/app/components/guidelines/guidelinesController.js
+++ b/refstack-ui/app/components/guidelines/guidelinesController.js
@@ -142,7 +142,8 @@
             var old_type = ctrl.gl_type;
             if (ctrl.target === 'dns' ||
                 ctrl.target === 'orchestration' ||
-                ctrl.target === 'shared_file_system'
+                ctrl.target === 'shared_file_system' ||
+                ctrl.target === 'load_balancer'
                ) {
                 ctrl.gl_type = ctrl.target;
             } else {
diff --git a/refstack-ui/app/components/products/partials/testsTable.html b/refstack-ui/app/components/products/partials/testsTable.html
index b1604124..d1aecf0c 100644
--- a/refstack-ui/app/components/products/partials/testsTable.html
+++ b/refstack-ui/app/components/products/partials/testsTable.html
@@ -95,6 +95,7 @@
                     <option value="dns">OpenStack with DNS</option>
                     <option value="orchestration">OpenStack with Orchestration</option>
                     <option value="shared_file_system">OpenStack with Shared File System</option>
+                    <option value="load_balancer">OpenStack with Load Balancer</option>
                 </select>
                 <a ng-if="!result.targetEdit"
                    ng-click="result.targetEdit = true"
diff --git a/refstack-ui/app/components/products/productController.js b/refstack-ui/app/components/products/productController.js
index 5fca087b..01e0ef8f 100644
--- a/refstack-ui/app/components/products/productController.js
+++ b/refstack-ui/app/components/products/productController.js
@@ -61,7 +61,8 @@
             'object': 'OpenStack Powered Object Storage',
             'dns': 'OpenStack with DNS',
             'orchestration': 'OpenStack with Orchestration',
-            'shared_file_system': 'OpenStack with Shared File System'
+            'shared_file_system': 'OpenStack with Shared File System',
+            'load_balancer': 'OpenStack with Load Balancer'
         };
 
         // Pagination controls.
diff --git a/refstack-ui/app/components/results-report/partials/editTestModal.html b/refstack-ui/app/components/results-report/partials/editTestModal.html
index 77fe5548..3f60f7fa 100644
--- a/refstack-ui/app/components/results-report/partials/editTestModal.html
+++ b/refstack-ui/app/components/results-report/partials/editTestModal.html
@@ -30,6 +30,7 @@
                 <option value="dns">OpenStack with DNS</option>
                 <option value="orchestration">OpenStack with Orchestration</option>
                 <option value="shared_file_system">OpenStack with Shared File System</option>
+                <option value="load_balancer">OpenStack with Load Balancer</option>
             </select>
             <hr>
             <strong>Associated Product:</strong>
diff --git a/refstack-ui/app/components/results-report/resultsReport.html b/refstack-ui/app/components/results-report/resultsReport.html
index 661a4093..6c173478 100644
--- a/refstack-ui/app/components/results-report/resultsReport.html
+++ b/refstack-ui/app/components/results-report/resultsReport.html
@@ -88,6 +88,7 @@
                 <option value="dns">OpenStack with DNS</option>
                 <option value="orchestration">OpenStack with Orchestration</option>
                 <option value="shared_file_system">OpenStack with Shared File System</option>
+                <option value="load_balancer">OpenStack with Load Balancer</option>
             </select>
         </div>
     </div>
diff --git a/refstack-ui/app/components/results-report/resultsReportController.js b/refstack-ui/app/components/results-report/resultsReportController.js
index e45d2401..0f675174 100644
--- a/refstack-ui/app/components/results-report/resultsReportController.js
+++ b/refstack-ui/app/components/results-report/resultsReportController.js
@@ -69,7 +69,8 @@
             'object': 'OpenStack Powered Object Storage',
             'dns': 'OpenStack with DNS',
             'orchestration': 'OpenStack with orchestration',
-            'shared_file_system': 'OpenStack with Shared File System'
+            'shared_file_system': 'OpenStack with Shared File System',
+            'load_balancer': 'OpenStack with Load Balancer'
         };
 
         /** The schema version of the currently selected guideline data. */
@@ -93,7 +94,8 @@
         function getVersionList() {
             if (ctrl.target === 'dns' ||
                 ctrl.target === 'orchestration' ||
-                ctrl.target === 'shared_file_system'
+                ctrl.target === 'shared_file_system' ||
+                ctrl.target === 'load_balancer'
                ) {
                 ctrl.gl_type = ctrl.target;
 
@@ -285,7 +287,8 @@
             var old_type = ctrl.gl_type;
             if (ctrl.target === 'dns' ||
                 ctrl.target === 'orchestration' ||
-                ctrl.target === 'shared_file_system'
+                ctrl.target === 'shared_file_system' ||
+                ctrl.target === 'load_balancer'
                ) {
                 ctrl.gl_type = ctrl.target;
             } else {
diff --git a/refstack-ui/app/components/results/results.html b/refstack-ui/app/components/results/results.html
index ade812f3..d97e87e8 100644
--- a/refstack-ui/app/components/results/results.html
+++ b/refstack-ui/app/components/results/results.html
@@ -158,6 +158,7 @@
                         <option value="dns">OpenStack with DNS</option>
                         <option value="orchestration">OpenStack with Orchestration</option>
                         <option value="shared_file_system">OpenStack with Shared File System</option>
+                        <option value="load_balancer">OpenStack with Load Balancer</option>
                     </select>
                     <a ng-if="!result.targetEdit"
                        ng-click="result.targetEdit = true;"
diff --git a/refstack-ui/app/components/results/resultsController.js b/refstack-ui/app/components/results/resultsController.js
index e6d08df0..ed164d06 100644
--- a/refstack-ui/app/components/results/resultsController.js
+++ b/refstack-ui/app/components/results/resultsController.js
@@ -44,7 +44,8 @@
         ctrl.prepVersionEdit = prepVersionEdit;
         if (ctrl.target === 'dns' ||
             ctrl.target === 'orchestration' ||
-            ctrl.target === 'shared_file_system'
+            ctrl.target === 'shared_file_system' ||
+            ctrl.target === 'load_balancer'
            ) {
             ctrl.gl_type = ctrl.target;
         } else {
@@ -58,7 +59,8 @@
             'object': 'OpenStack Powered Object Storage',
             'dns': 'OpenStack with DNS',
             'orchestration': 'OpenStack with Orchestration',
-            'shared_file_system': 'OpenStack with Shared File System'
+            'shared_file_system': 'OpenStack with Shared File System',
+            'load_balancer': 'OpenStack with Load Balancer'
         };
 
         /** Initial page to be on. */
diff --git a/refstack/api/guidelines.py b/refstack/api/guidelines.py
index 38735a92..2b5ca2bb 100755
--- a/refstack/api/guidelines.py
+++ b/refstack/api/guidelines.py
@@ -166,10 +166,13 @@ class Guidelines:
                 'object': 'OpenStack Powered Storage',
                 'dns': 'OpenStack with DNS',
                 'orchestration': 'OpenStack with Orchestration',
-                'shared_file_system': 'OpenStack with Shared File System'
+                'shared_file_system': 'OpenStack with Shared File System',
+                'load_balancer': 'OpenStack with Load Balancer'
 
             }
-            if target in ['dns', 'orchestration', 'shared_file_system']:
+            add_ons = ['dns', 'orchestration', 'shared_file_system',
+                       'load_balancer']
+            if target in add_ons:
                 targets = ['os_powered_' + target]
             else:
                 comps = \