openstack
/
horizon
Code Issues Proposed changes

Merge "Fix community image handling in launch instance form" into stable/victoria

This commit is contained in:
Zuul 2021-04-27 14:13:27 +00:00 committed by Gerrit Code Review
parent 7b2df7b958 c63e4c91ae
commit 0c49378970
2 changed files with 63 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
openstack_dashboard/dashboards/project/static/dashboard/project/workflow/launch-instance/launch-instance-model.service.js
View File

@ -567,7 +567,12 @@
if (enabledImage || enabledSnapshot) {
var filter = {status: 'active', sort_key: 'name', sort_dir: 'asc'};
glanceAPI.getImages(filter).then(
var filterCommunity = angular.merge({}, filter, {visibility: 'community'});
var imagePromises = [
glanceAPI.getImages(filter),
glanceAPI.getImages(filterCommunity)
];
$q.all(imagePromises).then(
function(data) {
onGetImageSources(data, enabledImage, enabledSnapshot);
}
@ -678,13 +683,21 @@
model.imageSnapshots.length = 0;
model.images.length = 0;
angular.forEach(data.data.items, function(image) {
if (isValidSnapshot(image) && enabledSnapshot) {
model.imageSnapshots.push(image);
} else if (isValidImage(image) && enabledImage) {
image.name_or_id = image.name || image.id;
model.images.push(image);
}
var imageIdsProcessed = [];
angular.forEach(data, function(data) {
angular.forEach(data.data.items, function(image) {
if (imageIdsProcessed.includes(image.id)) {
return;
}
imageIdsProcessed.push(image.id);
if (isValidSnapshot(image) && enabledSnapshot) {
model.imageSnapshots.push(image);
} else if (isValidImage(image) && enabledImage) {
image.name_or_id = image.name || image.id;
model.images.push(image);
}
});
});
if (enabledImage) {

67
openstack_dashboard/dashboards/project/static/dashboard/project/workflow/launch-instance/launch-instance-model.service.spec.js
View File

@ -131,19 +131,35 @@
beforeEach(module(function($provide) {
$provide.value('horizon.app.core.openstack-service-api.glance', {
getImages: function () {
var images = [
{container_format: 'aki', properties: {}},
{container_format: 'ari', properties: {}},
{container_format: 'ami', properties: {}, name: 'ami_image'},
{container_format: 'raw', properties: {}, name: 'raw_image'},
{container_format: 'ami', properties: {image_type: 'image'}, id: '1'},
{container_format: 'raw', properties: {image_type: 'image'}, id: '2'},
{container_format: 'ami', properties: {
block_device_mapping: '[{"source_type": "snapshot"}]'}},
{container_format: 'raw', properties: {
block_device_mapping: '[{"source_type": "snapshot"}]'}}
];
getImages: function (params) {
var images;
if (params.visibility === 'community') {
images = [
{id: '10', container_format: 'raw', properties: {image_type: 'image'},
visibility: 'community'},
// ID 6 is already returned by the first call (below), so this should be ignored.
// To clarify the difference, the content here is different intentionally.
{id: '6', container_format: 'raw', properties: {image_type: 'image'},
visibility: 'community'}
];
} else {
images = [
// container_format aki and ari are not considered as bootable
{id: '1', container_format: 'aki', properties: {}},
{id: '2', container_format: 'ari', properties: {}},
// The following images are considered as "image" sources.
{id: '3', container_format: 'ami', properties: {}, name: 'ami_image'},
{id: '4', container_format: 'raw', properties: {}, name: 'raw_image'},
{id: '5', container_format: 'ami', properties: {image_type: 'image'}},
{id: '6', container_format: 'raw', properties: {image_type: 'image'}},
// The following images are considered as "snapshot" sources.
{id: '7', container_format: 'ami',
properties: {block_device_mapping: '[{"source_type": "snapshot"}]'}},
{id: '8', container_format: 'raw',
properties: {block_device_mapping: '[{"source_type": "snapshot"}]'}},
{id: '9', container_format: 'raw', properties: {image_type: 'snapshot'}}
];
}
var deferred = $q.defer();
deferred.resolve({data: {items: images}});
@ -387,22 +403,23 @@
expect(model.newInstanceSpec).toBeDefined();
var expectedImages = [
{container_format: 'ami', properties: {}, name: 'ami_image', name_or_id: 'ami_image'},
{container_format: 'raw', properties: {}, name: 'raw_image', name_or_id: 'raw_image'},
{container_format: 'ami', properties: {image_type: 'image'}, id: '1', name_or_id: '1'},
{container_format: 'raw', properties: {image_type: 'image'}, id: '2', name_or_id: '2'}
{id: '3', container_format: 'ami', properties: {}, name: 'ami_image',
name_or_id: 'ami_image'},
{id: '4', container_format: 'raw', properties: {}, name: 'raw_image',
name_or_id: 'raw_image'},
{id: '5', container_format: 'ami', properties: {image_type: 'image'}, name_or_id: '5'},
{id: '6', container_format: 'raw', properties: {image_type: 'image'}, name_or_id: '6'},
{id: '10', container_format: 'raw', properties: {image_type: 'image'}, name_or_id: '10',
visibility: 'community'}
];
expect(model.images).toEqual(expectedImages);
var expectedSnapshots = [
{
container_format: 'ami',
properties: {block_device_mapping: '[{"source_type": "snapshot"}]'}
},
{
container_format: 'raw',
properties: {block_device_mapping: '[{"source_type": "snapshot"}]'}
}
{id: '7', container_format: 'ami',
properties: {block_device_mapping: '[{"source_type": "snapshot"}]'}},
{id: '8', container_format: 'raw',
properties: {block_device_mapping: '[{"source_type": "snapshot"}]'}},
{id: '9', container_format: 'raw', properties: {image_type: 'snapshot'}}
];
expect(model.imageSnapshots).toEqual(expectedSnapshots);