From 894eef1210a728b18982c268461df43c962941b3 Mon Sep 17 00:00:00 2001 From: Abhishek Kumar Date: Mon, 16 Feb 2026 18:49:37 +0530 Subject: [PATCH] fix numbers in response Signed-off-by: Abhishek Kumar --- .../cloudstack/veeam/api/ApiService.java | 6 +++--- .../converter/ClusterVOToClusterConverter.java | 4 ++-- .../DataCenterJoinVOToDataCenterConverter.java | 4 ++-- .../converter/HostJoinVOToHostConverter.java | 8 +++++--- .../converter/UserVmJoinVOToVmConverter.java | 2 +- .../cloudstack/veeam/api/dto/Version.java | 18 +++++++++--------- 6 files changed, 22 insertions(+), 20 deletions(-) diff --git a/plugins/integrations/veeam-control-service/src/main/java/org/apache/cloudstack/veeam/api/ApiService.java b/plugins/integrations/veeam-control-service/src/main/java/org/apache/cloudstack/veeam/api/ApiService.java index fbe666882df..c9024633680 100644 --- a/plugins/integrations/veeam-control-service/src/main/java/org/apache/cloudstack/veeam/api/ApiService.java +++ b/plugins/integrations/veeam-control-service/src/main/java/org/apache/cloudstack/veeam/api/ApiService.java @@ -105,9 +105,9 @@ public class ApiService extends ManagerBase implements RouteHandler { Version version = new Version(); version.setBuild("8"); version.setFullVersion("4.5.8-0.master.fake.el9"); - version.setMajor(4); - version.setMinor(5); - version.setRevision(0); + version.setMajor("4"); + version.setMinor("5"); + version.setRevision("0"); productInfo.version = version; api.setProductInfo(productInfo); diff --git a/plugins/integrations/veeam-control-service/src/main/java/org/apache/cloudstack/veeam/api/converter/ClusterVOToClusterConverter.java b/plugins/integrations/veeam-control-service/src/main/java/org/apache/cloudstack/veeam/api/converter/ClusterVOToClusterConverter.java index 44789f694bd..c6a43068562 100644 --- a/plugins/integrations/veeam-control-service/src/main/java/org/apache/cloudstack/veeam/api/converter/ClusterVOToClusterConverter.java +++ b/plugins/integrations/veeam-control-service/src/main/java/org/apache/cloudstack/veeam/api/converter/ClusterVOToClusterConverter.java @@ -76,8 +76,8 @@ public class ClusterVOToClusterConverter { // --- version (ovirt engine version; keep fixed unless you want to expose something else) final Version ver = new Version(); - ver.setMajor(4); - ver.setMinor(8); + ver.setMajor("4"); + ver.setMinor("8"); c.setVersion(ver); // --- ksm / memory policy (defaults) diff --git a/plugins/integrations/veeam-control-service/src/main/java/org/apache/cloudstack/veeam/api/converter/DataCenterJoinVOToDataCenterConverter.java b/plugins/integrations/veeam-control-service/src/main/java/org/apache/cloudstack/veeam/api/converter/DataCenterJoinVOToDataCenterConverter.java index 0cb160a7dd2..74f49aa1242 100644 --- a/plugins/integrations/veeam-control-service/src/main/java/org/apache/cloudstack/veeam/api/converter/DataCenterJoinVOToDataCenterConverter.java +++ b/plugins/integrations/veeam-control-service/src/main/java/org/apache/cloudstack/veeam/api/converter/DataCenterJoinVOToDataCenterConverter.java @@ -54,8 +54,8 @@ public class DataCenterJoinVOToDataCenterConverter { // ---- Versions (static but valid) ---- final Version v48 = new Version(); - v48.setMajor(4); - v48.setMinor(8); + v48.setMajor("4"); + v48.setMinor("8"); dc.setVersion(v48); dc.setSupportedVersions(new SupportedVersions(List.of(v48))); diff --git a/plugins/integrations/veeam-control-service/src/main/java/org/apache/cloudstack/veeam/api/converter/HostJoinVOToHostConverter.java b/plugins/integrations/veeam-control-service/src/main/java/org/apache/cloudstack/veeam/api/converter/HostJoinVOToHostConverter.java index d36e5ce7371..6f4acbd4550 100644 --- a/plugins/integrations/veeam-control-service/src/main/java/org/apache/cloudstack/veeam/api/converter/HostJoinVOToHostConverter.java +++ b/plugins/integrations/veeam-control-service/src/main/java/org/apache/cloudstack/veeam/api/converter/HostJoinVOToHostConverter.java @@ -66,13 +66,14 @@ public class HostJoinVOToHostConverter { // --- CPU --- final Cpu cpu = new Cpu(); - - + cpu.setSpeed(Math.toIntExact(vo.getSpeed())); final Topology topo = new Topology(vo.getCpuSockets(), vo.getCpus(), 1); + cpu.setTopology(topo); + h.setCpu(cpu); // --- Memory --- h.setMemory(String.valueOf(vo.getTotalMemory())); - h.setMaxSchedulingMemory(String.valueOf(vo.getTotalMemory())); + h.setMaxSchedulingMemory(String.valueOf(vo.getTotalMemory() - vo.getMemUsedCapacity())); // ToDo: check // --- OS / versions (optional placeholders) --- // If you want, you can set conservative defaults to match oVirt shape. @@ -83,6 +84,7 @@ public class HostJoinVOToHostConverter { h.setReinstallationRequired("false"); h.setUpdateAvailable("false"); + // --- links/actions --- // Start minimal (empty). Add actions only if Veeam tries to follow them. h.setActions(null); diff --git a/plugins/integrations/veeam-control-service/src/main/java/org/apache/cloudstack/veeam/api/converter/UserVmJoinVOToVmConverter.java b/plugins/integrations/veeam-control-service/src/main/java/org/apache/cloudstack/veeam/api/converter/UserVmJoinVOToVmConverter.java index c119ac07227..09e058a3eaa 100644 --- a/plugins/integrations/veeam-control-service/src/main/java/org/apache/cloudstack/veeam/api/converter/UserVmJoinVOToVmConverter.java +++ b/plugins/integrations/veeam-control-service/src/main/java/org/apache/cloudstack/veeam/api/converter/UserVmJoinVOToVmConverter.java @@ -167,7 +167,7 @@ public final class UserVmJoinVOToVmConverter { private static String mapStatus(final VirtualMachine.State state) { // CloudStack-ish states -> oVirt-ish up/down - if (Arrays.asList(VirtualMachine.State.Running, VirtualMachine.State.Starting, + if (Arrays.asList(VirtualMachine.State.Running, VirtualMachine.State.Migrating, VirtualMachine.State.Restoring).contains(state)) { return "up"; } diff --git a/plugins/integrations/veeam-control-service/src/main/java/org/apache/cloudstack/veeam/api/dto/Version.java b/plugins/integrations/veeam-control-service/src/main/java/org/apache/cloudstack/veeam/api/dto/Version.java index 4e779e7ff31..04ba3f99eda 100644 --- a/plugins/integrations/veeam-control-service/src/main/java/org/apache/cloudstack/veeam/api/dto/Version.java +++ b/plugins/integrations/veeam-control-service/src/main/java/org/apache/cloudstack/veeam/api/dto/Version.java @@ -24,9 +24,9 @@ public final class Version { private String build; private String fullVersion; - private Integer major; - private Integer minor; - private Integer revision; + private String major; + private String minor; + private String revision; public Version() {} @@ -46,27 +46,27 @@ public final class Version { this.fullVersion = fullVersion; } - public Integer getMajor() { + public String getMajor() { return major; } - public void setMajor(Integer major) { + public void setMajor(String major) { this.major = major; } - public Integer getMinor() { + public String getMinor() { return minor; } - public void setMinor(Integer minor) { + public void setMinor(String minor) { this.minor = minor; } - public Integer getRevision() { + public String getRevision() { return revision; } - public void setRevision(Integer revision) { + public void setRevision(String revision) { this.revision = revision; } }