Save systemvm template details for cpvm, ssvm and vr's.

engine/orchestration/src/main/java/com/cloud/vm/VirtualMachineManagerImpl.java

@@ -1865,7 +1865,7 @@
                         final UserVmVO userVm = _userVmDao.findById(vm.getId());
                         _userVmDao.loadDetails(userVm);
                         userVm.setDetail(VmDetailConstants.PLATFORM, platform);
-                        _userVmDao.saveDetails(userVm);
+                        userVmDetailsDao.saveDetails(userVm);
                     }
                 }
 
@@ -2190,7 +2190,7 @@
                             final UserVmVO userVm = _userVmDao.findById(vm.getId());
                             _userVmDao.loadDetails(userVm);
                             userVm.setDetail(VmDetailConstants.PLATFORM, platform);
-                            _userVmDao.saveDetails(userVm);
+                            userVmDetailsDao.saveDetails(userVm);
                         }
                     }
                 }
@@ -3757,7 +3757,7 @@
         if (!userVm.details.containsKey(VmDetailConstants.HYPERVISOR_TOOLS_VERSION) || !userVm.details.get(VmDetailConstants.HYPERVISOR_TOOLS_VERSION).equals(pvdriver)) {
             userVm.setDetail(VmDetailConstants.HYPERVISOR_TOOLS_VERSION, pvdriver);
         }
-        _userVmDao.saveDetails(userVm);
+        userVmDetailsDao.saveDetails(userVm);
     }
 
     @Override

engine/schema/src/main/java/com/cloud/vm/dao/UserVmDao.java

@@ -87,10 +87,6 @@ void updateVM(long id, String displayName, boolean enable, Long osTypeId,
 
     void loadDetails(UserVmVO vm);
 
-    void saveDetails(UserVmVO vm);
-
-    void saveDetails(UserVmVO vm, List<String> hiddenDetails);
-
     List<Long> listPodIdsHavingVmsforAccount(long zoneId, long accountId);
 
     public Long countAllocatedVMsForAccount(long accountId, boolean runningVMsonly);

engine/schema/src/main/java/com/cloud/vm/dao/UserVmDaoImpl.java

@@ -57,7 +57,6 @@
 import com.cloud.utils.db.TransactionLegacy;
 import com.cloud.utils.exception.CloudRuntimeException;
 import com.cloud.vm.NicVO;
-import com.cloud.vm.UserVmDetailVO;
 import com.cloud.vm.UserVmVO;
 import com.cloud.vm.VirtualMachine;
 import com.cloud.vm.VirtualMachine.State;
@@ -431,29 +430,6 @@ public void loadDetails(UserVmVO vm) {
         }
     }
 
-    @Override
-    public void saveDetails(UserVmVO vm) {
-        saveDetails(vm, new ArrayList<String>());
-    }
-
-    @Override
-    public void saveDetails(UserVmVO vm, List<String> hiddenDetails) {
-        Map<String, String> detailsStr = vm.getDetails();
-        if (detailsStr == null) {
-            return;
-        }
-
-        final Map<String, Boolean> visibilityMap = _detailsDao.listDetailsVisibility(vm.getId());
-
-        List<UserVmDetailVO> details = new ArrayList<UserVmDetailVO>();
-        for (Map.Entry<String, String> entry : detailsStr.entrySet()) {
-            boolean display = !hiddenDetails.contains(entry.getKey()) && visibilityMap.getOrDefault(entry.getKey(), true);
-            details.add(new UserVmDetailVO(vm.getId(), entry.getKey(), entry.getValue(), display));
-        }
-
-        _detailsDao.saveDetails(details);
-    }
-
     @Override
     public List<Long> listPodIdsHavingVmsforAccount(long zoneId, long accountId) {
         TransactionLegacy txn = TransactionLegacy.currentTxn();

engine/schema/src/main/java/com/cloud/vm/dao/UserVmDetailsDao.java

@@ -20,6 +20,14 @@
 
 import com.cloud.utils.db.GenericDao;
 import com.cloud.vm.UserVmDetailVO;
+import com.cloud.vm.VMInstanceVO;
+
+import java.util.List;
 
 public interface UserVmDetailsDao extends GenericDao<UserVmDetailVO, Long>, ResourceDetailsDao<UserVmDetailVO> {
+
+    public void saveDetails(VMInstanceVO vm);
+
+    public void saveDetails(VMInstanceVO vm, List<String> hiddenDetails);
+
 }

engine/schema/src/main/java/com/cloud/vm/dao/UserVmDetailsDaoImpl.java

@@ -22,6 +22,11 @@
 import org.apache.cloudstack.resourcedetail.ResourceDetailsDaoBase;
 
 import com.cloud.vm.UserVmDetailVO;
+import com.cloud.vm.VMInstanceVO;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
 
 @Component
 public class UserVmDetailsDaoImpl extends ResourceDetailsDaoBase<UserVmDetailVO> implements UserVmDetailsDao {
@@ -31,4 +36,26 @@
         super.addDetail(new UserVmDetailVO(resourceId, key, value, display));
     }
 
+    @Override
+    public void saveDetails(VMInstanceVO vm) {
+        saveDetails(vm, new ArrayList<String>());
+    }
+
+    @Override
+    public void saveDetails(VMInstanceVO vm, List<String> hiddenDetails) {
+        Map<String, String> detailsStr = vm.getDetails();
+        if (detailsStr == null) {
+            return;
+        }
+
+        final Map<String, Boolean> visibilityMap = listDetailsVisibility(vm.getId());
+
+        List<UserVmDetailVO> details = new ArrayList<UserVmDetailVO>();
+        for (Map.Entry<String, String> entry : detailsStr.entrySet()) {
+            boolean display = !hiddenDetails.contains(entry.getKey()) && visibilityMap.getOrDefault(entry.getKey(), true);
+            details.add(new UserVmDetailVO(vm.getId(), entry.getKey(), entry.getValue(), display));
+        }
+
+        saveDetails(details);
+    }
 }

