Skip to content

Bugfix/cstackex 188 #68

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

Merged
piyush5netapp merged 4 commits into from
Jul 2, 2026
Merged

Bugfix/cstackex 188 #68

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
d623db0
bugfix/CSTACKEX-188: fixed hypervisor for zone scope
Jun 29, 2026
193f72c
bugfix/CSTACKEX-188: fixed hypervisor validation check
Jun 29, 2026
697833c
bugfix/CSTACKEX-188: junit and hypervisor check
Jun 30, 2026
60d365a
bugfix/CSTACKEX-188: junit addition
Jul 1, 2026
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
9 changes: 8 additions & 1 deletion ...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 @@ -347,9 +347,16 @@ public boolean attachZone(DataStore dataStore, ZoneScope scope, Hypervisor.Hyper
logger.error("attachZone : Storage Pool not found for id: " + dataStore.getId());
throw new CloudRuntimeException("Storage Pool not found for id: " + dataStore.getId());
}
if (!Hypervisor.HypervisorType.KVM.equals(hypervisorType)){
logger.error("attachZone : ONTAP primary storage is supported only for KVM hypervisor");
throw new CloudRuntimeException("ONTAP primary storage is supported only for KVM hypervisor");
Comment thread
piyush5netapp marked this conversation as resolved.
}
storagePool.setHypervisor(hypervisorType);
storagePoolDao.update(storagePool.getId(),storagePool);
logger.debug("attachZone : Set Hypervisor type for storage pool {} to {}", storagePool.getName(), hypervisorType);

PrimaryDataStoreInfo primaryStore = (PrimaryDataStoreInfo)dataStore;
List<HostVO> hostsToConnect = _resourceMgr.getEligibleUpAndEnabledHostsInZoneForStorageConnection(dataStore, scope.getScopeId(), Hypervisor.HypervisorType.KVM);
List<HostVO> hostsToConnect = _resourceMgr.getEligibleUpAndEnabledHostsInZoneForStorageConnection(dataStore, scope.getScopeId(), hypervisorType);
logger.debug(String.format("In createPool. Attaching the pool to each of the hosts in %s.", hostsToConnect));

Map<String, String> details = storagePoolDetailsDao.listDetailsKeyPairs(primaryStore.getId());
Expand Down
62 changes: 57 additions & 5 deletions ...test/java/org/apache/cloudstack/storage/lifecycle/OntapPrimaryDatastoreLifecycleTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -344,17 +344,24 @@ public void testInitialize_clusterNotKVM() {
clusterVO.setHypervisorType("XenServer");
when(_clusterDao.findById(2L)).thenReturn(clusterVO);

HashMap<String, String> detailsMap = new HashMap<>();
detailsMap.put(OntapStorageConstants.USERNAME, "testUser");
detailsMap.put(OntapStorageConstants.PASSWORD, "testPassword");
detailsMap.put(OntapStorageConstants.STORAGE_IP, "10.10.10.10");
detailsMap.put(OntapStorageConstants.SVM_NAME, "vs0");
detailsMap.put(OntapStorageConstants.PROTOCOL, "NFS3");

Map<String, Object> dsInfos = new HashMap<>();
dsInfos.put("zoneId",1L);
dsInfos.put("podId",1L);
dsInfos.put("zoneId", 1L);
dsInfos.put("podId", 1L);
dsInfos.put("clusterId", 2L);
dsInfos.put("name", "testStoragePool");
dsInfos.put("providerName", "testProvider");
dsInfos.put("capacityBytes",200000L);
dsInfos.put("managed",true);
dsInfos.put("capacityBytes", 200000L);
dsInfos.put("managed", true);
dsInfos.put("tags", "testTag");
dsInfos.put("isTagARule", false);
dsInfos.put("details", new HashMap<String, String>());
dsInfos.put("details", detailsMap);

Exception ex = assertThrows(CloudRuntimeException.class, () -> {
try (MockedStatic<StorageProviderFactory> storageProviderFactory = Mockito.mockStatic(StorageProviderFactory.class)) {
Expand Down Expand Up @@ -802,4 +809,49 @@ public void testAttachZone_createAccessGroupCalled() throws Exception {
}
}

@Test
public void testAttachZone_nonKvmHypervisorThrowsException() {
// Non-KVM hypervisor type must be rejected before any further processing
Exception ex = assertThrows(CloudRuntimeException.class, () ->
ontapPrimaryDatastoreLifecycle.attachZone(
dataStore, zoneScope, Hypervisor.HypervisorType.VMware));

assertTrue(ex.getMessage().contains("ONTAP primary storage is supported only for KVM hypervisor"));
// update should never be reached
verify(storagePoolDao, times(0)).update(anyLong(), any(StoragePoolVO.class));
}

@Test
public void testAttachZone_nullHypervisorThrowsException() {
// null hypervisorType is not a valid case — only KVM is accepted
Exception ex = assertThrows(CloudRuntimeException.class, () ->
ontapPrimaryDatastoreLifecycle.attachZone(dataStore, zoneScope, null));

assertTrue(ex.getMessage().contains("ONTAP primary storage is supported only for KVM hypervisor"));
verify(storagePoolDao, times(0)).update(anyLong(), any(StoragePoolVO.class));
}

@Test
public void testAttachZone_kvmHypervisorSetsAndUpdatesPool() throws Exception {
// KVM hypervisorType should be set on the pool and persisted via storagePoolDao.update
when(zoneScope.getScopeId()).thenReturn(1L);
when(_resourceMgr.getEligibleUpAndEnabledHostsInZoneForStorageConnection(any(), eq(1L), eq(Hypervisor.HypervisorType.KVM)))
.thenReturn(mockHosts);
when(storagePoolDetailsDao.listDetailsKeyPairs(1L)).thenReturn(poolDetails);
when(_dataStoreHelper.attachZone(any(DataStore.class))).thenReturn(dataStore);

try (MockedStatic<OntapStorageUtils> utilityMock = Mockito.mockStatic(OntapStorageUtils.class)) {
utilityMock.when(() -> OntapStorageUtils.getStrategyByStoragePoolDetails(any()))
.thenReturn(storageStrategy);
when(storageStrategy.createAccessGroup(any(AccessGroup.class))).thenReturn(null);
when(_storageMgr.connectHostToSharedPool(any(HostVO.class), anyLong())).thenReturn(true);

boolean result = ontapPrimaryDatastoreLifecycle.attachZone(
dataStore, zoneScope, Hypervisor.HypervisorType.KVM);

assertTrue(result, "attachZone should succeed for KVM hypervisor");
verify(storagePoolDao, times(1)).update(eq(1L), any(StoragePoolVO.class));
}
}

}
Loading