Skip to content

Commit f2cab8c

Browse files
Gupta, SuryaGupta, Surya
authored andcommitted
CSTACKEX-98 Fixed compilation issue
1 parent adcab71 commit f2cab8c

File tree

3 files changed

+12
-16
lines changed

3 files changed

+12
-16
lines changed

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

Lines changed: 10 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -38,21 +38,17 @@ public static StorageStrategy getStrategy(OntapStorage ontapStorage) {
3838
s_logger.info("Initializing StorageProviderFactory with protocol: " + protocol);
3939
switch (protocol) {
4040
case NFS3:
41-
if (!ontapStorage.getIsDisaggregated()) {
42-
UnifiedNASStrategy unifiedNASStrategy = new UnifiedNASStrategy(ontapStorage);
43-
ComponentContext.inject(unifiedNASStrategy);
44-
unifiedNASStrategy.setOntapStorage(ontapStorage);
45-
return unifiedNASStrategy;
46-
}
47-
throw new CloudRuntimeException("Unsupported configuration: Disaggregated ONTAP is not supported.");
41+
UnifiedNASStrategy unifiedNASStrategy = new UnifiedNASStrategy(ontapStorage);
42+
ComponentContext.inject(unifiedNASStrategy);
43+
unifiedNASStrategy.setOntapStorage(ontapStorage);
44+
return unifiedNASStrategy;
45+
//throw new CloudRuntimeException("Unsupported configuration: Disaggregated ONTAP is not supported.");
4846
case ISCSI:
49-
if (!ontapStorage.getIsDisaggregated()) {
50-
UnifiedSANStrategy unifiedSANStrategy = new UnifiedSANStrategy(ontapStorage);
51-
ComponentContext.inject(unifiedSANStrategy);
52-
unifiedSANStrategy.setOntapStorage(ontapStorage);
53-
return unifiedSANStrategy;
54-
}
55-
throw new CloudRuntimeException("Unsupported configuration: Disaggregated ONTAP is not supported.");
47+
UnifiedSANStrategy unifiedSANStrategy = new UnifiedSANStrategy(ontapStorage);
48+
ComponentContext.inject(unifiedSANStrategy);
49+
unifiedSANStrategy.setOntapStorage(ontapStorage);
50+
return unifiedSANStrategy;
51+
//throw new CloudRuntimeException("Unsupported configuration: Disaggregated ONTAP is not supported.");
5652
default:
5753
throw new CloudRuntimeException("Unsupported protocol: " + protocol);
5854
}

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@ public class UnifiedNASStrategy extends NASStrategy {
7272

7373
public UnifiedNASStrategy(OntapStorage ontapStorage) {
7474
super(ontapStorage);
75-
String baseURL = Constants.HTTPS + ontapStorage.getManagementLIF();
75+
String baseURL = Constants.HTTPS + ontapStorage.getStorageIP();
7676
this.feignClientFactory = new FeignClientFactory();
7777
this.nasFeignClient = feignClientFactory.createClient(NASFeignClient.class, baseURL);
7878
this.volumeFeignClient = feignClientFactory.createClient(VolumeFeignClient.class,baseURL );

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ public class UnifiedSANStrategy extends SANStrategy {
5252

5353
public UnifiedSANStrategy(OntapStorage ontapStorage) {
5454
super(ontapStorage);
55-
String baseURL = Constants.HTTPS + ontapStorage.getManagementLIF();
55+
String baseURL = Constants.HTTPS + ontapStorage.getStorageIP();
5656
// Initialize FeignClientFactory and create SAN client
5757
this.feignClientFactory = new FeignClientFactory();
5858
this.sanFeignClient = feignClientFactory.createClient(SANFeignClient.class, baseURL);

0 commit comments

Comments
 (0)