From c7dad2670053b8309f3772af3272535f3b6c7f9a Mon Sep 17 00:00:00 2001 From: zhuyue Date: Thu, 2 Sep 2021 10:13:43 +0800 Subject: [PATCH] fix: Fix for create image from volume Only row & qcow2 are supported to create image from volume Change-Id: I837bd1cf8059d19ab652d344f587de04f6010789 --- .../storage/containers/Volume/actions/CreateImage.jsx | 7 +++---- src/resources/image.jsx | 5 +++++ 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/src/pages/storage/containers/Volume/actions/CreateImage.jsx b/src/pages/storage/containers/Volume/actions/CreateImage.jsx index 78e9bee8..76e58c74 100644 --- a/src/pages/storage/containers/Volume/actions/CreateImage.jsx +++ b/src/pages/storage/containers/Volume/actions/CreateImage.jsx @@ -14,7 +14,7 @@ import { inject, observer } from 'mobx-react'; import { ModalAction } from 'containers/Action'; -import { imageOS, imageFormats } from 'resources/image'; +import { volumeCreateImageTypes, imageOS } from 'resources/image'; import globalVolumeStore from 'stores/cinder/volume'; import { isAvailable } from 'resources/volume'; @@ -46,10 +46,9 @@ export class CreateImage extends ModalAction { } get formatList() { - // todo: filter formats by settings - return Object.keys(imageFormats).map((key) => ({ + return Object.keys(volumeCreateImageTypes).map((key) => ({ + label: volumeCreateImageTypes[key], value: key, - label: imageFormats[key], })); } diff --git a/src/resources/image.jsx b/src/resources/image.jsx index 98125c00..9473fc90 100644 --- a/src/resources/image.jsx +++ b/src/resources/image.jsx @@ -62,6 +62,11 @@ export const imageFormatsConsole = { 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 = { aki: t('AKI - Amazon kernel image format'), ari: t('ARI - Amazon ramdisk image format'),