fix(vm-service): proxmox创建虚拟机没有集群失败

CloudExplorer-Dev · Aug 2, 2023 · 979313e · 979313e
1 parent e88e6b1
commit 979313e
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/...ces/vm-service/backend/src/main/java/com/fit2cloud/provider/impl/proxmox/api/SyncApi.java b/...ces/vm-service/backend/src/main/java/com/fit2cloud/provider/impl/proxmox/api/SyncApi.java
@@ -157,7 +157,7 @@ public static F2CVirtualMachine getF2CVirtualMachineById(PveClient client, Strin
         Cluster cluster = getCluster(client);
         ClusterNode clusterNode = getClusterNode(client, node);
         List<NetworkInterface> network = getNetwork(client, node, vmId);
-        return MappingUtil.toF2CVirtualMachine(qemu, qemuConfig, cluster.getName(), clusterNode, network);
+        return MappingUtil.toF2CVirtualMachine(qemu, qemuConfig, Objects.isNull(cluster) ? null : cluster.getName(), clusterNode, network);
 
     }
 

diff --git a/...m-service/backend/src/main/java/com/fit2cloud/provider/impl/proxmox/util/MappingUtil.java b/...m-service/backend/src/main/java/com/fit2cloud/provider/impl/proxmox/util/MappingUtil.java
@@ -65,7 +65,8 @@ public static F2CVirtualMachine toF2CVirtualMachine(Qemu qemu,
         f2CVirtualMachine.setMemory((int) Math.ceil(qemu.getMaxmem() / 1024.f / 1024 / 1024));
         f2CVirtualMachine.setCpu(qemu.getCpus());
         f2CVirtualMachine.setCluster(cluster);
-        f2CVirtualMachine.setHost(cluster);
+        f2CVirtualMachine.setHost(clusterNode.getName());
+        f2CVirtualMachine.setZone(clusterNode.getName());
         f2CVirtualMachine.setHostname(qemu.getName());
         f2CVirtualMachine.setMemoryUsed((int) Math.ceil(qemu.getMem() / 1024.0 / 1024 / 1024));
         f2CVirtualMachine.setInstanceStatus(getF2CInstanceStatus(qemu.getStatus()).name());
@@ -74,7 +75,6 @@ public static F2CVirtualMachine toF2CVirtualMachine(Qemu qemu,
         f2CVirtualMachine.setName(qemu.getName());
         f2CVirtualMachine.setInstanceType(getInstanceType(f2CVirtualMachine.getCpu(), f2CVirtualMachine.getMemory()));
         f2CVirtualMachine.setInstanceTypeDescription(getInstanceType(f2CVirtualMachine.getCpu(), f2CVirtualMachine.getMemory()));
-        f2CVirtualMachine.setZone(clusterNode.getName());
         f2CVirtualMachine.setOsInfo(StringUtil.isEmpty(config.getOsType()) ? "Other" : OsType.osType.getOrDefault(config.getOsType(), "Other"));
         if (CollectionUtils.isNotEmpty(networkInterfaces)) {
             List<String> ipArray = networkInterfaces