From 05be5acfda04843badf95f48387c27baeaebc568 Mon Sep 17 00:00:00 2001 From: alena Date: Tue, 22 Mar 2011 10:46:10 -0700 Subject: [PATCH] bug 9066: don't allow enabling ha for vm created from Ha disbled service offering status 9066: resolved fixed --- server/src/com/cloud/vm/UserVmManagerImpl.java | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/server/src/com/cloud/vm/UserVmManagerImpl.java b/server/src/com/cloud/vm/UserVmManagerImpl.java index 443318608b5..a9913ef5596 100755 --- a/server/src/com/cloud/vm/UserVmManagerImpl.java +++ b/server/src/com/cloud/vm/UserVmManagerImpl.java @@ -1615,6 +1615,11 @@ public class UserVmManagerImpl implements UserVmManager, UserVmService, Manager if (vmInstance == null) { throw new InvalidParameterValueException("unable to find virtual machine with id " + id); } + + ServiceOffering offering = _configMgr.getServiceOffering(vmInstance.getServiceOfferingId()); + if (!offering.getOfferHA() && ha != null && ha) { + throw new InvalidParameterValueException("Can't enable ha for the vm as it's created from the Service offering having HA disabled"); + } userId = accountAndUserValidation(id, account, userId,vmInstance);