Roy Golan has uploaded a new change for review. Change subject: core: Allow importing hosted engine storage domain ......................................................................
core: Allow importing hosted engine storage domain Allow importing the special storage domain of the hosted engine VM. Change-Id: I79b3f1227ef99a778654dc83fc4530f602085d80 Bug-Url: https://bugzilla.redhat.com/?????? Signed-off-by: Roy Golan <rgo...@redhat.com> --- 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/AddExistingFileStorageDomainCommand.java M backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/storage/AddExistingBlockStorageDomainCommandTest.java M backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/storage/AddExistingFileStorageDomainCommandTest.java 4 files changed, 2 insertions(+), 16 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/94/42294/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 1c46bbb..2a04022 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 @@ -7,7 +7,6 @@ import org.apache.commons.collections.CollectionUtils; import org.ovirt.engine.core.bll.LockMessagesMatchUtil; -import org.ovirt.engine.core.bll.validator.storage.StorageDomainValidator; import org.ovirt.engine.core.common.action.LockProperties; import org.ovirt.engine.core.common.action.StorageDomainManagementParameter; import org.ovirt.engine.core.common.businessentities.Entities; @@ -56,11 +55,6 @@ protected boolean canAddDomain() { if (getStorageDomainStaticDAO().get(getStorageDomain().getId()) != null) { return failCanDoAction(VdcBllMessages.ACTION_TYPE_FAILED_STORAGE_DOMAIN_ALREADY_EXIST); - } - - StorageDomainValidator validator = new StorageDomainValidator(getStorageDomain()); - if (!validate(validator.isHostedEngineStorage())) { - return false; } List<LUNs> lunsOnStorage = getLUNsFromVgInfo(getStorageDomain().getStorage()); 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 de3e7ee..b760670 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 @@ -2,7 +2,6 @@ import org.apache.commons.lang.StringUtils; import org.ovirt.engine.core.bll.Backend; -import org.ovirt.engine.core.bll.validator.storage.StorageDomainValidator; import org.ovirt.engine.core.common.action.StorageDomainManagementParameter; import org.ovirt.engine.core.common.action.StorageServerConnectionParametersBase; import org.ovirt.engine.core.common.action.VdcActionType; @@ -66,10 +65,6 @@ StorageDomain storageDomainFromIrs = new StorageDomain(); storageDomainFromIrs.setStorageStaticData(domainFromIrs.getFirst()); - StorageDomainValidator validator = new StorageDomainValidator(storageDomainFromIrs); - if (!validate(validator.isHostedEngineStorage())) { - return false; - } return concreteCheckExistingStorageDomain(domainFromIrs); } diff --git a/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/storage/AddExistingBlockStorageDomainCommandTest.java b/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/storage/AddExistingBlockStorageDomainCommandTest.java index 5ba22a9..b90baac 100644 --- a/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/storage/AddExistingBlockStorageDomainCommandTest.java +++ b/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/storage/AddExistingBlockStorageDomainCommandTest.java @@ -19,7 +19,6 @@ import org.junit.runner.RunWith; import org.mockito.Mock; import org.mockito.runners.MockitoJUnitRunner; -import org.ovirt.engine.core.bll.CanDoActionTestUtils; import org.ovirt.engine.core.common.action.StorageDomainManagementParameter; import org.ovirt.engine.core.common.businessentities.StorageDomainStatic; import org.ovirt.engine.core.common.businessentities.storage.LUNs; @@ -101,9 +100,7 @@ doReturn(new ArrayList<LUNs>()).when(command).getAllLuns(); parameters.getStorageDomain().setStorageName(StorageConstants.HOSTED_ENGINE_STORAGE_DOMAIN_NAME); - assertFalse(command.canAddDomain()); - CanDoActionTestUtils.assertCanDoActionMessages("Add self hosted engine storage domain succeeded where it should have failed", - command, VdcBllMessages.ACTION_TYPE_FAILED_HOSTED_ENGINE_STORAGE); + assertTrue(command.canAddDomain()); } private static StorageDomainStatic getStorageDomain() { diff --git a/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/storage/AddExistingFileStorageDomainCommandTest.java b/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/storage/AddExistingFileStorageDomainCommandTest.java index dbf531b..e60a98b 100644 --- a/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/storage/AddExistingFileStorageDomainCommandTest.java +++ b/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/storage/AddExistingFileStorageDomainCommandTest.java @@ -147,7 +147,7 @@ doReturn(new Pair<>(sdStatic, sdStatic.getId())).when(command).executeHSMGetStorageDomainInfo( any(HSMGetStorageDomainInfoVDSCommandParameters.class)); - CanDoActionTestUtils.runAndAssertCanDoActionFailure(command, VdcBllMessages.ACTION_TYPE_FAILED_HOSTED_ENGINE_STORAGE); + CanDoActionTestUtils.runAndAssertCanDoActionSuccess(command); } private static StorageDomainStatic getStorageDomain() { -- To view, visit https://gerrit.ovirt.org/42294 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I79b3f1227ef99a778654dc83fc4530f602085d80 Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Roy Golan <rgo...@redhat.com> _______________________________________________ Engine-patches mailing list Engine-patches@ovirt.org http://lists.ovirt.org/mailman/listinfo/engine-patches
