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

Author: BartJM

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

@@ -29,6 +29,10 @@ public interface ConsoleProxyDao extends GenericDao<ConsoleProxyVO, Long> {
 
     public void update(long id, int activeSession, Date updateTime, byte[] sessionDetails);
 
+    public void saveDetails(ConsoleProxyVO vm);
+
+    public void saveDetails(ConsoleProxyVO vm, List<String> hiddenDetails);
+
     public List<ConsoleProxyVO> getProxyListInStates(long dataCenterId, State... states);
 
     public List<ConsoleProxyVO> getProxyListInStates(State... states);

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

@@ -22,6 +22,7 @@
 import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
+import java.util.Map;
 
 
 import org.springframework.stereotype.Component;
@@ -36,6 +37,9 @@
 import com.cloud.utils.db.UpdateBuilder;
 import com.cloud.vm.ConsoleProxyVO;
 import com.cloud.vm.VirtualMachine.State;
+import com.cloud.vm.UserVmDetailVO;
+
+import javax.inject.Inject;
 
 @Component
 public class ConsoleProxyDaoImpl extends GenericDaoBase<ConsoleProxyVO, Long> implements ConsoleProxyDao {
@@ -91,6 +95,9 @@ public class ConsoleProxyDaoImpl extends GenericDaoBase<ConsoleProxyVO, Long> im
 
     protected final Attribute _updateTimeAttr;
 
+    @Inject
+    protected UserVmDetailsDao _detailsDao;
+
     public ConsoleProxyDaoImpl() {
         DataCenterStatusSearch = createSearchBuilder();
         DataCenterStatusSearch.and("dc", DataCenterStatusSearch.entity().getDataCenterId(), SearchCriteria.Op.EQ);
@@ -331,4 +338,27 @@ public List<ConsoleProxyVO> listByLastHostId(long hostId) {
         sc.setParameters("state", State.Stopped);
         return listBy(sc);
     }
+
+    @Override
+    public void saveDetails(ConsoleProxyVO vm) {
+        saveDetails(vm, new ArrayList<String>());
+    }
+
+    @Override
+    public void saveDetails(ConsoleProxyVO 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);
+    }
 }

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

@@ -96,6 +96,11 @@ public interface DomainRouterDao extends GenericDao<DomainRouterVO, Long> {
      */
     public List<DomainRouterVO> listRunningByDomain(Long id);
 
+
+    public void saveDetails(DomainRouterVO vm);
+
+    public void saveDetails(DomainRouterVO vm, List<String> hiddenDetails);
+
     /**
      * gets the total count by role
      * @Param role Router role

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

@@ -18,6 +18,7 @@
 
 import java.util.ArrayList;
 import java.util.List;
+import java.util.Map;
 
 import javax.annotation.PostConstruct;
 import javax.inject.Inject;
@@ -48,6 +49,7 @@
 import com.cloud.utils.db.UpdateBuilder;
 import com.cloud.vm.DomainRouterVO;
 import com.cloud.vm.VirtualMachine.State;
+import com.cloud.vm.UserVmDetailVO;
 
 @Component
 @DB
@@ -71,6 +73,9 @@ public class DomainRouterDaoImpl extends GenericDaoBase<DomainRouterVO, Long> im
     NetworkOfferingDao _offDao;
     protected SearchBuilder<DomainRouterVO> VpcSearch;
 
+    @Inject
+    protected UserVmDetailsDao _detailsDao;
+
     public DomainRouterDaoImpl() {
     }
 
@@ -450,4 +455,27 @@ public List<DomainRouterVO> listIncludingRemovedByVpcId(long vpcId) {
         sc.setParameters("role", Role.VIRTUAL_ROUTER);
         return listIncludingRemovedBy(sc);
     }
+
+    @Override
+    public void saveDetails(DomainRouterVO vm) {
+        saveDetails(vm, new ArrayList<String>());
+    }
+
+    @Override
+    public void saveDetails(DomainRouterVO 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);
+    }
 }

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

@@ -25,6 +25,10 @@
 
 public interface SecondaryStorageVmDao extends GenericDao<SecondaryStorageVmVO, Long> {
 
+    public void saveDetails(SecondaryStorageVmVO vm);
+
+    public void saveDetails(SecondaryStorageVmVO vm, List<String> hiddenDetails);
+
     public List<SecondaryStorageVmVO> getSecStorageVmListInStates(SecondaryStorageVm.Role role, long dataCenterId, State... states);
 
     public List<SecondaryStorageVmVO> getSecStorageVmListInStates(SecondaryStorageVm.Role role, State... states);

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

@@ -21,6 +21,7 @@
 import java.sql.SQLException;
 import java.util.ArrayList;
 import java.util.List;
+import java.util.Map;
 
 
 import org.springframework.stereotype.Component;
@@ -34,6 +35,9 @@
 import com.cloud.vm.SecondaryStorageVm;
 import com.cloud.vm.SecondaryStorageVmVO;
 import com.cloud.vm.VirtualMachine.State;
+import com.cloud.vm.UserVmDetailVO;
+
+import javax.inject.Inject;
 
 @Component
 public class SecondaryStorageVmDaoImpl extends GenericDaoBase<SecondaryStorageVmVO, Long> implements SecondaryStorageVmDao {
@@ -49,6 +53,9 @@ public class SecondaryStorageVmDaoImpl extends GenericDaoBase<SecondaryStorageVm
 
     protected final Attribute _updateTimeAttr;
 
+    @Inject
+    protected UserVmDetailsDao _detailsDao;
+
     public SecondaryStorageVmDaoImpl() {
         DataCenterStatusSearch = createSearchBuilder();
         DataCenterStatusSearch.and("dc", DataCenterStatusSearch.entity().getDataCenterId(), SearchCriteria.Op.EQ);
@@ -266,4 +273,27 @@ public List<Long> listRunningSecStorageOrderByLoad(SecondaryStorageVm.Role role,
 
         return l;
     }
+
+    @Override
+    public void saveDetails(SecondaryStorageVmVO vm) {
+        saveDetails(vm, new ArrayList<String>());
+    }
+
+    @Override
+    public void saveDetails(SecondaryStorageVmVO 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);
+    }
 }

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

@@ -230,6 +230,8 @@ public class ConsoleProxyManagerImpl extends ManagerBase implements ConsoleProxy
     private CAManager caManager;
     @Inject
     private NetworkOrchestrationService networkMgr;
+    @Inject
+    private VMTemplateDao _templateDao;
 
     private ConsoleProxyListener consoleProxyListener;
 
@@ -685,6 +687,10 @@ protected Map<String, Object> createProxyInstance(long dataCenterId, VMTemplateV
         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 @@ protected Map<String, Object> createProxyInstance(long dataCenterId, VMTemplateV
         proxy.setDynamicallyScalable(template.isDynamicallyScalable());
         proxy.setLimitCpuUse(serviceOffering.getLimitCpuUse());
         proxy = consoleProxyDao.persist(proxy);
+        proxy.setDetails(template.getDetails());
+        consoleProxyDao.saveDetails(proxy);
         try {
             virtualMachineManager.allocate(name, template, serviceOffering, networks, plan, null);
         } catch (InsufficientCapacityException e) {

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

@@ -531,6 +531,8 @@ public DomainRouterVO deployRouter(final RouterDeploymentDefinition routerDeploy
                     continue;
                 }
 
+                _templateDao.loadDetails(template);
+
                 final boolean offerHA = routerOffering.isOfferHA();
 
                 // routerDeploymentDefinition.getVpc().getId() ==> do not use
@@ -554,6 +556,9 @@ public DomainRouterVO deployRouter(final RouterDeploymentDefinition routerDeploy
                 router.setLimitCpuUse(routerOffering.getLimitCpuUse());
                 router = _routerDao.persist(router);
 
+                router.setDetails(template.getDetails());
+                _routerDao.saveDetails(router);
+
                 reallocateRouterNetworks(routerDeploymentDefinition, router, template, null);
                 router = _routerDao.findById(router.getId());
             } catch (final InsufficientCapacityException ex) {

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

@@ -659,6 +659,8 @@ protected Map<String, Object> createSecStorageVmInstance(long dataCenterId, Seco
             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 @@ protected Map<String, Object> createSecStorageVmInstance(long dataCenterId, Seco
         secStorageVm.setDynamicallyScalable(template.isDynamicallyScalable());
         secStorageVm.setLimitCpuUse(serviceOffering.getLimitCpuUse());
         secStorageVm = _secStorageVmDao.persist(secStorageVm);
+        secStorageVm.setDetails(template.getDetails());
+        _secStorageVmDao.saveDetails(secStorageVm);
         try {
             _itMgr.allocate(name, template, serviceOffering, networks, plan, null);
             secStorageVm = _secStorageVmDao.findById(secStorageVm.getId());