Add shared-file-system guideline

Refstack backend was missing shared-file-system in the mapping
which resulted in backend not being able to parse the Shared
File System guideline download from the interop repo.
The refstack-ui needs to be edited as well so that it can properly
render the Shared File System guideline on the website.

Change-Id: I017a331ab010f94b223add22a2b55a02b6996db5
This commit is contained in:
Martin Kopec 2021-03-05 19:15:25 +00:00
parent 0074bf3b70
commit ec4a8a9547
11 changed files with 42 additions and 11 deletions

View File

@ -20,6 +20,7 @@
<option value="object">OpenStack Powered Object Storage</option> <option value="object">OpenStack Powered Object Storage</option>
<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>
</select> </select>
</div> </div>
</div> </div>

View File

@ -140,7 +140,10 @@
var targetComponents = null; var targetComponents = null;
var old_type = ctrl.gl_type; var old_type = ctrl.gl_type;
if (ctrl.target === 'dns' || ctrl.target === 'orchestration') { if (ctrl.target === 'dns' ||
ctrl.target === 'orchestration' ||
ctrl.target === 'shared-file-system'
) {
ctrl.gl_type = ctrl.target; ctrl.gl_type = ctrl.target;
} else { } else {
ctrl.gl_type = 'powered'; ctrl.gl_type = 'powered';
@ -157,7 +160,12 @@
// components. // components.
if (ctrl.target === 'platform' || ctrl.schema >= '2.0') { if (ctrl.target === 'platform' || ctrl.schema >= '2.0') {
if ('add-ons' in ctrl.guidelines) { if ('add-ons' in ctrl.guidelines) {
targetComponents = ['os_powered_' + ctrl.target]; // replace dashes by underscores in case the filename of
// a specific add-on contains dashes however the component
// name is written with underscores, f.e. like in case of
// shared-file-system.2020.11.json add-on
var target = ctrl.target.replace('-', '_');
targetComponents = ['os_powered_' + target];
} else if (ctrl.schema >= '2.0') { } else if (ctrl.schema >= '2.0') {
var platformsMap = { var platformsMap = {
'platform': 'OpenStack Powered Platform', 'platform': 'OpenStack Powered Platform',

View File

@ -30,6 +30,7 @@
<li>OpenStack Powered Object Storage</li> <li>OpenStack Powered Object Storage</li>
<li>OpenStack with DNS</li> <li>OpenStack with DNS</li>
<li>OpenStack with Orchestration</li> <li>OpenStack with Orchestration</li>
<li>OpenStack with Shared File System</li>
</ul> </ul>
</div> </div>
</div> </div>

View File

@ -94,6 +94,7 @@
<option value="object">OpenStack Powered Object Storage</option> <option value="object">OpenStack Powered Object Storage</option>
<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>
</select> </select>
<a ng-if="!result.targetEdit" <a ng-if="!result.targetEdit"
ng-click="result.targetEdit = true" ng-click="result.targetEdit = true"

View File

@ -60,7 +60,8 @@
'compute': 'OpenStack Powered Compute', 'compute': 'OpenStack Powered Compute',
'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'
}; };
// Pagination controls. // Pagination controls.

View File

@ -29,6 +29,7 @@
<option value="object">OpenStack Powered Object Storage</option> <option value="object">OpenStack Powered Object Storage</option>
<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>
</select> </select>
<hr> <hr>
<strong>Associated Product:</strong> <strong>Associated Product:</strong>

View File

@ -87,6 +87,7 @@
<option value="object">OpenStack Powered Object Storage</option> <option value="object">OpenStack Powered Object Storage</option>
<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>
</select> </select>
</div> </div>
</div> </div>

View File

@ -68,7 +68,8 @@
'compute': 'OpenStack Powered Compute', 'compute': 'OpenStack Powered Compute',
'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'
}; };
/** The schema version of the currently selected guideline data. */ /** The schema version of the currently selected guideline data. */
@ -90,7 +91,10 @@
* Sample API return array: ["2015.03.json", "2015.04.json"] * Sample API return array: ["2015.03.json", "2015.04.json"]
*/ */
function getVersionList() { function getVersionList() {
if (ctrl.target === 'dns' || ctrl.target === 'orchestration') { if (ctrl.target === 'dns' ||
ctrl.target === 'orchestration' ||
ctrl.target === 'shared-file-system'
) {
ctrl.gl_type = ctrl.target; ctrl.gl_type = ctrl.target;
} else { } else {
@ -279,7 +283,10 @@
var targetCaps = {}; var targetCaps = {};
var targetComponents = null; var targetComponents = null;
var old_type = ctrl.gl_type; var old_type = ctrl.gl_type;
if (ctrl.target === 'dns' || ctrl.target === 'orchestration') { if (ctrl.target === 'dns' ||
ctrl.target === 'orchestration' ||
ctrl.target === 'shared-file-system'
) {
ctrl.gl_type = ctrl.target; ctrl.gl_type = ctrl.target;
} else { } else {
ctrl.gl_type = 'powered'; ctrl.gl_type = 'powered';

View File

@ -157,6 +157,7 @@
<option value="object">OpenStack Powered Object Storage</option> <option value="object">OpenStack Powered Object Storage</option>
<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>
</select> </select>
<a ng-if="!result.targetEdit" <a ng-if="!result.targetEdit"
ng-click="result.targetEdit = true;" ng-click="result.targetEdit = true;"

View File

@ -42,7 +42,10 @@
ctrl.associateProductVersion = associateProductVersion; ctrl.associateProductVersion = associateProductVersion;
ctrl.getProductVersions = getProductVersions; ctrl.getProductVersions = getProductVersions;
ctrl.prepVersionEdit = prepVersionEdit; ctrl.prepVersionEdit = prepVersionEdit;
if (ctrl.target === 'dns' || ctrl.target === 'orchestration') { if (ctrl.target === 'dns' ||
ctrl.target === 'orchestration' ||
ctrl.target === 'shared-file-system'
) {
ctrl.gl_type = ctrl.target; ctrl.gl_type = ctrl.target;
} else { } else {
ctrl.gl_type = 'powered'; ctrl.gl_type = 'powered';
@ -54,7 +57,8 @@
'compute': 'OpenStack Powered Compute', 'compute': 'OpenStack Powered Compute',
'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'
}; };
/** Initial page to be on. */ /** Initial page to be on. */

View File

@ -162,11 +162,16 @@ class Guidelines:
'compute': 'OpenStack Powered Compute', 'compute': 'OpenStack Powered Compute',
'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'
} }
if target == 'dns' or target == 'orchestration': if target in ['dns', 'orchestration', 'shared-file-system']:
targets = ['os_powered_' + target] # replace dashes by underscores in case the filename of
# a specific add-on contains dashes however the component name
# is written with underscores, f.e. like in case of
# shared-file-system.2020.11.json add-on
targets = ['os_powered_' + target.replace('-', '_')]
else: else:
comps = \ comps = \
guideline_json['platforms'][platformsMap[target] guideline_json['platforms'][platformsMap[target]