server/src/main/java/com/cloud/capacity/CapacityManagerImpl.java

@@ -757,7 +757,7 @@
                         UserVmVO userVM = _userVMDao.findById(vm.getId());
                         _userVMDao.loadDetails(userVM);
                         userVM.setDetail(VmDetailConstants.MESSAGE_RESERVED_CAPACITY_FREED_FLAG, "true");
-                        _userVMDao.saveDetails(userVM);
+                        _userVmDetailsDao.saveDetails(userVM);
                     }
                 }
             }
@@ -985,7 +985,7 @@
           _userVMDao.loadDetails(userVM);
           // free the message sent flag if it exists
           userVM.setDetail(VmDetailConstants.MESSAGE_RESERVED_CAPACITY_FREED_FLAG, "false");
-          _userVMDao.saveDetails(userVM);
+          _userVmDetailsDao.saveDetails(userVM);
       }
 
       return true;

server/src/main/java/com/cloud/consoleproxy/ConsoleProxyManagerImpl.java

@@ -230,6 +230,8 @@
     private CAManager caManager;
     @Inject
     private NetworkOrchestrationService networkMgr;
+    @Inject
+    private VMTemplateDao _templateDao;
 
     private ConsoleProxyListener consoleProxyListener;
 
@@ -685,6 +687,10 @@
         DataCenterVO dc = dataCenterDao.findById(dataCenterId);
         Account systemAcct = accountManager.getSystemAccount();
 
+        if (template != null) {
+            _templateDao.loadDetails(template);
+        }
+
         DataCenterDeployment plan = new DataCenterDeployment(dataCenterId);
 
         NetworkVO defaultNetwork = getDefaultNetworkForCreation(dc);
@@ -713,6 +719,8 @@
         proxy.setDynamicallyScalable(template.isDynamicallyScalable());
         proxy.setLimitCpuUse(serviceOffering.getLimitCpuUse());
         proxy = consoleProxyDao.persist(proxy);
+        proxy.setDetails(template.getDetails());
+        userVmDetailsDao.saveDetails(proxy);
         try {
             virtualMachineManager.allocate(name, template, serviceOffering, networks, plan, null);
         } catch (InsufficientCapacityException e) {

server/src/main/java/com/cloud/network/element/VirtualRouterElement.java

@@ -24,6 +24,7 @@
 
 import javax.inject.Inject;
 
+import com.cloud.vm.dao.UserVmDetailsDao;
 import org.apache.cloudstack.network.BgpPeer;
 import org.apache.commons.collections.CollectionUtils;
 import org.apache.commons.lang3.ObjectUtils;
@@ -176,6 +177,9 @@
     @Inject
     NetworkDetailsDao _networkDetailsDao;
 
+    @Inject
+    private UserVmDetailsDao userVmDetailsDao;
+
     @Inject
     protected RouterDeploymentDefinitionBuilder routerDeploymentDefinitionBuilder;
 
@@ -737,7 +741,7 @@
 
         _userVmDao.loadDetails(userVmVO);
         userVmVO.setDetail(VmDetailConstants.PASSWORD, password_encrypted);
-        _userVmDao.saveDetails(userVmVO);
+        userVmDetailsDao.saveDetails(userVmVO);
 
         userVmVO.setUpdateParameters(true);
         _userVmDao.update(userVmVO.getId(), userVmVO);

server/src/main/java/com/cloud/network/router/NetworkHelperImpl.java

@@ -30,6 +30,7 @@
 
 import com.cloud.network.vpc.dao.VpcDao;
 import com.cloud.utils.validation.ChecksumUtil;
+import com.cloud.vm.dao.UserVmDetailsDao;
 import org.apache.cloudstack.api.ApiConstants;
 import org.apache.cloudstack.context.CallContext;
 import org.apache.cloudstack.engine.orchestration.service.NetworkOrchestrationService;
@@ -176,6 +177,8 @@
     CapacityManager capacityMgr;
     @Inject
     VpcDao vpcDao;
+    @Inject
+    private UserVmDetailsDao userVmDetailsDao;
 
     protected final Map<HypervisorType, ConfigKey<String>> hypervisorsMap = new HashMap<>();
 
@@ -531,6 +534,8 @@
                     continue;
                 }
 
