Snapshot hardware version 49 (#25)

* Changes for testing

* Added worker vm version when creating a template from a volume

* Added datacenter/cluster compatibility when a worker VM doesn't have a VM hardware version

Author: Spaceman1984

plugins/hypervisors/vmware/src/com/cloud/storage/resource/VmwareStorageProcessor.java

@@ -772,9 +772,12 @@ private Ternary<String, Long, Long> createTemplateFromVolume(VirtualMachineMO vm
                 throw new Exception(msg);
             }
 
+            String hardwareVersion = String.valueOf(vmMo.getVirtualHardwareVersion());
+
             // 4 MB is the minimum requirement for VM memory in VMware
             Pair<VirtualMachineMO, String[]> cloneResult =
-                    vmMo.cloneFromCurrentSnapshot(workerVmName, 0, 4, volumeDeviceInfo.second(), VmwareHelper.getDiskDeviceDatastore(volumeDeviceInfo.first()), null);
+                    vmMo.cloneFromCurrentSnapshot(workerVmName, 0, 4, volumeDeviceInfo.second(), VmwareHelper.getDiskDeviceDatastore(volumeDeviceInfo.first()), hardwareVersion);
+
             clonedVm = cloneResult.first();
 
             clonedVm.exportVm(secondaryMountPoint + "/" + installPath, templateUniqueName, false, false);

vmware-base/src/com/cloud/hypervisor/vmware/mo/HypervisorHostHelper.java

@@ -1420,6 +1420,10 @@ public static VirtualMachineMO createWorkerVM(VmwareHypervisorHost hyperHost, Da
         vmConfig.setName(vmName);
         if (hardwareVersion != null){
             vmConfig.setVersion(("vmx-" + hardwareVersion));
+        } else {
+            ClusterMO clusterMo = new ClusterMO(hyperHost.getContext(), hyperHost.getHyperHostCluster());
+            DatacenterMO dataCenterMo = new DatacenterMO(hyperHost.getContext(), hyperHost.getHyperHostDatacenter());
+            setVMHardwareVersion(vmConfig, clusterMo, dataCenterMo);
         }
         vmConfig.setMemoryMB((long)4);
         vmConfig.setNumCPUs(1);