From 81b184877bc7287d32cd85dc2059e06f3df94e97 Mon Sep 17 00:00:00 2001 From: Harikrishna Patnala Date: Mon, 28 Sep 2020 11:04:56 +0530 Subject: [PATCH] Added SesParse support which is an improved version of VMFSsparse virtual disk format --- .../java/com/cloud/hypervisor/vmware/mo/VmdkAdapterType.java | 2 ++ .../com/cloud/hypervisor/vmware/mo/VmdkFileDescriptor.java | 3 ++- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/vmware-base/src/main/java/com/cloud/hypervisor/vmware/mo/VmdkAdapterType.java b/vmware-base/src/main/java/com/cloud/hypervisor/vmware/mo/VmdkAdapterType.java index f602c46d795..ff0a7d30672 100644 --- a/vmware-base/src/main/java/com/cloud/hypervisor/vmware/mo/VmdkAdapterType.java +++ b/vmware-base/src/main/java/com/cloud/hypervisor/vmware/mo/VmdkAdapterType.java @@ -35,6 +35,8 @@ public enum VmdkAdapterType { } public static VmdkAdapterType getType(String vmdkAdapterType) { + if (vmdkAdapterType == null) + return VmdkAdapterType.none; if (vmdkAdapterType.equalsIgnoreCase("ide")) { return VmdkAdapterType.ide; } else if (vmdkAdapterType.equalsIgnoreCase("lsilogic")) { diff --git a/vmware-base/src/main/java/com/cloud/hypervisor/vmware/mo/VmdkFileDescriptor.java b/vmware-base/src/main/java/com/cloud/hypervisor/vmware/mo/VmdkFileDescriptor.java index 556efd7e7fa..7ede78f1d6f 100644 --- a/vmware-base/src/main/java/com/cloud/hypervisor/vmware/mo/VmdkFileDescriptor.java +++ b/vmware-base/src/main/java/com/cloud/hypervisor/vmware/mo/VmdkFileDescriptor.java @@ -31,6 +31,7 @@ public class VmdkFileDescriptor { private static final Logger s_logger = Logger.getLogger(VmdkFileDescriptor.class); private static final String VMDK_PROPERTY_CREATE_TYPE = "createType"; private static final String VMDK_CREATE_TYPE_VMFSSPARSE = "vmfsSparse"; + private static final String VMDK_CREATE_TYPE_SESPARSE = "SEsparse"; private static final String VMDK_PROPERTY_ADAPTER_TYPE = "ddb.adapterType"; private Properties _properties = new Properties(); @@ -89,7 +90,7 @@ public class VmdkFileDescriptor { public boolean isVmfsSparseFile() { String vmdkCreateType = _properties.getProperty(VMDK_PROPERTY_CREATE_TYPE); - if (vmdkCreateType.equalsIgnoreCase(VMDK_CREATE_TYPE_VMFSSPARSE)) { + if (vmdkCreateType.equalsIgnoreCase(VMDK_CREATE_TYPE_VMFSSPARSE) || vmdkCreateType.equalsIgnoreCase(VMDK_CREATE_TYPE_SESPARSE)) { return true; } return false;