[cloudstack] branch 4.18 updated: server,engine-schema: fix listing service offering for vm scale (#7398)

[shwstppr]

This is an automated email from the ASF dual-hosted git repository.

shwstppr pushed a commit to branch 4.18
in repository https://gitbox.apache.org/repos/asf/cloudstack.git


The following commit(s) were added to refs/heads/4.18 by this push:
     new afccde5cfc2 server,engine-schema: fix listing service offering for vm 
scale (#7398)
afccde5cfc2 is described below

commit afccde5cfc255c450d4bd8f05cd0908f65be49a8
Author: Abhishek Kumar <abhishek.mr...@gmail.com>
AuthorDate: Mon Apr 17 14:19:20 2023 +0530

    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 <abhishek.mr...@gmail.com>
---
 .../src/main/java/com/cloud/service/ServiceOfferingVO.java | 14 ++++++++------
 .../org/apache/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