+                _templateDao.loadDetails(template);
+
                 final boolean offerHA = routerOffering.isOfferHA();
 
                 // routerDeploymentDefinition.getVpc().getId() ==> do not use
@@ -554,6 +559,9 @@
                 router.setLimitCpuUse(routerOffering.getLimitCpuUse());
                 router = _routerDao.persist(router);
 
+                router.setDetails(template.getDetails());
+                userVmDetailsDao.saveDetails(router);
+
                 reallocateRouterNetworks(routerDeploymentDefinition, router, template, null);
                 router = _routerDao.findById(router.getId());
             } catch (final InsufficientCapacityException ex) {

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

@@ -1087,7 +1087,7 @@
             _vmDao.loadDetails(userVm);
             userVm.setDetail(VmDetailConstants.SSH_PUBLIC_KEY, sshPublicKeys);
             userVm.setDetail(VmDetailConstants.SSH_KEY_PAIR_NAMES, keypairnames);
-            _vmDao.saveDetails(userVm);
+            userVmDetailsDao.saveDetails(userVm);
 
             if (vmInstance.getState() == State.Stopped) {
                 logger.debug("Vm " + vmInstance + " is stopped, not rebooting it as a part of SSH Key reset");
@@ -2910,7 +2910,7 @@
 
                 verifyVmLimits(vmInstance, details);
                 vmInstance.setDetails(details);
-                _vmDao.saveDetails(vmInstance);
+                userVmDetailsDao.saveDetails(vmInstance);
             }
             if (StringUtils.isNotBlank(extraConfig)) {
                 if (EnableAdditionalVmConfig.valueIn(accountId)) {
@@ -4710,7 +4710,7 @@
         if (customParameters.containsKey(VmDetailConstants.NAME_ON_HYPERVISOR)) {
             hiddenDetails.add(VmDetailConstants.NAME_ON_HYPERVISOR);
         }
-        _vmDao.saveDetails(vm, hiddenDetails);
+        userVmDetailsDao.saveDetails(vm, hiddenDetails);
         if (!isImport) {
             logger.debug("Allocating in the DB for vm");
             DataCenterDeployment plan = new DataCenterDeployment(zone.getId());
@@ -8510,7 +8510,7 @@
             }
 
             vm.setDetail(VmDetailConstants.ENCRYPTED_PASSWORD, encryptedPasswd);
-            _vmDao.saveDetails(vm);
+            userVmDetailsDao.saveDetails(vm);
         }
     }
 
@@ -8519,7 +8519,7 @@
         String existingVmRootDiskController = vm.getDetail(VmDetailConstants.ROOT_DISK_CONTROLLER);
         if (StringUtils.isEmpty(existingVmRootDiskController) && StringUtils.isNotEmpty(rootDiskController)) {
             vm.setDetail(VmDetailConstants.ROOT_DISK_CONTROLLER, rootDiskController);
-            _vmDao.saveDetails(vm);
+            userVmDetailsDao.saveDetails(vm);
             if (logger.isDebugEnabled()) {
                 logger.debug("Persisted device bus information rootDiskController=" + rootDiskController + " for vm: " + vm.getDisplayName());
             }

server/src/test/java/com/cloud/vm/UserVmManagerImplTest.java

@@ -471,14 +471,14 @@ private void prepareAndExecuteMethodDealingWithDetails(boolean cleanUpDetails, b
         Mockito.verify(userVmVoMock, Mockito.times(cleanUpDetails || isDetailsEmpty ? 0 : 1)).setDetails(details);
         Mockito.verify(userVmDetailsDao, Mockito.times(cleanUpDetails ? 1 : 0)).removeDetail(vmId, "existingdetail");
         Mockito.verify(userVmDetailsDao, Mockito.times(0)).removeDetail(vmId, "systemdetail");
-        Mockito.verify(userVmDao, Mockito.times(cleanUpDetails || isDetailsEmpty ? 0 : 1)).saveDetails(userVmVoMock);
+        Mockito.verify(userVmDetailsDao, Mockito.times(cleanUpDetails || isDetailsEmpty ? 0 : 1)).saveDetails(userVmVoMock);
         Mockito.verify(userVmManagerImpl, Mockito.times(0)).updateDisplayVmFlag(false, vmId, userVmVoMock);
     }
 
     private void configureDoNothingForDetailsMethod() {
         Mockito.lenient().doNothing().when(userVmManagerImpl).updateDisplayVmFlag(false, vmId, userVmVoMock);
         Mockito.doNothing().when(userVmDetailsDao).removeDetail(anyLong(), anyString());
-        Mockito.doNothing().when(userVmDao).saveDetails(userVmVoMock);
+        Mockito.doNothing().when(userVmDetailsDao).saveDetails(userVmVoMock);
     }
 
     @SuppressWarnings("unchecked")

server/src/test/java/com/cloud/vm/UserVmManagerTest.java

@@ -63,6 +63,7 @@
 import com.cloud.vm.VirtualMachine.State;
 import com.cloud.vm.dao.NicDao;
 import com.cloud.vm.dao.UserVmDao;
+import com.cloud.vm.dao.UserVmDetailsDao;
 import com.cloud.vm.dao.VMInstanceDao;
 import com.cloud.vm.snapshot.VMSnapshotVO;
 import com.cloud.vm.snapshot.dao.VMSnapshotDao;
@@ -145,6 +146,8 @@ public class UserVmManagerTest {
     @Mock
     private UserVmDao _vmDao;
     @Mock
+    private UserVmDetailsDao userVmDetailsDao;
+    @Mock
     private VMInstanceDao _vmInstanceDao;
     @Mock
     private VMTemplateDao _templateDao;
@@ -821,20 +824,20 @@ public void testApplyUserDataSuccessful() throws Exception {
     public void testPersistDeviceBusInfoWithNullController() {
         when(_vmMock.getDetail(any(String.class))).thenReturn(null);
         _userVmMgr.persistDeviceBusInfo(_vmMock, null);
-        verify(_vmDao, times(0)).saveDetails(any(UserVmVO.class));
+        verify(userVmDetailsDao, times(0)).saveDetails(any(UserVmVO.class));
     }
 
     @Test
     public void testPersistDeviceBusInfoWithEmptyController() {
         when(_vmMock.getDetail(any(String.class))).thenReturn("");
         _userVmMgr.persistDeviceBusInfo(_vmMock, "");
-        verify(_vmDao, times(0)).saveDetails(any(UserVmVO.class));
+        verify(userVmDetailsDao, times(0)).saveDetails(any(UserVmVO.class));
     }
 
     @Test
     public void testPersistDeviceBusInfo() {
         when(_vmMock.getDetail(any(String.class))).thenReturn(null);
         _userVmMgr.persistDeviceBusInfo(_vmMock, "lsilogic");
-        verify(_vmDao, times(1)).saveDetails(any(UserVmVO.class));
+        verify(userVmDetailsDao, times(1)).saveDetails(any(UserVmVO.class));
     }
 }

services/secondary-storage/controller/src/main/java/org/apache/cloudstack/secondarystorage/SecondaryStorageManagerImpl.java

@@ -659,6 +659,8 @@
             throw new CloudRuntimeException(String.format("Unable to find the system templates or it was not downloaded in %s.", dc.toString()));
         }
 
+        _templateDao.loadDetails(template);
+
         ServiceOfferingVO serviceOffering = _serviceOffering;
         if (serviceOffering == null) {
             serviceOffering = _offeringDao.findDefaultSystemOffering(ServiceOffering.ssvmDefaultOffUniqueName, ConfigurationManagerImpl.SystemVMUseLocalStorage.valueIn(dataCenterId));
@@ -669,6 +671,8 @@
         secStorageVm.setDynamicallyScalable(template.isDynamicallyScalable());
         secStorageVm.setLimitCpuUse(serviceOffering.getLimitCpuUse());
         secStorageVm = _secStorageVmDao.persist(secStorageVm);
+        secStorageVm.setDetails(template.getDetails());
+        _vmDetailsDao.saveDetails(secStorageVm);
         try {
             _itMgr.allocate(name, template, serviceOffering, networks, plan, null);
             secStorageVm = _secStorageVmDao.findById(secStorageVm.getId());