openinfra/refstack
Code Issues Proposed changes

Add support for octavia

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

Change-Id: Iab3e4e82506652405a0884e10e0faf9d7e8fc42a
This commit is contained in:
Martin Kopec 2022-04-20 11:08:51 +02:00
parent 334dd378c9
commit 9ebea4b13b
10 changed files with 24 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
refstack-ui/app/components/guidelines/guidelines.html
View File

@ -21,6 +21,7 @@
<option value="dns">OpenStack with DNS</option> <option value="dns">OpenStack with DNS</option>
<option value="orchestration">OpenStack with Orchestration</option> <option value="orchestration">OpenStack with Orchestration</option>
<option value="shared_file_system">OpenStack with Shared File System</option> <option value="shared_file_system">OpenStack with Shared File System</option>
<option value="load_balancer">OpenStack with Load Balancer</option>
</select> </select>
</div> </div>
</div> </div>

3
refstack-ui/app/components/guidelines/guidelinesController.js
View File

@ -142,7 +142,8 @@
var old_type = ctrl.gl_type; var old_type = ctrl.gl_type;
if (ctrl.target === 'dns' || if (ctrl.target === 'dns' ||
ctrl.target === 'orchestration' || ctrl.target === 'orchestration' ||
ctrl.target === 'shared_file_system' ctrl.target === 'shared_file_system' ||
ctrl.target === 'load_balancer'
) { ) {
ctrl.gl_type = ctrl.target; ctrl.gl_type = ctrl.target;
} else { } else {

1
refstack-ui/app/components/products/partials/testsTable.html
View File

@ -95,6 +95,7 @@
<option value="dns">OpenStack with DNS</option> <option value="dns">OpenStack with DNS</option>
<option value="orchestration">OpenStack with Orchestration</option> <option value="orchestration">OpenStack with Orchestration</option>
<option value="shared_file_system">OpenStack with Shared File System</option> <option value="shared_file_system">OpenStack with Shared File System</option>
<option value="load_balancer">OpenStack with Load Balancer</option>
</select> </select>
<a ng-if="!result.targetEdit" <a ng-if="!result.targetEdit"
ng-click="result.targetEdit = true" ng-click="result.targetEdit = true"

3
refstack-ui/app/components/products/productController.js
View File

@ -61,7 +61,8 @@
'object': 'OpenStack Powered Object Storage', 'object': 'OpenStack Powered Object Storage',
'dns': 'OpenStack with DNS', 'dns': 'OpenStack with DNS',
'orchestration': 'OpenStack with Orchestration', '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. // Pagination controls.

1
refstack-ui/app/components/results-report/partials/editTestModal.html
View File

@ -30,6 +30,7 @@
<option value="dns">OpenStack with DNS</option> <option value="dns">OpenStack with DNS</option>
<option value="orchestration">OpenStack with Orchestration</option> <option value="orchestration">OpenStack with Orchestration</option>
<option value="shared_file_system">OpenStack with Shared File System</option> <option value="shared_file_system">OpenStack with Shared File System</option>
<option value="load_balancer">OpenStack with Load Balancer</option>
</select> </select>
<hr> <hr>
<strong>Associated Product:</strong> <strong>Associated Product:</strong>

1
refstack-ui/app/components/results-report/resultsReport.html
View File

@ -88,6 +88,7 @@
<option value="dns">OpenStack with DNS</option> <option value="dns">OpenStack with DNS</option>
<option value="orchestration">OpenStack with Orchestration</option> <option value="orchestration">OpenStack with Orchestration</option>
<option value="shared_file_system">OpenStack with Shared File System</option> <option value="shared_file_system">OpenStack with Shared File System</option>
<option value="load_balancer">OpenStack with Load Balancer</option>
</select> </select>
</div> </div>
</div> </div>

9
refstack-ui/app/components/results-report/resultsReportController.js
View File

@ -69,7 +69,8 @@
'object': 'OpenStack Powered Object Storage', 'object': 'OpenStack Powered Object Storage',
'dns': 'OpenStack with DNS', 'dns': 'OpenStack with DNS',
'orchestration': 'OpenStack with orchestration', '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. */ /** The schema version of the currently selected guideline data. */
@ -93,7 +94,8 @@
function getVersionList() { function getVersionList() {
if (ctrl.target === 'dns' || if (ctrl.target === 'dns' ||
ctrl.target === 'orchestration' || ctrl.target === 'orchestration' ||
ctrl.target === 'shared_file_system' ctrl.target === 'shared_file_system' ||
ctrl.target === 'load_balancer'
) { ) {
ctrl.gl_type = ctrl.target; ctrl.gl_type = ctrl.target;
@ -285,7 +287,8 @@
var old_type = ctrl.gl_type; var old_type = ctrl.gl_type;
if (ctrl.target === 'dns' || if (ctrl.target === 'dns' ||
ctrl.target === 'orchestration' || ctrl.target === 'orchestration' ||
ctrl.target === 'shared_file_system' ctrl.target === 'shared_file_system' ||
ctrl.target === 'load_balancer'
) { ) {
ctrl.gl_type = ctrl.target; ctrl.gl_type = ctrl.target;
} else { } else {

1
refstack-ui/app/components/results/results.html
View File

@ -158,6 +158,7 @@
<option value="dns">OpenStack with DNS</option> <option value="dns">OpenStack with DNS</option>
<option value="orchestration">OpenStack with Orchestration</option> <option value="orchestration">OpenStack with Orchestration</option>
<option value="shared_file_system">OpenStack with Shared File System</option> <option value="shared_file_system">OpenStack with Shared File System</option>
<option value="load_balancer">OpenStack with Load Balancer</option>
</select> </select>
<a ng-if="!result.targetEdit" <a ng-if="!result.targetEdit"
ng-click="result.targetEdit = true;" ng-click="result.targetEdit = true;"

6
refstack-ui/app/components/results/resultsController.js
View File

@ -44,7 +44,8 @@
ctrl.prepVersionEdit = prepVersionEdit; ctrl.prepVersionEdit = prepVersionEdit;
if (ctrl.target === 'dns' || if (ctrl.target === 'dns' ||
ctrl.target === 'orchestration' || ctrl.target === 'orchestration' ||
ctrl.target === 'shared_file_system' ctrl.target === 'shared_file_system' ||
ctrl.target === 'load_balancer'
) { ) {
ctrl.gl_type = ctrl.target; ctrl.gl_type = ctrl.target;
} else { } else {
@ -58,7 +59,8 @@
'object': 'OpenStack Powered Object Storage', 'object': 'OpenStack Powered Object Storage',
'dns': 'OpenStack with DNS', 'dns': 'OpenStack with DNS',
'orchestration': 'OpenStack with Orchestration', '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. */ /** Initial page to be on. */

7
refstack/api/guidelines.py
View File

@ -166,10 +166,13 @@ class Guidelines:
'object': 'OpenStack Powered Storage', 'object': 'OpenStack Powered Storage',
'dns': 'OpenStack with DNS', 'dns': 'OpenStack with DNS',
'orchestration': 'OpenStack with Orchestration', '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] targets = ['os_powered_' + target]
else: else:
comps = \ comps = \