CLOUDSTACK-3358: create template from a volume/snapshot should also take input from User/Admin whether xstools / vmware tools installed in the VM

Harikrishna Patnala · nitinmeh · commit 03fac831800a · 2013-07-19T11:55:32.000+05:30
Signed off by : Nitin Mehta&lt;nitin.mehta@citrix.com&gt;
diff --git a/api/src/org/apache/cloudstack/api/command/user/template/CreateTemplateCmd.java b/api/src/org/apache/cloudstack/api/command/user/template/CreateTemplateCmd.java
@@ -102,6 +102,9 @@ public class CreateTemplateCmd extends BaseAsyncCreateCmd {
     @Parameter(name=ApiConstants.DETAILS, type=CommandType.MAP, description="Template details in key/value pairs.")
     protected Map details;
 
+    @Parameter(name = ApiConstants.IS_DYNAMICALLY_SCALABLE, type = CommandType.BOOLEAN, description = "true if template contains XS/VMWare tools inorder to support dynamic scaling of VM cpu/memory")
+    protected Boolean isDynamicallyScalable;
+
     // ///////////////////////////////////////////////////
     // ///////////////// Accessors ///////////////////////
     // ///////////////////////////////////////////////////
@@ -169,6 +172,10 @@ public Map getDetails() {
         return params;
     }
 
+    public boolean isDynamicallyScalable() {
+        return isDynamicallyScalable == null ? false : isDynamicallyScalable;
+    }
+
     // ///////////////////////////////////////////////////
     // ///////////// API Implementation///////////////////
     // ///////////////////////////////////////////////////
diff --git a/server/src/com/cloud/hypervisor/HypervisorGuruBase.java b/server/src/com/cloud/hypervisor/HypervisorGuruBase.java
@@ -120,7 +120,7 @@ protected <T extends VirtualMachine> VirtualMachineTO  toVirtualMachineTO(Virtua
             details.putAll(detailsInVm);
         }
         if (details.get(VirtualMachine.IsDynamicScalingEnabled) == null || details.get(VirtualMachine.IsDynamicScalingEnabled).isEmpty()) {
-            to. setEnableDynamicallyScaleVm(false);
+            to.setEnableDynamicallyScaleVm(false);
         } else {
             // check if XStools/VMWare tools are present in the VM and dynamic scaling feature is enabled (per zone/global)
             to.setEnableDynamicallyScaleVm(details.get(VirtualMachine.IsDynamicScalingEnabled).equals("true") && Boolean.parseBoolean(_configServer.getConfigValue(Config.EnableDynamicallyScaleVm.key(), Config.ConfigurationParameterScope.zone.toString(), vm.getDataCenterId())));
diff --git a/server/src/com/cloud/template/TemplateManagerImpl.java b/server/src/com/cloud/template/TemplateManagerImpl.java
@@ -1457,6 +1457,7 @@ public VMTemplateVO createPrivateTemplateRecord(CreateTemplateCmd cmd, Account t
         if (isPublic == null) {
             isPublic = Boolean.FALSE;
         }
+        boolean  isDynamicScalingEnabled = cmd.isDynamicallyScalable();
         // check whether template owner can create public templates
         boolean allowPublicUserTemplates = Boolean.parseBoolean(_configServer.getConfigValue(Config.AllowPublicUserTemplates.key(),
                 Config.ConfigurationParameterScope.account.toString(), templateOwner.getId()));
@@ -1497,6 +1498,7 @@ public VMTemplateVO createPrivateTemplateRecord(CreateTemplateCmd cmd, Account t
                 }
                 throw new CloudRuntimeException(msg);
             }
+
             hyperType = this._volumeDao.getHypervisorType(volumeId);
         } else { // create template from snapshot
             snapshot = _snapshotDao.findById(snapshotId);
@@ -1568,6 +1570,8 @@ public VMTemplateVO createPrivateTemplateRecord(CreateTemplateCmd cmd, Account t
         privateTemplate = new VMTemplateVO(nextTemplateId, uniqueName, name, ImageFormat.RAW, isPublic, featured, isExtractable, TemplateType.USER,
                 null, null, requiresHvmValue, bitsValue, templateOwner.getId(), null, description, passwordEnabledValue, guestOS.getId(), true,
                 hyperType, templateTag, cmd.getDetails());
+        privateTemplate.setDynamicallyScalable(isDynamicScalingEnabled);
+
         if (sourceTemplateId != null) {
             if (s_logger.isDebugEnabled()) {
                 s_logger.debug("This template is getting created from other template, setting source template Id to: " + sourceTemplateId);

Original file line number	Diff line number	Diff line change
`@@ -120,7 +120,7 @@ protected <T extends VirtualMachine> VirtualMachineTO toVirtualMachineTO(Virtua`
`120`	`120`	`details.putAll(detailsInVm);`
`121`	`121`	`}`
`122`	`122`	`if (details.get(VirtualMachine.IsDynamicScalingEnabled) == null \|\| details.get(VirtualMachine.IsDynamicScalingEnabled).isEmpty()) {`
`123`		`- to. setEnableDynamicallyScaleVm(false);`
	`123`	`+ to.setEnableDynamicallyScaleVm(false);`
`124`	`124`	`} else {`
`125`	`125`	`// check if XStools/VMWare tools are present in the VM and dynamic scaling feature is enabled (per zone/global)`
`126`	`126`	`to.setEnableDynamicallyScaleVm(details.get(VirtualMachine.IsDynamicScalingEnabled).equals("true") && Boolean.parseBoolean(_configServer.getConfigValue(Config.EnableDynamicallyScaleVm.key(), Config.ConfigurationParameterScope.zone.toString(), vm.getDataCenterId())));`