CSTACKEX-200: CG create must have SVM name and respective validations

Author: rajiv-jain-netapp

plugins/storage/volume/ontap/src/main/java/org/apache/cloudstack/storage/vmsnapshot/OntapVMSnapshotStrategy.java

@@ -708,7 +708,8 @@ void createVmSnapshotsViaTemporaryCg(VMSnapshot vmSnapshot, UserVm userVm,
         try {
             logger.info("takeVMSnapshot: [CG:Create] Creating temporary consistency group [{}] for VM [{}] over {} FlexVol(s)",
                     tempCgName, userVm.getInstanceName(), flexVolGroups.size());
-            tempCgUuid = createTemporaryConsistencyGroup(snapshotClient, storageStrategy, authHeader, tempCgName, flexVolGroups.keySet());
+            tempCgUuid = createTemporaryConsistencyGroup(snapshotClient, storageStrategy, authHeader, tempCgName,
+                    resolveConsistencyGroupSvmName(flexVolGroups), flexVolGroups.keySet());
 
             logger.info("takeVMSnapshot: [CG:Start] Starting phase-1 snapshot [{}] for temporary consistency group [{}]",
                     snapshotNameBase, tempCgUuid);
@@ -793,26 +794,55 @@ String buildTemporaryConsistencyGroupName(VMSnapshot vmSnapshot) {
                 "cg" + vmSnapshot.getId());
     }
 
+    /**
+     * ONTAP consistency groups are scoped to a single SVM. All participating FlexVols must belong to it.
+     */
+    String resolveConsistencyGroupSvmName(Map<String, FlexVolGroupInfo> flexVolGroups) {
+        String svmName = null;
+        for (FlexVolGroupInfo group : flexVolGroups.values()) {
+            String candidate = group.poolDetails.get(OntapStorageConstants.SVM_NAME);
+            if (candidate == null || candidate.trim().isEmpty()) {
+                throw new CloudRuntimeException("SVM name not found in pool details for pool [" + group.poolId + "]");
+            }
+            if (svmName == null) {
+                svmName = candidate;
+            } else if (!svmName.equals(candidate)) {
+                throw new CloudRuntimeException("ONTAP consistency groups require all VM volumes on the same SVM; found ["
+                        + svmName + "] and [" + candidate + "]");
+            }
+        }
+        return svmName;
+    }
+
     /**
      * Creates a temporary consistency group for the involved FlexVol UUIDs and returns its UUID.
      */
     String createTemporaryConsistencyGroup(SnapshotFeignClient client, StorageStrategy storageStrategy,
-                                           String authHeader, String cgName, Set<String> flexVolUuids) {
+                                           String authHeader, String cgName, String svmName,
+                                           Set<String> flexVolUuids) {
+        if (svmName == null || svmName.trim().isEmpty()) {
+            throw new CloudRuntimeException("SVM name is required to create ONTAP consistency group [" + cgName + "]");
+        }
+
         List<Map<String, Object>> volumeRefs = new ArrayList<>();
         for (String flexVolUuid : flexVolUuids) {
             Map<String, Object> volumeRef = new LinkedHashMap<>();
             volumeRef.put("uuid", flexVolUuid);
             volumeRefs.add(volumeRef);
         }
 
+        Map<String, Object> svmRef = new LinkedHashMap<>();
+        svmRef.put("name", svmName);
+
         Map<String, Object> payload = new LinkedHashMap<>();
         payload.put("name", cgName);
+        payload.put("svm", svmRef);
         payload.put("volumes", volumeRefs);
 
         JobResponse response = client.createConsistencyGroup(authHeader, payload);
         storageStrategy.pollJobIfPresent(response, "create temporary consistency group " + cgName);
 
-        String cgUuid = resolveConsistencyGroupUuidByName(client, authHeader, cgName);
+        String cgUuid = resolveConsistencyGroupUuidByName(client, authHeader, cgName, svmName);
         if (cgUuid == null || cgUuid.isEmpty()) {
             throw new CloudRuntimeException("Unable to resolve temporary consistency group UUID for [" + cgName + "]");
         }
@@ -852,11 +882,13 @@ void deleteTemporaryConsistencyGroup(SnapshotFeignClient client, StorageStrategy
     }
 
     /**
-     * Resolves consistency group UUID by name.
+     * Resolves consistency group UUID by name within the given SVM.
      */
-    String resolveConsistencyGroupUuidByName(SnapshotFeignClient client, String authHeader, String cgName) {
+    String resolveConsistencyGroupUuidByName(SnapshotFeignClient client, String authHeader,
+                                             String cgName, String svmName) {
         Map<String, Object> query = new HashMap<>();
         query.put("name", cgName);
+        query.put("svm.name", svmName);
         query.put("fields", "uuid,name");
         OntapResponse<Map<String, Object>> response = client.getConsistencyGroups(authHeader, query);
         if (response == null || response.getRecords() == null || response.getRecords().isEmpty()) {

plugins/storage/volume/ontap/src/test/java/org/apache/cloudstack/storage/vmsnapshot/OntapVMSnapshotStrategyTest.java

@@ -551,6 +551,44 @@ void testGroupVolumesByFlexVol_VolumeNotFound_ThrowsException() {
                 () -> strategy.groupVolumesByFlexVol(Collections.singletonList(volumeTO1)));
     }
 
+    @Test
+    void testCreateTemporaryConsistencyGroup_includesSvmName() {
+        SnapshotFeignClient client = mock(SnapshotFeignClient.class);
+        StorageStrategy storageStrategy = mock(StorageStrategy.class);
+        when(client.createConsistencyGroup(any(), any())).thenReturn(createJobResponse("job-cg-create"));
+        OntapResponse<Map<String, Object>> cgResponse = new OntapResponse<>();
+        Map<String, Object> cgRecord = new HashMap<>();
+        cgRecord.put("uuid", "cg-uuid-1");
+        cgResponse.setRecords(Collections.singletonList(cgRecord));
+        when(client.getConsistencyGroups(any(), any())).thenReturn(cgResponse);
+
+        String cgUuid = strategy.createTemporaryConsistencyGroup(client, storageStrategy, "auth",
+                "cg-name", "vs0", java.util.Set.of("flexvol-uuid-1", "flexvol-uuid-2"));
+
+        assertEquals("cg-uuid-1", cgUuid);
+        org.mockito.ArgumentCaptor<Map<String, Object>> payloadCaptor = org.mockito.ArgumentCaptor.forClass(Map.class);
+        verify(client).createConsistencyGroup(eq("auth"), payloadCaptor.capture());
+        Map<String, Object> payload = payloadCaptor.getValue();
+        assertEquals("cg-name", payload.get("name"));
+        @SuppressWarnings("unchecked")
+        Map<String, Object> svm = (Map<String, Object>) payload.get("svm");
+        assertEquals("vs0", svm.get("name"));
+    }
+
+    @Test
+    void testResolveConsistencyGroupSvmName_rejectsDifferentSvms() {
+        Map<String, OntapVMSnapshotStrategy.FlexVolGroupInfo> groups = new HashMap<>();
+        Map<String, String> poolDetails1 = new HashMap<>();
+        poolDetails1.put(OntapStorageConstants.SVM_NAME, "vs0");
+        groups.put("flexvol-uuid-1", new OntapVMSnapshotStrategy.FlexVolGroupInfo(poolDetails1, POOL_ID_1));
+
+        Map<String, String> poolDetails2 = new HashMap<>();
+        poolDetails2.put(OntapStorageConstants.SVM_NAME, "vs1");
+        groups.put("flexvol-uuid-2", new OntapVMSnapshotStrategy.FlexVolGroupInfo(poolDetails2, POOL_ID_2));
+
+        assertThrows(CloudRuntimeException.class, () -> strategy.resolveConsistencyGroupSvmName(groups));
+    }
+
     // ══════════════════════════════════════════════════════════════════════════
     // Tests: FlexVolSnapshotDetail parse/toString
     // ══════════════════════════════════════════════════════════════════════════