Merge pull request #609 from jschoiRR/mold-main#2025

[Mold API] VM스냅샷 및 복구 시 details 정보 누락되는 이슈 관련 기능 개선

Author: jschoiRR

agent/src/main/java/com/cloud/agent/properties/AgentProperties.java

@@ -704,7 +704,7 @@ public class AgentProperties{
      * stopped VMs. Experimental, requires agent restart.
      * Default value: <code>false</code>
      */
-    public static final Property<Boolean> LIBVIRT_EVENTS_ENABLED = new Property<>("libvirt.events.enabled", false);
+    public static final Property<Boolean> LIBVIRT_EVENTS_ENABLED = new Property<>("libvirt.events.enabled", true);
 
     /**
      * Can only be used if developer = true. This property is used to define the local bridge name and private network name.<br>

server/src/main/java/com/cloud/vm/snapshot/VMSnapshotManagerImpl.java

@@ -118,7 +118,6 @@
 import com.cloud.vm.VirtualMachine;
 import com.cloud.vm.VirtualMachineManager;
 import com.cloud.vm.VirtualMachineProfile;
-import com.cloud.vm.VmDetailConstants;
 import com.cloud.vm.VmWork;
 import com.cloud.vm.VmWorkConstants;
 import com.cloud.vm.VmWorkJobHandler;
@@ -481,17 +480,12 @@ public VMSnapshot doInTransaction(TransactionStatus status) {
      * @param vmSnapshotId vm snapshot id
      */
     protected void addSupportForCustomServiceOffering(long vmId, long serviceOfferingId, long vmSnapshotId) {
-        ServiceOfferingVO serviceOfferingVO = _serviceOfferingDao.findById(serviceOfferingId);
-        if (serviceOfferingVO.isDynamic()) {
-            List<UserVmDetailVO> vmDetails = _userVmDetailsDao.listDetails(vmId);
-            List<VMSnapshotDetailsVO> vmSnapshotDetails = new ArrayList<VMSnapshotDetailsVO>();
-            for (UserVmDetailVO detail : vmDetails) {
-                if(detail.getName().equalsIgnoreCase(VmDetailConstants.CPU_NUMBER) || detail.getName().equalsIgnoreCase(VmDetailConstants.CPU_SPEED) || detail.getName().equalsIgnoreCase(VmDetailConstants.MEMORY)) {
-                    vmSnapshotDetails.add(new VMSnapshotDetailsVO(vmSnapshotId, detail.getName(), detail.getValue(), detail.isDisplay()));
-                }
-            }
-            _vmSnapshotDetailsDao.saveDetails(vmSnapshotDetails);
+        List<UserVmDetailVO> vmDetails = _userVmDetailsDao.listDetails(vmId);
+        List<VMSnapshotDetailsVO> vmSnapshotDetails = new ArrayList<VMSnapshotDetailsVO>();
+        for (UserVmDetailVO detail : vmDetails) {
+            vmSnapshotDetails.add(new VMSnapshotDetailsVO(vmSnapshotId, detail.getName(), detail.getValue(), detail.isDisplay()));
         }
+        _vmSnapshotDetailsDao.saveDetails(vmSnapshotDetails);
     }
 
     @Override

ui/src/config/section/network.js

@@ -131,10 +131,6 @@ export default {
           listView: true,
           popup: true,
           show: () => {
-            if (!store.getters.zones || store.getters.zones.length === 0) {
-              return false
-            }
-            // const AdvancedZones = store.getters.zones.filter(zone => zone.networktype === 'Advanced')
             const AdvancedZonesWithoutSG = store.getters.zones.filter(zone => zone.securitygroupsenabled === false)
             if (isAdmin() || (AdvancedZonesWithoutSG && AdvancedZonesWithoutSG.length > 0)) {
               return true