From afccde5cfc255c450d4bd8f05cd0908f65be49a8 Mon Sep 17 00:00:00 2001 From: Abhishek Kumar Date: Mon, 17 Apr 2023 14:19:20 +0530 Subject: [PATCH 1/2] server,engine-schema: fix listing service offering for vm scale (#7398) Fixes #7389 Fixes listing of service offerings for VM scale when the current offering has `disk_offering_strictness=true` Signed-off-by: Abhishek Kumar --- .../java/com/cloud/service/ServiceOfferingVO.java | 14 ++++++++------ .../cloudstack/quota/vo/ServiceOfferingVO.java | 1 + 2 files changed, 9 insertions(+), 6 deletions(-) diff --git a/engine/schema/src/main/java/com/cloud/service/ServiceOfferingVO.java b/engine/schema/src/main/java/com/cloud/service/ServiceOfferingVO.java index 7c1b182f9d8..31e4b073c13 100644 --- a/engine/schema/src/main/java/com/cloud/service/ServiceOfferingVO.java +++ b/engine/schema/src/main/java/com/cloud/service/ServiceOfferingVO.java @@ -22,20 +22,21 @@ import java.util.UUID; import javax.persistence.Column; import javax.persistence.Entity; -import javax.persistence.Table; -import javax.persistence.Transient; -import javax.persistence.Id; +import javax.persistence.EnumType; +import javax.persistence.Enumerated; import javax.persistence.GeneratedValue; import javax.persistence.GenerationType; +import javax.persistence.Id; +import javax.persistence.Table; import javax.persistence.Temporal; import javax.persistence.TemporalType; -import javax.persistence.Enumerated; -import javax.persistence.EnumType; +import javax.persistence.Transient; + +import org.apache.cloudstack.utils.reflectiontostringbuilderutils.ReflectionToStringBuilderUtils; import com.cloud.offering.ServiceOffering; import com.cloud.utils.db.GenericDao; import com.cloud.vm.VirtualMachine; -import org.apache.cloudstack.utils.reflectiontostringbuilderutils.ReflectionToStringBuilderUtils; @Entity @Table(name = "service_offering") @@ -196,6 +197,7 @@ public class ServiceOfferingVO implements ServiceOffering { vmType = offering.getSystemVmType(); systemUse = offering.isSystemUse(); dynamicScalingEnabled = offering.isDynamicScalingEnabled(); + diskOfferingStrictness = offering.diskOfferingStrictness; } @Override diff --git a/framework/quota/src/main/java/org/apache/cloudstack/quota/vo/ServiceOfferingVO.java b/framework/quota/src/main/java/org/apache/cloudstack/quota/vo/ServiceOfferingVO.java index 0602f2dc782..b769e0aed35 100644 --- a/framework/quota/src/main/java/org/apache/cloudstack/quota/vo/ServiceOfferingVO.java +++ b/framework/quota/src/main/java/org/apache/cloudstack/quota/vo/ServiceOfferingVO.java @@ -149,6 +149,7 @@ public class ServiceOfferingVO implements ServiceOffering { vmType = offering.getSystemVmType(); systemUse = offering.isSystemUse(); dynamicScalingEnabled = offering.isDynamicScalingEnabled(); + diskOfferingStrictness = offering.diskOfferingStrictness; } @Override From dabefca2b694ba7d22ae47432513ac3ad2c4e86f Mon Sep 17 00:00:00 2001 From: Wei Zhou Date: Mon, 17 Apr 2023 16:59:18 +0200 Subject: [PATCH 2/2] debian/control: build packages on ubuntu 22.04 (#7269) --- debian/control | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/debian/control b/debian/control index a7e331320b8..7c1ff8e0b1b 100644 --- a/debian/control +++ b/debian/control @@ -3,7 +3,9 @@ Section: libs Priority: extra Maintainer: Wido den Hollander Build-Depends: debhelper (>= 9), openjdk-11-jdk | java11-sdk | java11-jdk | zulu-11, genisoimage, - python-mysql.connector | python3-mysql.connector, maven (>= 3) | maven3, python (>= 2.7), python3 (>= 3), nodejs (>= 12), lsb-release, dh-systemd, python-setuptools, python3-setuptools + python-mysql.connector | python3-mysql.connector, maven (>= 3) | maven3, + python (>= 2.7) | python2 (>= 2.7), python3 (>= 3), python-setuptools, python3-setuptools, + nodejs (>= 12), lsb-release, dh-systemd | debhelper (>= 13) Standards-Version: 3.8.1 Homepage: http://www.cloudstack.org/