apache/cloudstack
1
0
Fork 0
mirror of https://github.com/apache/cloudstack.git synced 2025-10-26 08:42:29 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix importstorage policies to update deleted policies on vcenter

Browse Source
This commit is contained in:
Harikrishna Patnala 2020-07-07 01:20:15 +05:30
parent 18340e96b1
commit 778148ba16
2 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
plugins/hypervisors/vmware/src/main/java/com/cloud/hypervisor/vmware/manager/VmwareManagerImpl.java
View File

@ -1444,10 +1444,14 @@ public class VmwareManagerImpl extends ManagerBase implements VmwareManager, Vmw
List<VsphereStoragePolicyVO> allStoragePolicies = vsphereStoragePolicyDao.listAll(); List<VsphereStoragePolicyVO> allStoragePolicies = vsphereStoragePolicyDao.listAll();
List<PbmProfile> finalStorageProfiles = storageProfiles; List<PbmProfile> finalStorageProfiles = storageProfiles;
List<VsphereStoragePolicyVO> needToMarkRemoved = allStoragePolicies.stream() List<VsphereStoragePolicyVO> needToMarkRemoved = allStoragePolicies.stream()
.filter(existingPolicy -> finalStorageProfiles.stream() .filter(existingPolicy -> !finalStorageProfiles.stream()
.anyMatch(storageProfile -> !storageProfile.getProfileId().equals(existingPolicy.getPolicyId()))) .anyMatch(storageProfile -> storageProfile.getProfileId().getUniqueId().equals(existingPolicy.getPolicyId())))
.collect(Collectors.toList()); .collect(Collectors.toList());
for (VsphereStoragePolicyVO storagePolicy : needToMarkRemoved) {
vsphereStoragePolicyDao.remove(storagePolicy.getId());
}
List<VsphereStoragePolicyVO> storagePolicies = vsphereStoragePolicyDao.listAll(); List<VsphereStoragePolicyVO> storagePolicies = vsphereStoragePolicyDao.listAll();
return storagePolicies; return storagePolicies;
} }

2
vmware-base/src/main/java/com/cloud/hypervisor/vmware/mo/PbmProfileManagerMO.java
View File

@ -62,7 +62,7 @@ public class PbmProfileManagerMO extends BaseMO {
List<PbmProfile> profiles = _context.getPbmService().pbmRetrieveContent(_mor, profileIds); List<PbmProfile> profiles = _context.getPbmService().pbmRetrieveContent(_mor, profileIds);
List<PbmProfile> requirementCategoryProfiles = profiles.stream() List<PbmProfile> requirementCategoryProfiles = profiles.stream()
.filter(x -> ((PbmCapabilityProfile)x).getProfileCategory().equals(PbmProfileCategoryEnum.REQUIREMENT)) .filter(x -> ((PbmCapabilityProfile)x).getProfileCategory().equals(PbmProfileCategoryEnum.REQUIREMENT.toString()))
.collect(Collectors.toList()); .collect(Collectors.toList());
return requirementCategoryProfiles; return requirementCategoryProfiles;
} }