From bf856ab3f4fb4a05fb03a6dab20a3f1f6ce8674e Mon Sep 17 00:00:00 2001
From: Abhishek Kumar <abhishek.mrt22@gmail.com>
Date: Thu, 2 Apr 2026 13:28:30 +0530
Subject: [PATCH] fix serviceoffering custom offering

Signed-off-by: Abhishek Kumar <abhishek.mrt22@gmail.com>
---
 .../cloudstack/veeam/adapter/ServerAdapter.java     | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/plugins/integrations/veeam-control-service/src/main/java/org/apache/cloudstack/veeam/adapter/ServerAdapter.java b/plugins/integrations/veeam-control-service/src/main/java/org/apache/cloudstack/veeam/adapter/ServerAdapter.java
index ae5eb6e0717..bc59d50a43a 100644
--- a/plugins/integrations/veeam-control-service/src/main/java/org/apache/cloudstack/veeam/adapter/ServerAdapter.java
+++ b/plugins/integrations/veeam-control-service/src/main/java/org/apache/cloudstack/veeam/adapter/ServerAdapter.java
@@ -670,7 +670,7 @@ public class ServerAdapter extends ManagerBase {
         }
     }
 
-    protected ServiceOffering getServiceOfferingFromRequest(com.cloud.dc.DataCenter zone, Account account,
+    protected ServiceOfferingVO getServiceOfferingFromRequest(com.cloud.dc.DataCenter zone, Account account,
                     String uuid, int cpu, int memory) {
         if (StringUtils.isBlank(uuid)) {
             return null;
@@ -712,7 +712,7 @@ public class ServerAdapter extends ManagerBase {
 
     protected ServiceOffering getServiceOfferingIdForVmCreation(com.cloud.dc.DataCenter zone, Account account,
                         String serviceOfferingUuid, int cpu, int memory) {
-        ServiceOffering offering = getServiceOfferingFromRequest(zone, account, serviceOfferingUuid, cpu, memory);
+        ServiceOfferingVO offering = getServiceOfferingFromRequest(zone, account, serviceOfferingUuid, cpu, memory);
         if (offering != null) {
             return offering;
         }
@@ -726,7 +726,12 @@ public class ServerAdapter extends ManagerBase {
             return null;
         }
         String uuid = offerings.getResponses().get(0).getId();
-        return serviceOfferingDao.findByUuid(uuid);
+        offering = serviceOfferingDao.findByUuid(uuid);
+        if (offering.isCustomized()) {
+            offering.setCpu(cpu);
+            offering.setRamSize(memory);
+        }
+        return offering;
     }
 
     protected VMTemplateVO getTemplateForInstanceCreation(String templateUuid) {
@@ -803,7 +808,7 @@ public class ServerAdapter extends ManagerBase {
         Map<String, String> instanceDetails = getDetailsForInstanceCreation(userdata, serviceOffering, details);
         if (MapUtils.isNotEmpty(instanceDetails)) {
             Map<Integer, Map<String, String>> map = new HashMap<>();
-            map.put(0, details);
+            map.put(0, instanceDetails);
             cmd.setDetails(map);
         }
         cmd.setBlankInstance(true);