Federico Simoncelli has uploaded a new change for review. Change subject: core: add helper for getStoragePoolIsoMap ......................................................................
core: add helper for getStoragePoolIsoMap Change-Id: Iefa82eaf8ac6e2ad46a411183668901fd6215368 Signed-off-by: Federico Simoncelli <[email protected]> --- A backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/utils/StoragePoolDomainHelper.java M backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/ReconstructMasterVDSCommand.java 2 files changed, 31 insertions(+), 12 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/11/22711/1 diff --git a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/utils/StoragePoolDomainHelper.java b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/utils/StoragePoolDomainHelper.java new file mode 100644 index 0000000..6446dc1 --- /dev/null +++ b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/utils/StoragePoolDomainHelper.java @@ -0,0 +1,28 @@ +package org.ovirt.engine.core.common.utils; + +import java.util.HashMap; +import java.util.List; +import java.util.Map; + +import org.ovirt.engine.core.common.businessentities.StorageDomainStatus; +import org.ovirt.engine.core.common.businessentities.StoragePoolIsoMap; + + +public class StoragePoolDomainHelper { + + public static Map<String, String> getStoragePoolIsoMap(List<StoragePoolIsoMap> storagePoolIsoMaps) { + Map<String, String> storageDomains = new HashMap<String, String>(); + + for (StoragePoolIsoMap domain : storagePoolIsoMaps) { + if (domain.getStatus() == StorageDomainStatus.Maintenance) { + storageDomains.put(domain.getstorage_id().toString(), "attached"); + } else { + storageDomains.put(domain.getstorage_id().toString(), + StorageDomainStatus.Active.toString().toLowerCase()); + } + } + + return storageDomains; + } + +} diff --git a/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/ReconstructMasterVDSCommand.java b/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/ReconstructMasterVDSCommand.java index 5472b1b..e60d088 100644 --- a/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/ReconstructMasterVDSCommand.java +++ b/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/ReconstructMasterVDSCommand.java @@ -1,12 +1,10 @@ package org.ovirt.engine.core.vdsbroker.vdsbroker; -import java.util.HashMap; import java.util.Map; -import org.ovirt.engine.core.common.businessentities.StorageDomainStatus; -import org.ovirt.engine.core.common.businessentities.StoragePoolIsoMap; import org.ovirt.engine.core.common.config.Config; import org.ovirt.engine.core.common.config.ConfigValues; +import org.ovirt.engine.core.common.utils.StoragePoolDomainHelper; import org.ovirt.engine.core.common.vdscommands.ReconstructMasterVDSCommandParameters; public class ReconstructMasterVDSCommand<P extends ReconstructMasterVDSCommandParameters> extends VdsBrokerCommand<P> { @@ -16,15 +14,8 @@ @Override protected void executeVdsBrokerCommand() { - final Map<String, String> domains = new HashMap<String, String>(); - - for (StoragePoolIsoMap domain : getParameters().getDomainsList()) { - if (domain.getStatus() == StorageDomainStatus.Maintenance) { - domains.put(domain.getstorage_id().toString(), "attached"); - } else { - domains.put(domain.getstorage_id().toString(), StorageDomainStatus.Active.toString().toLowerCase()); - } - } + final Map<String, String> domains = + StoragePoolDomainHelper.getStoragePoolIsoMap(getParameters().getDomainsList()); status = getBroker().reconstructMaster(getParameters().getStoragePoolId().toString(), getParameters().getStoragePoolName(), -- To view, visit http://gerrit.ovirt.org/22711 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Iefa82eaf8ac6e2ad46a411183668901fd6215368 Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Federico Simoncelli <[email protected]> _______________________________________________ Engine-patches mailing list [email protected] http://lists.ovirt.org/mailman/listinfo/engine-patches
