Tal Nisan has uploaded a new change for review. Change subject: core: Filter import block storage domains by LUN id ......................................................................
core: Filter import block storage domains by LUN id Patch Id82e5e1d3df8ce265833efb3fc4b9050ca73b679 introduced filtering and blocking import of an existing block domain by its PV id. The hosted engine setup only populates the LUN id of the hosted engine disk thus the filtering was changed to be based on the LUN id Change-Id: Ic1082319e68e8c5a42f8f177e13d662829753f8c Bug-Url: https://bugzilla.redhat.com/1157243 Signed-off-by: Tal Nisan <[email protected]> --- M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/AddExistingBlockStorageDomainCommand.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/GetUnregisteredBlockStorageDomainsQuery.java M backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/Entities.java 3 files changed, 6 insertions(+), 14 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/98/36498/1 diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/AddExistingBlockStorageDomainCommand.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/AddExistingBlockStorageDomainCommand.java index 439fad6..27c4100 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/AddExistingBlockStorageDomainCommand.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/AddExistingBlockStorageDomainCommand.java @@ -56,9 +56,9 @@ return failCanDoAction(VdcBllMessages.ACTION_TYPE_FAILED_STORAGE_DOMAIN_ALREADY_EXIST); } - List<LUNs> physicalVolumeIdsOnStorage = getLUNsFromVgInfo(getStorageDomain().getStorage()); - if (CollectionUtils.containsAny(Entities.getPhysicalVolumesFromLunsList(physicalVolumeIdsOnStorage), - Entities.getPhysicalVolumesFromLunsList(getDbFacade().getLunDao().getAll()))) { + List<LUNs> lunsOnStorage = getLUNsFromVgInfo(getStorageDomain().getStorage()); + if (CollectionUtils.containsAny(Entities.getIds(lunsOnStorage), + Entities.getIds(getDbFacade().getLunDao().getAll()))) { log.infoFormat("There are existing luns in the system which are part of VG id '{0}'", getStorageDomain().getStorage()); return failCanDoAction(VdcBllMessages.ACTION_TYPE_FAILED_IMPORT_STORAGE_DOMAIN_EXTERNAL_LUN_DISK_EXIST); diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/GetUnregisteredBlockStorageDomainsQuery.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/GetUnregisteredBlockStorageDomainsQuery.java index e525b19..9d501df 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/GetUnregisteredBlockStorageDomainsQuery.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/GetUnregisteredBlockStorageDomainsQuery.java @@ -209,7 +209,7 @@ List<StorageDomain> storageDomains = new ArrayList<>(); // Get existing PhysicalVolumes. - List<String> existingPhysicalVolumeIds = Entities.getPhysicalVolumesFromLunsList(getLunDAO().getAll()); + List<String> existingLunIds = Entities.getIds(getLunDAO().getAll()); for (String vgID : vgIDs) { VDSReturnValue returnValue = null; @@ -223,8 +223,8 @@ } ArrayList<LUNs> luns = (ArrayList<LUNs>) returnValue.getReturnValue(); - List<String> physicalVolumeIdsOnStorage = Entities.getPhysicalVolumesFromLunsList(luns); - if (CollectionUtils.containsAny(physicalVolumeIdsOnStorage, existingPhysicalVolumeIds)) { + List<String> lunIdsOnStorage = Entities.getIds(luns); + if (CollectionUtils.containsAny(lunIdsOnStorage, existingLunIds)) { log.infoFormat("There are existing luns in the system which are part of VG id '{0}'", vgID); continue; } diff --git a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/Entities.java b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/Entities.java index c4818d5..65e2796 100644 --- a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/Entities.java +++ b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/Entities.java @@ -62,14 +62,6 @@ } } - public static List<String> getPhysicalVolumesFromLunsList(List<LUNs> luns) { - List<String> physicalVolumeIds = new ArrayList<String>(); - for (LUNs lun : luns) { - physicalVolumeIds.add(lun.getphysical_volume_id()); - } - return physicalVolumeIds; - } - public static <E extends VmNetworkInterface> Map<String, E> vmInterfacesByNetworkName(List<E> entityList) { if (entityList != null) { Map<String, E> map = new HashMap<String, E>(); -- To view, visit http://gerrit.ovirt.org/36498 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ic1082319e68e8c5a42f8f177e13d662829753f8c Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: ovirt-engine-3.5 Gerrit-Owner: Tal Nisan <[email protected]> _______________________________________________ Engine-patches mailing list [email protected] http://lists.ovirt.org/mailman/listinfo/engine-patches
