managedNFS 5

Author: Srivastava, Piyush

plugins/storage/volume/ontap/src/main/java/org/apache/cloudstack/storage/lifecycle/OntapPrimaryDatastoreLifecycle.java

@@ -226,26 +226,25 @@ public DataStore initialize(Map<String, Object> dsInfos) {
 
         StorageStrategy storageStrategy = StorageProviderFactory.getStrategy(ontapStorage);
         boolean isValid = storageStrategy.connect();
-        if (isValid) {
-            long volumeSize = Long.parseLong(details.get(Constants.SIZE));
-            s_logger.info("Creating ONTAP volume '" + storagePoolName + "' with size: " + volumeSize + " bytes (" +
-                    (volumeSize / (1024 * 1024 * 1024)) + " GB)");
-            try {
-                Volume volume = storageStrategy.createStorageVolume(storagePoolName, volumeSize);
-                if (volume == null) {
-                    s_logger.error("createStorageVolume returned null for volume: " + storagePoolName);
-                    throw new CloudRuntimeException("Failed to create ONTAP volume: " + storagePoolName);
-                }
-
-                s_logger.info("Volume object retrieved successfully. UUID: " + volume.getUuid() + ", Name: " + volume.getName());
-
-                details.putIfAbsent(Constants.VOLUME_UUID, volume.getUuid());
-                details.putIfAbsent(Constants.VOLUME_NAME, volume.getName());
-            } catch (Exception e) {
-                s_logger.error("Exception occurred while creating ONTAP volume: " + storagePoolName, e);
-                throw new CloudRuntimeException("Failed to create ONTAP volume: " + storagePoolName + ". Error: " + e.getMessage(), e);
-            }
-        } else {
+        if (!isValid) {
+//            long volumeSize = Long.parseLong(details.get(Constants.SIZE));
+//            s_logger.info("Creating ONTAP volume '" + storagePoolName + "' with size: " + volumeSize + " bytes (" +
+//                    (volumeSize / (1024 * 1024 * 1024)) + " GB)");
+//            try {
+//                Volume volume = storageStrategy.createStorageVolume(storagePoolName, volumeSize);
+//                if (volume == null) {
+//                    s_logger.error("createStorageVolume returned null for volume: " + storagePoolName);
+//                    throw new CloudRuntimeException("Failed to create ONTAP volume: " + storagePoolName);
+//                }
+//
+//                s_logger.info("Volume object retrieved successfully. UUID: " + volume.getUuid() + ", Name: " + volume.getName());
+//
+//                details.putIfAbsent(Constants.VOLUME_UUID, volume.getUuid());
+//                details.putIfAbsent(Constants.VOLUME_NAME, volume.getName());
+//            } catch (Exception e) {
+//                s_logger.error("Exception occurred while creating ONTAP volume: " + storagePoolName, e);
+//                throw new CloudRuntimeException("Failed to create ONTAP volume: " + storagePoolName + ". Error: " + e.getMessage(), e);
+//            }
             throw new CloudRuntimeException("ONTAP details validation failed, cannot create primary storage");
         }
 

plugins/storage/volume/ontap/src/main/java/org/apache/cloudstack/storage/service/UnifiedNASStrategy.java

@@ -116,26 +116,27 @@ CloudStackVolume getCloudStackVolume(CloudStackVolume cloudstackVolume) {
     @Override
     public AccessGroup createAccessGroup(AccessGroup accessGroup) {
 
-        Map<String, String> details = accessGroup.getPrimaryDataStoreInfo().getDetails();
-        String svmName = details.get(Constants.SVM_NAME);
-        String volumeUUID = details.get(Constants.VOLUME_UUID);
-        String volumeName = details.get(Constants.VOLUME_NAME);
-
-        // Create the export policy
-        ExportPolicy policyRequest = createExportPolicyRequest(accessGroup,svmName,volumeName);
-        try {
-            createExportPolicy(svmName, policyRequest);
-            s_logger.info("ExportPolicy created: {}, now attaching this policy to storage pool volume", policyRequest.getName());
-
-            // attach export policy to volume of storage pool
-            assignExportPolicyToVolume(volumeUUID,policyRequest.getName());
-            s_logger.info("Successfully assigned exportPolicy {} to volume {}", policyRequest.getName(), volumeName);
-            accessGroup.setPolicy(policyRequest);
-            return accessGroup;
-        }catch(Exception e){
-            s_logger.error("Exception occurred while creating access group: " +  e);
-            throw new CloudRuntimeException("Failed to create access group: " + e);
-        }
+//        Map<String, String> details = accessGroup.getPrimaryDataStoreInfo().getDetails();
+//        String svmName = details.get(Constants.SVM_NAME);
+//        String volumeUUID = details.get(Constants.VOLUME_UUID);
+//        String volumeName = details.get(Constants.VOLUME_NAME);
+//
+//        // Create the export policy
+//        ExportPolicy policyRequest = createExportPolicyRequest(accessGroup,svmName,volumeName);
+//        try {
+//            createExportPolicy(svmName, policyRequest);
+//            s_logger.info("ExportPolicy created: {}, now attaching this policy to storage pool volume", policyRequest.getName());
+//
+//            // attach export policy to volume of storage pool
+//            assignExportPolicyToVolume(volumeUUID,policyRequest.getName());
+//            s_logger.info("Successfully assigned exportPolicy {} to volume {}", policyRequest.getName(), volumeName);
+//            accessGroup.setPolicy(policyRequest);
+//            return accessGroup;
+//        }catch(Exception e){
+//            s_logger.error("Exception occurred while creating access group: " +  e);
+//            throw new CloudRuntimeException("Failed to create access group: " + e);
+//        }
+        return null;
     }
 
     @Override
@@ -379,7 +380,7 @@ private ExportPolicy createExportPolicyRequest(AccessGroup accessGroup,String sv
             String ip = (hostStorageIp != null && !hostStorageIp.isEmpty())
                     ? hostStorageIp
                     : host.getPrivateIpAddress();
-            String ipToUse = ip + "/32";
+            String ipToUse = ip + "/31";
             ExportRule.ExportClient exportClient = new ExportRule.ExportClient();
             exportClient.setMatch(ipToUse);
             exportClients.add(exportClient);