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

[Mold API] vm스냅샷 복원 시 detail 정보의 'kvmStorageSnapshot' 값 제거, nic 상태 up, down시 로직수정

Author: jschoiRR

server/src/main/java/com/cloud/vm/UserVmManagerImpl.java

@@ -9680,13 +9680,12 @@ public UserVm updateVmNicLinkState(UpdateVmNicLinkStateCmd cmd){
             throw new InvalidParameterValueException(nic + " is not a nic on  " + vmInstance);
         }
 
-        //make sure the VM is Running or Stopped
-        if ((vmInstance.getState() != State.Running)) {
-            throw new CloudRuntimeException("refusing to set default " + vmInstance + " is not Running");
-        }
         final NicProfile nicProfile = new NicProfile(nic, network, nic.getBroadcastUri(), nic.getIsolationUri(), _networkModel.getNetworkRate(network.getId(), vmInstance.getId()),
                 _networkModel.isSecurityGroupSupportedInNetwork(network), _networkModel.getNetworkTag(vmInstance.getHypervisorType(), network));
 
+        nic.setLinkState(cmd.getLinkState());
+        _nicDao.update(nicId, nic);
+
         if (vmInstance.getState() == State.Running) {
             VirtualMachineProfile vmProfile = new VirtualMachineProfileImpl(vmInstance);
             final HypervisorGuru hvGuru = _hvGuruMgr.getGuru(vmProfile.getVirtualMachine().getHypervisorType());
@@ -9695,9 +9694,6 @@ public UserVm updateVmNicLinkState(UpdateVmNicLinkStateCmd cmd){
             Long hostId = vmInstance.getHostId() != null ? vmInstance.getHostId() : vmInstance.getLastHostId();
             NicLinkStateCommand nlscmd = new NicLinkStateCommand(nicTO, vmInstance.getInstanceName(), cmd.getLinkState());
 
-            nic.setLinkState(cmd.getLinkState());
-            _nicDao.update(nicId, nic);
-
             try {
                 Answer answer = _agentMgr.send(hostId, nlscmd);
                 if (answer == null || !answer.getResult()) {

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

@@ -953,7 +953,9 @@ protected void revertUserVmDetailsFromVmSnapshot(UserVmVO userVm, VMSnapshotVO v
             List<VMSnapshotDetailsVO> vmSnapshotDetails = _vmSnapshotDetailsDao.listDetails(vmSnapshotVo.getId());
             List<UserVmDetailVO> userVmDetails = new ArrayList<UserVmDetailVO>();
             for (VMSnapshotDetailsVO detail : vmSnapshotDetails) {
-                userVmDetails.add(new UserVmDetailVO(userVm.getId(), detail.getName(), detail.getValue(), detail.isDisplay()));
+                if (!"kvmStorageSnapshot".equals(detail.getName())) {
+                    userVmDetails.add(new UserVmDetailVO(userVm.getId(), detail.getName(), detail.getValue(), detail.isDisplay()));
+                }
             }
             _userVmDetailsDao.saveDetails(userVmDetails);
         }

ui/src/components/widgets/WallLinkUrl.vue

@@ -63,14 +63,15 @@ export default {
         uri += wallPortalProtocol + '://' + wallPortalDomain + ':' + wallPortalPort
         if (this.scope === 'vm') {
           const vmUriPath = items.filter(x => x.name === 'monitoring.wall.portal.vm.uri')[0]?.value
-          this.uriInfo = uri + vmUriPath + '?kiosk&orgId=2&var-vm_uuid=' + this.resource.id
+          this.uriInfo = uri + vmUriPath + '?kiosk&orgId=2&theme=light&var-vm_uuid=' + this.resource.id
           this.uriCreateOk = true
         } else if (this.scope === 'host') {
           const hostUriPath = items.filter(x => x.name === 'monitoring.wall.portal.host.uri')[0]?.value
-          this.uriInfo = uri + hostUriPath + '?from=now-1h&to=now&var-host=' + this.resource.ipaddress
+          this.uriInfo = uri + hostUriPath + '?from=now-1h&to=now&theme=light&var-host=' + this.resource.ipaddress
           this.uriCreateOk = true
         } else if (this.scope === 'cluster') {
-          this.uriInfo = uri + items.filter(x => x.name === 'monitoring.wall.portal.cluster.uri')[0]?.value
+          const clusterUriPath = items.filter(x => x.name === 'monitoring.wall.portal.cluster.uri')[0]?.value
+          this.uriInfo = uri + clusterUriPath + '?theme=light'
           this.uriCreateOk = true
         }
       })

ui/src/views/plugins/IFrameWall.vue

@@ -52,10 +52,11 @@ export default {
         }
         var uri = wallPortalProtocol + '://' + wallPortalDomain + ':' + wallPortalPort
         if (typeof hypervisortype !== 'undefined' && hypervisortype !== null && hypervisortype !== '') {
-          this.uriInfo = uri + items.filter(x => x.name === 'monitoring.wall.portal.cluster.uri')[0]?.value
+          const clusterUriPath = items.filter(x => x.name === 'monitoring.wall.portal.cluster.uri')[0]?.value
+          this.uriInfo = uri + clusterUriPath + '?theme=light'
         } else {
           const hostUriPath = items.filter(x => x.name === 'monitoring.wall.portal.host.uri')[0]?.value
-          this.uriInfo = uri + hostUriPath + '?from=now-1h&to=now&var-host=' + this.resource.ipaddress
+          this.uriInfo = uri + hostUriPath + '?from=now-1h&to=now&theme=light&var-host=' + this.resource.ipaddress
         }
         this.uriCreateOk = true
       })