CSTACKEX-35 Fix OStype

Author: Gupta, Surya

plugins/storage/volume/ontap/src/main/java/org/apache/cloudstack/storage/driver/OntapPrimaryDatastoreDriver.java

@@ -24,6 +24,7 @@
 import com.cloud.agent.api.to.DataTO;
 import com.cloud.exception.InvalidParameterValueException;
 import com.cloud.host.Host;
+import com.cloud.hypervisor.Hypervisor;
 import com.cloud.storage.Storage;
 import com.cloud.storage.StoragePool;
 import com.cloud.storage.Volume;
@@ -59,6 +60,9 @@
 import java.util.List;
 import java.util.Map;
 
+import static com.cloud.hypervisor.Hypervisor.HypervisorType.KVM;
+import static com.cloud.hypervisor.Hypervisor.HypervisorType.VMware;
+
 public class OntapPrimaryDatastoreDriver implements PrimaryDataStoreDriver {
 
     private static final Logger logger = (Logger)LogManager.getLogger(OntapPrimaryDatastoreDriver.class);
@@ -145,11 +149,22 @@ private String createCloudStackVolume(long storagePoolId, DataObject dataObject)
             String lunOrFileName = dataObject.getName();
             Long size = dataObject.getSize();
             String volName = storagePool.getName();
+            String hypervisorType = storagePool.getHypervisor().name();
+            String osType = null;
+            switch (hypervisorType) {
+                case Constants.KVM:
+                    osType = Lun.OsTypeEnum.LINUX.getValue();
+                    break;
+                default:
+                    String errMsg = "createCloudStackVolume : Unsupported hypervisor type " + hypervisorType + " for ONTAP storage";
+                    logger.error(errMsg);
+                    throw new CloudRuntimeException(errMsg);
+            }
 
             // Create LUN based on protocol
             if (ontapStorage.getProtocol().equals(Constants.ISCSI)) {
                 SANStrategy sanStrategy = StorageProviderFactory.getSANStrategy(ontapStorage);
-                Lun lun = sanStrategy.createLUN(svmName, volName, lunOrFileName, size , Lun.OsTypeEnum.LINUX.getValue());
+                Lun lun = sanStrategy.createLUN(svmName, volName, lunOrFileName, size , osType);
                 if(lun.getName() == null || lun.getName().isEmpty()) {
                     throw new CloudRuntimeException("createCloudStackVolume : LUN Name is invalid");
                 }

plugins/storage/volume/ontap/src/main/java/org/apache/cloudstack/storage/utils/Constants.java

@@ -52,5 +52,6 @@ public enum ProtocolType {
 
     public static final String VOLUME_PATH_PREFIX = "/vol/";
     public static final String PATH_SEPARATOR = "/";
+    public static final String KVM = "KVM";
     public static final String GET_JOB_BY_UUID = "/api/cluster/jobs";
 }