----------------------------------------------------------- This is an automatically generated e-mail. To reply, visit: https://reviews.apache.org/r/11910/ -----------------------------------------------------------
(Updated June 20, 2013, 5:19 a.m.) Review request for cloudstack, Abhinandan Prateek and Nitin Mehta. Changes ------- Updated patch after resolving merge conflicts Description ------- CLOUDSTACK-2987 Ensure XStools to be there in template inorder to enable dynamic scaling of vm CLOUDSTACK-3042 - handle Scaling up of vm memory/CPU based on the presence of XS tools in the template This should also take care of updation of VM after XS tools are installed in the vm and set memory values accordingly to support dynamic scaling after stop start of VM This addresses bugs CLOUDSTACK-2987 and CLOUDSTACK-3042. Diffs (updated) ----- api/src/com/cloud/template/VirtualMachineTemplate.java cedc793 api/src/com/cloud/vm/VirtualMachine.java ce9add6 api/src/org/apache/cloudstack/api/ApiConstants.java 12e5097 api/src/org/apache/cloudstack/api/BaseUpdateTemplateOrIsoCmd.java 6fd9773 api/src/org/apache/cloudstack/api/command/user/iso/RegisterIsoCmd.java 284d553 api/src/org/apache/cloudstack/api/command/user/template/RegisterTemplateCmd.java c9da0c2 api/src/org/apache/cloudstack/api/command/user/vm/UpdateVMCmd.java 2860283 api/src/org/apache/cloudstack/api/response/TemplateResponse.java ed933ff api/src/org/apache/cloudstack/api/response/UserVmResponse.java 5b71ba2 core/src/com/cloud/agent/api/ScaleVmCommand.java b361485 engine/schema/src/com/cloud/storage/VMTemplateVO.java e643d75 engine/schema/src/com/cloud/vm/VMInstanceVO.java fbe03dc engine/storage/src/org/apache/cloudstack/storage/image/TemplateEntityImpl.java 4d162bb plugins/hypervisors/xen/src/com/cloud/hypervisor/XenServerGuru.java 8c38a69 plugins/hypervisors/xen/src/com/cloud/hypervisor/xen/resource/CitrixResourceBase.java 5e8283a plugins/hypervisors/xen/src/com/cloud/hypervisor/xen/resource/XenServer56FP1Resource.java 8e37809 server/src/com/cloud/api/ApiResponseHelper.java 7ffa30f server/src/com/cloud/api/query/dao/UserVmJoinDaoImpl.java f9877ab server/src/com/cloud/api/query/vo/UserVmJoinVO.java c97d71a server/src/com/cloud/hypervisor/HypervisorGuruBase.java 1ad9a1f server/src/com/cloud/server/ManagementServerImpl.java cfc8333 server/src/com/cloud/storage/TemplateProfile.java 0b55f1f server/src/com/cloud/template/TemplateAdapter.java 9a2d877 server/src/com/cloud/template/TemplateAdapterBase.java 0940d3e server/src/com/cloud/vm/UserVmManagerImpl.java e8ea024 server/src/com/cloud/vm/VirtualMachineManagerImpl.java 5814075 server/test/com/cloud/vm/VirtualMachineManagerImplTest.java 8715c9e setup/db/db/schema-410to420.sql c782234 Diff: https://reviews.apache.org/r/11910/diff/ Testing ------- Tested locally Thanks, Harikrishna Patnala