Sergey Gotliv has uploaded a new change for review. Change subject: engine: Remove unused method from AddExistingFileStorageDomainCommand ......................................................................
engine: Remove unused method from AddExistingFileStorageDomainCommand Change-Id: I21960f64d45c01a65978a44d5874b8c94dfb9420 Signed-off-by: Sergey Gotliv <[email protected]> --- M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/AddExistingFileStorageDomainCommand.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/AddStorageDomainCommand.java 2 files changed, 0 insertions(+), 26 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/23/21323/1 diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/AddExistingFileStorageDomainCommand.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/AddExistingFileStorageDomainCommand.java index d2a7947..a89c9a0 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/AddExistingFileStorageDomainCommand.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/AddExistingFileStorageDomainCommand.java @@ -57,26 +57,6 @@ setSucceeded(true); } - @Override - protected boolean concreteCheckExistingStorageDomain(Pair<StorageDomainStatic, SANState> domain) { - boolean returnValue = false; - StorageDomainStatic domainFromIrs = domain.getFirst(); - if (StringUtils.isEmpty(getStorageDomain().getStorageStaticData().getStorage()) - && StringUtils.isEmpty(domainFromIrs.getStorage()) && domainFromIrs.getConnection() != null - && getStorageDomain().getStorageStaticData().getConnection() != null) { - returnValue = (StringUtils.equals(domainFromIrs.getConnection().getconnection(), getStorageDomain() - .getStorageStaticData().getConnection().getconnection())); - } else if (!StringUtils.isEmpty(getStorageDomain().getStorageStaticData().getStorage()) - && !StringUtils.isEmpty(domainFromIrs.getStorage())) { - returnValue = (StringUtils.equals(domainFromIrs.getStorage(), getStorageDomain().getStorageStaticData() - .getStorage())); - } - if (!returnValue) { - addCanDoActionMessage(VdcBllMessages.ERROR_CANNOT_ADD_EXISTING_STORAGE_DOMAIN_CONNECTION_DATA_ILLEGAL); - } - return returnValue; - } - protected boolean checkExistingStorageDomain() { // prevent importing DATA domain if (getParameters().getStorageDomain().getStorageDomainType() == StorageDomainType.Data) { diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/AddStorageDomainCommand.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/AddStorageDomainCommand.java index 07a5434..479488b 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/AddStorageDomainCommand.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/AddStorageDomainCommand.java @@ -14,10 +14,8 @@ import org.ovirt.engine.core.common.AuditLogType; import org.ovirt.engine.core.common.VdcObjectType; import org.ovirt.engine.core.common.action.StorageDomainManagementParameter; -import org.ovirt.engine.core.common.businessentities.SANState; import org.ovirt.engine.core.common.businessentities.StorageDomain; import org.ovirt.engine.core.common.businessentities.StorageDomainDynamic; -import org.ovirt.engine.core.common.businessentities.StorageDomainStatic; import org.ovirt.engine.core.common.businessentities.StorageDomainType; import org.ovirt.engine.core.common.businessentities.StorageFormatType; import org.ovirt.engine.core.common.businessentities.StoragePool; @@ -214,10 +212,6 @@ return false; } - return true; - } - - protected boolean concreteCheckExistingStorageDomain(Pair<StorageDomainStatic, SANState> domainFromIrs) { return true; } -- To view, visit http://gerrit.ovirt.org/21323 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I21960f64d45c01a65978a44d5874b8c94dfb9420 Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Sergey Gotliv <[email protected]> _______________________________________________ Engine-patches mailing list [email protected] http://lists.ovirt.org/mailman/listinfo/engine-patches
