Skip to content

Commit aba389e

Browse files
Locharla, SandeepLocharla, Sandeep
authored andcommitted
Add PrimaryStoragePool base code
1 parent 128787a commit aba389e

File tree

11 files changed

+21
-43
lines changed

11 files changed

+21
-43
lines changed

plugins/storage/volume/ontap/pom.xml

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
under the License.
1818
-->
1919
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
20-
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
20+
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
2121
<modelVersion>4.0.0</modelVersion>
2222
<artifactId>cloud-plugin-storage-volume-ontap</artifactId>
2323
<name>Apache CloudStack Plugin - Storage Volume ONTAP Provider</name>
@@ -29,6 +29,7 @@
2929
</parent>
3030
<properties>
3131
<spring-cloud.version>2021.0.7</spring-cloud.version>
32+
<spring-boot.version>2.7.10</spring-boot.version>
3233
<openfeign.version>11.0</openfeign.version>
3334
<json.version>20230227</json.version>
3435
<swagger-annotations.version>1.6.2</swagger-annotations.version>
@@ -86,6 +87,15 @@
8687
<artifactId>swagger-annotations</artifactId>
8788
<version>${swagger-annotations.version}</version>
8889
</dependency>
90+
<dependency>
91+
<groupId>org.springframework</groupId>
92+
<artifactId>spring-web</artifactId>
93+
</dependency>
94+
<dependency>
95+
<groupId>org.springframework.boot</groupId>
96+
<artifactId>spring-boot-starter</artifactId>
97+
<version>${spring-boot.version}</version>
98+
</dependency>
8999
</dependencies>
90100
<build>
91101
<plugins>

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

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -55,6 +55,4 @@ org.apache.cloudstack.storage.feign.model.response.JobResponseDTO updateVolumeRe
5555
@PathVariable("uuid") String uuid,
5656
@RequestBody org.apache.cloudstack.storage.feign.model.request.VolumeRequestDTO request
5757
);
58-
59-
6058
}

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@
3838
import org.apache.cloudstack.engine.subsystem.api.storage.PrimaryDataStoreParameters;
3939
import org.apache.cloudstack.engine.subsystem.api.storage.ZoneScope;
4040
import org.apache.cloudstack.storage.datastore.lifecycle.BasePrimaryDataStoreLifeCycleImpl;
41-
import org.apache.cloudstack.storage.ontap.StorageProviderManager;
41+
import org.apache.cloudstack.storage.provider.StorageProviderManager;
4242
import org.apache.cloudstack.storage.volume.datastore.PrimaryDataStoreHelper;
4343
import org.apache.logging.log4j.LogManager;
4444
import org.apache.logging.log4j.Logger;

plugins/storage/volume/ontap/src/main/java/org/apache/cloudstack/storage/ontap/clients/OntapFeignClient.java

Lines changed: 0 additions & 15 deletions
This file was deleted.

plugins/storage/volume/ontap/src/main/java/org/apache/cloudstack/storage/ontap/models/CreateVolumeRequest.java

Lines changed: 0 additions & 7 deletions
This file was deleted.

plugins/storage/volume/ontap/src/main/java/org/apache/cloudstack/storage/ontap/models/CreateVolumeResponse.java

Lines changed: 0 additions & 7 deletions
This file was deleted.

plugins/storage/volume/ontap/src/main/java/org/apache/cloudstack/storage/ontap/StorageProviderManager.java renamed to plugins/storage/volume/ontap/src/main/java/org/apache/cloudstack/storage/provider/StorageProviderManager.java

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,9 @@
1-
package org.apache.cloudstack.storage.ontap;
1+
package org.apache.cloudstack.storage.provider;
22

3-
import org.apache.cloudstack.storage.lifecycle.OntapPrimaryDatastoreLifecycle;
4-
import org.apache.cloudstack.storage.strategy.NASStrategy;
5-
import org.apache.cloudstack.storage.strategy.SANStrategy;
6-
import org.apache.cloudstack.storage.strategy.UnifiedNASStrategy;
7-
import org.apache.cloudstack.storage.strategy.UnifiedSANStrategy;
3+
import org.apache.cloudstack.storage.service.NASStrategy;
4+
import org.apache.cloudstack.storage.service.SANStrategy;
5+
import org.apache.cloudstack.storage.service.UnifiedNASStrategy;
6+
import org.apache.cloudstack.storage.service.UnifiedSANStrategy;
87
import org.apache.logging.log4j.LogManager;
98
import org.apache.logging.log4j.Logger;
109

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package org.apache.cloudstack.storage.strategy;
1+
package org.apache.cloudstack.storage.service;
22

33
public interface NASStrategy {
44
String createExportPolicy(String svmName, String policyName);

plugins/storage/volume/ontap/src/main/java/org/apache/cloudstack/storage/strategy/SANStrategy.java renamed to plugins/storage/volume/ontap/src/main/java/org/apache/cloudstack/storage/service/SANStrategy.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package org.apache.cloudstack.storage.strategy;
1+
package org.apache.cloudstack.storage.service;
22

33
public interface SANStrategy {
44
String createLUN(String svmName, String volumeName, String lunName, long sizeBytes, String osType);

plugins/storage/volume/ontap/src/main/java/org/apache/cloudstack/storage/strategy/UnifiedNASStrategy.java renamed to 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
@@ -1,4 +1,4 @@
1-
package org.apache.cloudstack.storage.strategy;
1+
package org.apache.cloudstack.storage.service;
22

33
import java.util.Map;
44

0 commit comments

Comments
 (0)