From c355370cfd35b708a5d624e8e2c45c2e8a8a21d1 Mon Sep 17 00:00:00 2001 From: Wei Zhou Date: Mon, 18 Jan 2021 08:39:03 +0000 Subject: [PATCH] server: add possibility to scale vm to current customer offerings We can use cloudmonkey to scale a vm with dynamic offering, to same offering but with different cpunumber or memory. Enable it on UI to improve user experience. --- .../src/main/java/com/cloud/api/query/QueryManagerImpl.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/server/src/main/java/com/cloud/api/query/QueryManagerImpl.java b/server/src/main/java/com/cloud/api/query/QueryManagerImpl.java index 18ea640bf147..c5a1df005b95 100644 --- a/server/src/main/java/com/cloud/api/query/QueryManagerImpl.java +++ b/server/src/main/java/com/cloud/api/query/QueryManagerImpl.java @@ -2820,7 +2820,9 @@ private Pair, Integer> searchForServiceOfferingsInte _accountMgr.checkAccess(caller, null, true, vmInstance); currentVmOffering = _srvOfferingDao.findByIdIncludingRemoved(vmInstance.getId(), vmInstance.getServiceOfferingId()); - sc.addAnd("id", SearchCriteria.Op.NEQ, currentVmOffering.getId()); + if (! currentVmOffering.isDynamic()) { + sc.addAnd("id", SearchCriteria.Op.NEQ, currentVmOffering.getId()); + } // 1. Only return offerings with the same storage type sc.addAnd("useLocalStorage", SearchCriteria.Op.EQ, currentVmOffering.isUseLocalStorage());