Merge branch 'fix-25881@@2' into 'master'

[BugFix: ZSTACK-25881] nic hypervisortype is consistent with VM

See merge request zstackio/zstack!6122

Author: gitlab

compute/src/main/java/org/zstack/compute/vm/VmAllocateNicFlow.java

@@ -126,7 +126,8 @@ public void run(MessageReply reply) {
                         nic.setVmInstanceUuid(spec.getVmInventory().getUuid());
                         nic.setL3NetworkUuid(areply.getIpInventory().getL3NetworkUuid());
                         nic.setMac(mac);
-                        nic.setHypervisorType(spec.getDestHost().getHypervisorType());
+                        nic.setHypervisorType(spec.getDestHost() == null ?
+                                spec.getVmInventory().getHypervisorType() : spec.getDestHost().getHypervisorType());
                         if (mo.checkDuplicateMac(nic.getHypervisorType(), nic.getMac())) {
                             trigger.fail(operr("Duplicate mac address [%s]", nic.getMac()));
                             return;