rebase from Apache/main to Netapp/main

Author: rajiv-jain-netapp

plugins/storage/volume/ontap/pom.xml

@@ -17,7 +17,6 @@
   under the License.
 -->
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
     <artifactId>cloud-plugin-storage-volume-ontap</artifactId>
@@ -52,9 +51,6 @@
             </dependency>
         </dependencies>
     </dependencyManagement>
-        <version>4.22.0.0-SNAPSHOT</version>
-        <relativePath>../../../pom.xml</relativePath>
-    </parent>
     <dependencies>
         <dependency>
             <groupId>org.apache.cloudstack</groupId>
@@ -85,10 +81,11 @@
             <groupId>org.apache.httpcomponents</groupId>
             <artifactId>httpclient</artifactId>
             <version>${httpclient.version}</version>
+        </dependency>
+        <dependency>
             <groupId>org.json</groupId>
             <artifactId>json</artifactId>
             <version>20230227</version>
-
         </dependency>
         <dependency>
             <groupId>org.apache.cloudstack</groupId>
@@ -172,13 +169,6 @@
                     <includes>
                         <include>**/*Test.java</include>
                     </includes>
-    </dependencies>
-    <build>
-        <plugins>
-            <plugin>
-                <artifactId>maven-surefire-plugin</artifactId>
-                <configuration>
-                    <skipTests>true</skipTests>
                 </configuration>
                 <executions>
                     <execution>

plugins/storage/volume/ontap/src/main/java/org/apache/cloudstack/storage/feign/model/ExportPolicy.java

@@ -101,3 +101,4 @@ public int hashCode() {
     return Objects.hash( id, name);
   }
 
+}

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

@@ -53,8 +53,7 @@ public static StorageStrategy getStrategyByStoragePoolDetails(Map<String, String
         String protocol = details.get(OntapStorageConstants.PROTOCOL);
         OntapStorage ontapStorage = new OntapStorage(details.get(OntapStorageConstants.USERNAME), details.get(OntapStorageConstants.PASSWORD),
                 details.get(OntapStorageConstants.MANAGEMENT_LIF), details.get(OntapStorageConstants.SVM_NAME), Long.parseLong(details.get(OntapStorageConstants.SIZE)),
-                ProtocolType.valueOf(protocol),
-                Boolean.parseBoolean(details.get(OntapStorageConstants.IS_DISAGGREGATED)));
+                ProtocolType.valueOf(protocol));
         StorageStrategy storageStrategy = StorageProviderFactory.getStrategy(ontapStorage);
         boolean isValid = storageStrategy.connect();
         if (isValid) {

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

@@ -20,6 +20,7 @@
 package org.apache.cloudstack.storage.service;
 
 import com.cloud.agent.api.Answer;
+import com.cloud.agent.api.to.DataTO;
 import com.cloud.host.HostVO;
 import com.cloud.storage.VolumeVO;
 import com.cloud.storage.dao.VolumeDao;
@@ -28,6 +29,7 @@
 import org.apache.cloudstack.engine.subsystem.api.storage.EndPointSelector;
 import org.apache.cloudstack.engine.subsystem.api.storage.VolumeInfo;
 import org.apache.cloudstack.storage.command.CreateObjectCommand;
+import org.apache.cloudstack.storage.command.DeleteCommand;
 import org.apache.cloudstack.storage.datastore.db.StoragePoolDetailsDao;
 import org.apache.cloudstack.storage.feign.client.JobFeignClient;
 import org.apache.cloudstack.storage.feign.client.NASFeignClient;
@@ -181,7 +183,8 @@ public void testCreateCloudStackVolume_Success() throws Exception {
         when(cloudStackVolume.getVolumeInfo()).thenReturn(volumeObject);
         when(volumeObject.getId()).thenReturn(100L);
         when(volumeObject.getUuid()).thenReturn("volume-uuid-123");
-        when(volumeDao.findById(100L)).thenReturn(volumeVO);
+        when(volumeObject.getTO()).thenReturn(mock(DataTO.class));
+        when(volumeDao.findById(anyLong())).thenReturn(volumeVO);
         when(volumeDao.update(anyLong(), any(VolumeVO.class))).thenReturn(true);
         when(epSelector.select(volumeObject)).thenReturn(endPoint);
         when(endPoint.sendMessage(any(CreateObjectCommand.class))).thenReturn(answer);
@@ -205,7 +208,8 @@ public void testCreateCloudStackVolume_VolumeNotFound() {
         when(cloudStackVolume.getDatastoreId()).thenReturn("1");
         when(cloudStackVolume.getVolumeInfo()).thenReturn(volumeObject);
         when(volumeObject.getId()).thenReturn(100L);
-        when(volumeDao.findById(100L)).thenReturn(null);
+        when(volumeObject.getTO()).thenReturn(mock(DataTO.class));
+        when(volumeDao.findById(anyLong())).thenReturn(null);
 
         assertThrows(CloudRuntimeException.class, () -> {
             strategy.createCloudStackVolume(cloudStackVolume);
@@ -225,7 +229,8 @@ public void testCreateCloudStackVolume_KVMHostFailed() {
         when(cloudStackVolume.getVolumeInfo()).thenReturn(volumeObject);
         when(volumeObject.getId()).thenReturn(100L);
         when(volumeObject.getUuid()).thenReturn("volume-uuid-123");
-        when(volumeDao.findById(100L)).thenReturn(volumeVO);
+        when(volumeObject.getTO()).thenReturn(mock(DataTO.class));
+        when(volumeDao.findById(anyLong())).thenReturn(volumeVO);
         when(volumeDao.update(anyLong(), any(VolumeVO.class))).thenReturn(true);
         when(epSelector.select(volumeObject)).thenReturn(endPoint);
         when(endPoint.sendMessage(any(CreateObjectCommand.class))).thenReturn(answer);
@@ -246,7 +251,8 @@ public void testCreateCloudStackVolume_NoEndpoint() {
         when(cloudStackVolume.getVolumeInfo()).thenReturn(volumeObject);
         when(volumeObject.getId()).thenReturn(100L);
         when(volumeObject.getUuid()).thenReturn("volume-uuid-123");
-        when(volumeDao.findById(100L)).thenReturn(volumeVO);
+        when(volumeObject.getTO()).thenReturn(mock(DataTO.class));
+        when(volumeDao.findById(anyLong())).thenReturn(volumeVO);
         when(volumeDao.update(anyLong(), any(VolumeVO.class))).thenReturn(true);
         when(epSelector.select(volumeObject)).thenReturn(null);
 
@@ -519,19 +525,19 @@ public void testDeleteCloudStackVolume_Success() throws Exception {
         CloudStackVolume cloudStackVolume = mock(CloudStackVolume.class);
         VolumeInfo volumeInfo = mock(VolumeInfo.class);
         EndPoint endpoint = mock(EndPoint.class);
-        Answer answer = mock(Answer.class);
+        Answer answer = new Answer(null, true, "Success");
 
         when(cloudStackVolume.getVolumeInfo()).thenReturn(volumeInfo);
+        when(volumeInfo.getTO()).thenReturn(mock(DataTO.class));
         when(epSelector.select(volumeInfo)).thenReturn(endpoint);
-        when(endpoint.sendMessage(any())).thenReturn(answer);
-        when(answer.getResult()).thenReturn(true);
+        when(endpoint.sendMessage(any(DeleteCommand.class))).thenReturn(answer);
 
         // Execute - should not throw exception
         strategy.deleteCloudStackVolume(cloudStackVolume);
 
         // Verify endpoint was selected and message sent
         verify(epSelector).select(volumeInfo);
-        verify(endpoint).sendMessage(any());
+        verify(endpoint).sendMessage(any(DeleteCommand.class));
     }
 
     // Test deleteCloudStackVolume - Endpoint Not Found
@@ -541,6 +547,7 @@ public void testDeleteCloudStackVolume_EndpointNotFound() {
         VolumeInfo volumeInfo = mock(VolumeInfo.class);
 
         when(cloudStackVolume.getVolumeInfo()).thenReturn(volumeInfo);
+        when(volumeInfo.getTO()).thenReturn(mock(DataTO.class));
         when(epSelector.select(volumeInfo)).thenReturn(null);
 
         assertThrows(CloudRuntimeException.class, () -> {
@@ -554,13 +561,12 @@ public void testDeleteCloudStackVolume_AnswerResultFalse() throws Exception {
         CloudStackVolume cloudStackVolume = mock(CloudStackVolume.class);
         VolumeInfo volumeInfo = mock(VolumeInfo.class);
         EndPoint endpoint = mock(EndPoint.class);
-        Answer answer = mock(Answer.class);
+        Answer answer = new Answer(null, false, "Failed to delete volume file");
 
         when(cloudStackVolume.getVolumeInfo()).thenReturn(volumeInfo);
+        when(volumeInfo.getTO()).thenReturn(mock(DataTO.class));
         when(epSelector.select(volumeInfo)).thenReturn(endpoint);
-        when(endpoint.sendMessage(any())).thenReturn(answer);
-        when(answer.getResult()).thenReturn(false);
-        when(answer.getDetails()).thenReturn("Failed to delete volume file");
+        when(endpoint.sendMessage(any(DeleteCommand.class))).thenReturn(answer);
 
         assertThrows(CloudRuntimeException.class, () -> {
             strategy.deleteCloudStackVolume(cloudStackVolume);
@@ -575,8 +581,9 @@ public void testDeleteCloudStackVolume_AnswerNull() throws Exception {
         EndPoint endpoint = mock(EndPoint.class);
 
         when(cloudStackVolume.getVolumeInfo()).thenReturn(volumeInfo);
+        when(volumeInfo.getTO()).thenReturn(mock(DataTO.class));
         when(epSelector.select(volumeInfo)).thenReturn(endpoint);
-        when(endpoint.sendMessage(any())).thenReturn(null);
+        when(endpoint.sendMessage(any(DeleteCommand.class))).thenReturn(null);
 
         assertThrows(CloudRuntimeException.class, () -> {
             strategy.deleteCloudStackVolume(cloudStackVolume);