Export Policy and File operation changes NAS Storage pool creation

plugins/storage/volume/ontap/src/main/java/org/apache/cloudstack/storage/feign/client/SvmFeignClient.java

@@ -26,10 +26,9 @@
 import org.springframework.web.bind.annotation.RequestHeader;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RequestBody;
 
 import java.net.URI;
-import java.util.Map;
 
 @FeignClient(name = "SvmClient", url = "https://{clusterIP}/api/svm/svms", configuration = FeignConfiguration.class)
 public interface SvmFeignClient {
@@ -41,4 +40,7 @@ public interface SvmFeignClient {
     @RequestMapping(method = RequestMethod.GET, value = "/{uuid}")
     Svm getSvmByUUID(URI baseURL, @RequestHeader("Authorization") String header);
 
+    @RequestMapping(method = RequestMethod.PATCH)
+    void updateSVM(URI baseURL, @RequestHeader("Authorization") String header, @RequestBody Svm svm);
+
 }

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

@@ -67,6 +67,7 @@ public class OntapPrimaryDatastoreLifecycle extends BasePrimaryDataStoreLifeCycl
      */
     @Override
     public DataStore initialize(Map<String, Object> dsInfos) {
+        s_logger.info("initialize {}", dsInfos);
         if (dsInfos == null) {
             throw new CloudRuntimeException("Datastore info map is null, cannot create primary storage");
         }
@@ -149,7 +150,9 @@ public DataStore initialize(Map<String, Object> dsInfos) {
         } else {
             throw new CloudRuntimeException("ONTAP details validation failed, cannot create primary storage");
         }
+        String storagePath = url + ":/" + storagePoolName;
 
+        parameters.setPath(storagePath);
         parameters.setTags(tags);
         parameters.setIsTagARule(isTagARule);
         parameters.setDetails(details);

plugins/storage/volume/ontap/src/main/java/org/apache/cloudstack/storage/provider/StorageProviderFactory.java

@@ -30,36 +30,29 @@
 import org.apache.logging.log4j.Logger;
 import org.springframework.stereotype.Component;
 
-@Component
 public class StorageProviderFactory {
-    private final StorageStrategy storageStrategy;
     private static final Logger s_logger = (Logger) LogManager.getLogger(StorageProviderFactory.class);
 
-    private StorageProviderFactory(OntapStorage ontapStorage) {
+    private StorageProviderFactory() {}
+
+    public static StorageStrategy getStrategy(OntapStorage ontapStorage) {
         ProtocolType protocol = ontapStorage.getProtocol();
-        s_logger.info("Initializing StorageProviderFactory with protocol: " + protocol);
+        s_logger.info("Initializing StorageProviderFactory with protocol: {}", protocol);
         switch (protocol) {
             case NFS:
                 if(!ontapStorage.getIsDisaggregated()) {
-                    this.storageStrategy = new UnifiedNASStrategy(ontapStorage);
+                    return new UnifiedNASStrategy(ontapStorage);
                 } else {
                     throw new CloudRuntimeException("Unsupported configuration: Disaggregated ONTAP is not supported.");
                 }
-                break;
             case ISCSI:
                 if (!ontapStorage.getIsDisaggregated()) {
-                    this.storageStrategy = new UnifiedSANStrategy(ontapStorage);
+                   return new UnifiedSANStrategy(ontapStorage);
                 } else {
                     throw new CloudRuntimeException("Unsupported configuration: Disaggregated ONTAP is not supported.");
                 }
-                break;
             default:
-                this.storageStrategy = null;
-                throw new CloudRuntimeException("Unsupported protocol: " + protocol);
+                throw new CloudRuntimeException("Unsupported configuration: " + protocol);
         }
     }
-
-    public static StorageStrategy getStrategy(OntapStorage ontapStorage) {
-        return new StorageProviderFactory(ontapStorage).storageStrategy;
-    }
 }

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

@@ -27,6 +27,8 @@ public NASStrategy(OntapStorage ontapStorage) {
     }
 
     public abstract String createExportPolicy(String svmName, String policyName);
+    public abstract boolean deleteExportPolicy(String svmName, String policyName);
+    public abstract boolean exportPolicyExists(String svmName, String policyName);
     public abstract String addExportRule(String policyName, String clientMatch, String[] protocols, String[] roRule, String[] rwRule);
     public abstract String assignExportPolicyToVolume(String volumeUuid, String policyName);
     public abstract String enableNFS(String svmUuid);

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

@@ -55,7 +55,7 @@ public abstract class StorageStrategy {
     @Inject
     private JobFeignClient jobFeignClient;
 
-    private final OntapStorage storage;
+    protected final OntapStorage storage;
 
     private List<Aggregate> aggregates;