Daniel Erez has uploaded a new change for review. Change subject: core: SyncLunsInfo when activating FC storage domain ......................................................................
core: SyncLunsInfo when activating FC storage domain * Invoke SyncLunsInfoForBlockStorageDomainCommand on FCPStorageHelper -> connectStorageToDomainByVdsId. * Renamed SyncLunsInfoForIscsiStorageDomainCommand to SyncLunsInfoForBlockStorageDomainCommand for defining its purpose accurately. Change-Id: I31f3e376120e7b30a74af8d1fc7e3ed5346411f8 Bug-Url: https://bugzilla.redhat.com/1066081 Signed-off-by: Daniel Erez <de...@redhat.com> --- M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/FCPStorageHelper.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/ISCSIStorageHelper.java R backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/SyncLunsInfoForBlockStorageDomainCommand.java M backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/storage/SyncLunsInfoForIscsiStorageDomainCommandTest.java M backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/action/VdcActionType.java 5 files changed, 14 insertions(+), 6 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/14/24714/1 diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/FCPStorageHelper.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/FCPStorageHelper.java index abc1e67..da85123 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/FCPStorageHelper.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/FCPStorageHelper.java @@ -1,5 +1,8 @@ package org.ovirt.engine.core.bll.storage; +import org.ovirt.engine.core.bll.Backend; +import org.ovirt.engine.core.common.action.StorageDomainParametersBase; +import org.ovirt.engine.core.common.action.VdcActionType; import org.ovirt.engine.core.common.businessentities.StorageDomainStatic; import org.ovirt.engine.core.common.businessentities.StorageDomain; import org.ovirt.engine.core.compat.Guid; @@ -13,6 +16,11 @@ @Override public boolean connectStorageToDomainByVdsId(StorageDomain storageDomain, Guid vdsId) { + // Synchronize LUN details comprising the storage domain with the DB + StorageDomainParametersBase parameters = new StorageDomainParametersBase(storageDomain.getId()); + parameters.setVdsId(vdsId); + Backend.getInstance().runInternalAction(VdcActionType.SyncLunsInfoForBlockStorageDomain, parameters); + return true; } diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/ISCSIStorageHelper.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/ISCSIStorageHelper.java index 4353eb2..fa435b9 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/ISCSIStorageHelper.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/ISCSIStorageHelper.java @@ -70,7 +70,7 @@ // Synchronize LUN details comprising the storage domain with the DB StorageDomainParametersBase parameters = new StorageDomainParametersBase(storageDomain.getId()); parameters.setVdsId(vdsId); - Backend.getInstance().runInternalAction(VdcActionType.SyncLunsInfoForIscsiStorageDomain, parameters); + Backend.getInstance().runInternalAction(VdcActionType.SyncLunsInfoForBlockStorageDomain, parameters); } } } diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/SyncLunsInfoForIscsiStorageDomainCommand.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/SyncLunsInfoForBlockStorageDomainCommand.java similarity index 97% rename from backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/SyncLunsInfoForIscsiStorageDomainCommand.java rename to backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/SyncLunsInfoForBlockStorageDomainCommand.java index 3ac623c..d8a7d64 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/SyncLunsInfoForIscsiStorageDomainCommand.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/SyncLunsInfoForBlockStorageDomainCommand.java @@ -20,9 +20,9 @@ */ @InternalCommandAttribute @NonTransactiveCommandAttribute(forceCompensation = true) -public class SyncLunsInfoForIscsiStorageDomainCommand<T extends StorageDomainParametersBase> extends StorageDomainCommandBase<T> { +public class SyncLunsInfoForBlockStorageDomainCommand<T extends StorageDomainParametersBase> extends StorageDomainCommandBase<T> { - public SyncLunsInfoForIscsiStorageDomainCommand(T parameters) { + public SyncLunsInfoForBlockStorageDomainCommand(T parameters) { super(parameters); setVdsId(parameters.getVdsId()); } diff --git a/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/storage/SyncLunsInfoForIscsiStorageDomainCommandTest.java b/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/storage/SyncLunsInfoForIscsiStorageDomainCommandTest.java index c3b367c..b940e2d 100644 --- a/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/storage/SyncLunsInfoForIscsiStorageDomainCommandTest.java +++ b/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/storage/SyncLunsInfoForIscsiStorageDomainCommandTest.java @@ -19,7 +19,7 @@ @RunWith(MockitoJUnitRunner.class) public class SyncLunsInfoForIscsiStorageDomainCommandTest { - private SyncLunsInfoForIscsiStorageDomainCommand<StorageDomainParametersBase> command; + private SyncLunsInfoForBlockStorageDomainCommand<StorageDomainParametersBase> command; private StorageDomainParametersBase parameters; @Before @@ -27,7 +27,7 @@ parameters = new StorageDomainParametersBase(Guid.newGuid()); parameters.setVdsId(Guid.newGuid()); - command = spy(new SyncLunsInfoForIscsiStorageDomainCommand<StorageDomainParametersBase>(parameters)); + command = spy(new SyncLunsInfoForBlockStorageDomainCommand<StorageDomainParametersBase>(parameters)); } @Test diff --git a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/action/VdcActionType.java b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/action/VdcActionType.java index ec15f33..d33e472 100644 --- a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/action/VdcActionType.java +++ b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/action/VdcActionType.java @@ -247,7 +247,7 @@ ExportRepoImage(1015, QuotaDependency.NONE), AttachStorageConnectionToStorageDomain(1016, ActionGroup.MANIPULATE_STORAGE_DOMAIN, QuotaDependency.NONE), DetachStorageConnectionFromStorageDomain(1017, ActionGroup.MANIPULATE_STORAGE_DOMAIN, QuotaDependency.NONE), - SyncLunsInfoForIscsiStorageDomain(1018, false, QuotaDependency.NONE), + SyncLunsInfoForBlockStorageDomain(1018, false, QuotaDependency.NONE), // Event Notification AddEventSubscription(1100, false, QuotaDependency.NONE), -- To view, visit http://gerrit.ovirt.org/24714 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I31f3e376120e7b30a74af8d1fc7e3ed5346411f8 Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Daniel Erez <de...@redhat.com> _______________________________________________ Engine-patches mailing list Engine-patches@ovirt.org http://lists.ovirt.org/mailman/listinfo/engine-patches
