baha/skyline
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "fix: Fix for create image from volume"

Browse Source
This commit is contained in:
Zuul 2021-09-02 03:54:40 +00:00 committed by Gerrit Code Review
commit 7b1e35c1f0
2 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/pages/storage/containers/Volume/actions/CreateImage.jsx
View File

@ -14,7 +14,7 @@
import { inject, observer } from 'mobx-react'; import { inject, observer } from 'mobx-react';
import { ModalAction } from 'containers/Action'; import { ModalAction } from 'containers/Action';
import { imageOS, imageFormats } from 'resources/image'; import { volumeCreateImageTypes, imageOS } from 'resources/image';
import globalVolumeStore from 'stores/cinder/volume'; import globalVolumeStore from 'stores/cinder/volume';
import { isAvailable } from 'resources/volume'; import { isAvailable } from 'resources/volume';
@ -46,10 +46,9 @@ export class CreateImage extends ModalAction {
} }
get formatList() { get formatList() {
// todo: filter formats by settings return Object.keys(volumeCreateImageTypes).map((key) => ({
return Object.keys(imageFormats).map((key) => ({ label: volumeCreateImageTypes[key],
value: key, value: key,
label: imageFormats[key],
})); }));
} }

5
src/resources/image.jsx
View File

@ -62,6 +62,11 @@ export const imageFormatsConsole = {
iso: t('ISO - Optical disc image format'), iso: t('ISO - Optical disc image format'),
}; };
export const volumeCreateImageTypes = {
raw: t('RAW - Raw disk image format'),
qcow2: t('QCOW2 - QEMU image format'),
};
export const imageFormatsAdmin = { export const imageFormatsAdmin = {
aki: t('AKI - Amazon kernel image format'), aki: t('AKI - Amazon kernel image format'),
ari: t('ARI - Amazon ramdisk image format'), ari: t('ARI - Amazon ramdisk image format'),