From 3e4bdea3cd2295a4bfa816890ea39c1c4dc53a61 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Carlos=20Mart=C3=ADn?= Date: Thu, 29 Oct 2015 16:04:38 +0100 Subject: [PATCH] Bug #4017: Disable disk resize for cdrom images (cherry picked from commit 45f9bf69ab051d93d2ee901141a1229d2625e019) --- src/image/ImagePool.cc | 13 +++++++++++++ src/sunstone/public/app/utils/disks-resize.js | 5 ++++- 2 files changed, 17 insertions(+), 1 deletion(-) diff --git a/src/image/ImagePool.cc b/src/image/ImagePool.cc index 3e9281fde5..d0398c1ae8 100644 --- a/src/image/ImagePool.cc +++ b/src/image/ImagePool.cc @@ -426,6 +426,19 @@ int ImagePool::acquire_disk(int vm_id, return -1; } + if (has_size && img->get_type() == Image::CDROM && size != img->get_size()) + { + img->unlock(); + + imagem->release_image(vm_id, iid, false); + + oss << "SIZE attribute is not supported for CDROM image [" + << img->get_oid() << "]."; + error_str = oss.str(); + + return -1; + } + if (has_size && size < img->get_size()) { img->unlock(); diff --git a/src/sunstone/public/app/utils/disks-resize.js b/src/sunstone/public/app/utils/disks-resize.js index e10c85e7e8..bc931cb1b3 100644 --- a/src/sunstone/public/app/utils/disks-resize.js +++ b/src/sunstone/public/app/utils/disks-resize.js @@ -18,6 +18,7 @@ define(function(require){ var Locale = require('utils/locale'); var Config = require('sunstone-config'); var OpenNebula = require('opennebula'); + var OpenNebulaImage = require('opennebula/image'); var RangeSlider = require('utils/range-slider'); return { @@ -110,7 +111,9 @@ define(function(require){ diskContext.data('original_size', sizeGB); var label = disk.IMAGE ? disk.IMAGE : Locale.tr("Volatile Disk"); - var enabled = !(disk.PERSISTENT && disk.PERSISTENT.toUpperCase() == "YES"); + var enabled = + !( (disk.PERSISTENT && disk.PERSISTENT.toUpperCase() == "YES") || + (disk.TYPE && OpenNebulaImage.TYPES[disk.TYPE] == OpenNebulaImage.TYPES.CDROM) ); RangeSlider.insert({ 'label': label,