Skip to content

Export Policy and File operation changes NAS Storage pool creation #11

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
piyush5netapp wants to merge 2 commits into from
Closed

Export Policy and File operation changes NAS Storage pool creation #11

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b83ce23
Pilot commit for NAS support operations
Oct 27, 2025
0049858
commit for nfs storage pool creation
Nov 4, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 4 additions & 2 deletions ...volume/ontap/src/main/java/org/apache/cloudstack/storage/feign/client/SvmFeignClient.java
100644 → 100755
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand All @@ -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)
Copy link
Copy Markdown
Author

@piyush5netapp piyush5netapp Oct 27, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We can remove this as not required now.

void updateSVM(URI baseURL, @RequestHeader("Authorization") String header, @RequestBody Svm svm);

}
3 changes: 3 additions & 0 deletions ...src/main/java/org/apache/cloudstack/storage/lifecycle/OntapPrimaryDatastoreLifecycle.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,6 +67,7 @@ public class OntapPrimaryDatastoreLifecycle extends BasePrimaryDataStoreLifeCycl
*/
@Override
public DataStore initialize(Map<String, Object> dsInfos) {
s_logger.info("initialize {}", dsInfos);
Copy link
Copy Markdown
Author

@piyush5netapp piyush5netapp Oct 27, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

make it debug and make it meaningful.

if (dsInfos == null) {
throw new CloudRuntimeException("Datastore info map is null, cannot create primary storage");
}
Copy link
Copy Markdown
Author

@piyush5netapp piyush5netapp Oct 27, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Put the sample URL on which below code has been written.

Expand Down Expand Up @@ -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;
Copy link
Copy Markdown
Author

@piyush5netapp piyush5netapp Oct 27, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Put the comment for assuming it is for NFS and URL value.


parameters.setPath(storagePath);
parameters.setTags(tags);
parameters.setIsTagARule(isTagARule);
parameters.setDetails(details);
Expand Down
21 changes: 7 additions & 14 deletions ...me/ontap/src/main/java/org/apache/cloudstack/storage/provider/StorageProviderFactory.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}
}
2 changes: 2 additions & 0 deletions ...storage/volume/ontap/src/main/java/org/apache/cloudstack/storage/service/NASStrategy.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,8 @@ public NASStrategy(OntapStorage ontapStorage) {
}

public abstract String createExportPolicy(String svmName, String policyName);
Copy link
Copy Markdown
Author

@piyush5netapp piyush5netapp Oct 27, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Return the policy object

public abstract boolean deleteExportPolicy(String svmName, String policyName);
Copy link
Copy Markdown
Author

@piyush5netapp piyush5netapp Oct 27, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

make it void to pass back the exact error incase of failure

public abstract boolean exportPolicyExists(String svmName, String policyName);
Copy link
Copy Markdown
Author

@piyush5netapp piyush5netapp Oct 27, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We can have getExportPolicy method

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);
Copy link
Copy Markdown
Author

@piyush5netapp piyush5netapp Oct 27, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We don't need this method, SVM should be pre-configured with NFS enabled.

Expand Down
2 changes: 1 addition & 1 deletion ...age/volume/ontap/src/main/java/org/apache/cloudstack/storage/service/StorageStrategy.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ public abstract class StorageStrategy {
@Inject
private JobFeignClient jobFeignClient;

private final OntapStorage storage;
protected final OntapStorage storage;

private List<Aggregate> aggregates;

Expand Down
Loading
Loading