Tal Nisan has uploaded a new change for review. Change subject: core: Remve storage type parameter in create storage pool VDS command ......................................................................
core: Remve storage type parameter in create storage pool VDS command As a part of the effort to remove the type of storage pool, the storage type parameter in create storage pool VDS command was removed as it's ignored anyway in VDSM so no need to set it, the method signature in the broker and VDSM will remain the same for legacy purposes Change-Id: Ia7efe3008fcdcbde4336ad026249b290b6b3eed5 Relates-To: https://bugzilla.redhat.com/1038053 Signed-off-by: Tal Nisan <[email protected]> --- M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/AddStoragePoolWithStoragesCommand.java M backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/vdscommands/CreateStoragePoolVDSCommandParameters.java M backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/CreateStoragePoolVDSCommand.java M backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/IVdsServer.java 4 files changed, 8 insertions(+), 20 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/93/23293/1 diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/AddStoragePoolWithStoragesCommand.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/AddStoragePoolWithStoragesCommand.java index 8f253be..5a16fe8 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/AddStoragePoolWithStoragesCommand.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/AddStoragePoolWithStoragesCommand.java @@ -156,7 +156,7 @@ boolean staticDomainChanged = false; StorageFormatType requiredFormatType = VersionStorageFormatUtil.getRequiredForVersion - (getStoragePool().getcompatibility_version(), getStoragePool().getStorageType()); + (getStoragePool().getcompatibility_version(), storageDomain.getStorageType()); if (staticDomain.getStorageFormat().compareTo(requiredFormatType) < 0) { if (!staticDomainChanged) { getCompensationContext().snapshotEntity(staticDomain); @@ -208,8 +208,8 @@ private VDSReturnValue addStoragePoolInIrs() { return runVdsCommand(VDSCommandType.CreateStoragePool, - new CreateStoragePoolVDSCommandParameters(getVds().getId(), getStoragePool() - .getStorageType(), getStoragePool().getId(), getStoragePool().getName(), + new CreateStoragePoolVDSCommandParameters(getVds().getId(), getStoragePool().getId(), + getStoragePool().getName(), masterStorageDomain.getId(), getParameters().getStorages(), getStoragePool() .getmaster_domain_version())); } diff --git a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/vdscommands/CreateStoragePoolVDSCommandParameters.java b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/vdscommands/CreateStoragePoolVDSCommandParameters.java index 7dced81..e6748e2 100644 --- a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/vdscommands/CreateStoragePoolVDSCommandParameters.java +++ b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/vdscommands/CreateStoragePoolVDSCommandParameters.java @@ -2,7 +2,6 @@ import java.util.List; -import org.ovirt.engine.core.common.businessentities.StorageType; import org.ovirt.engine.core.compat.Guid; public class CreateStoragePoolVDSCommandParameters extends VdsIdVDSCommandParametersBase { @@ -14,16 +13,6 @@ private void setStoragePoolId(Guid value) { privateStoragePoolId = value; - } - - private StorageType privateStorageType; - - public StorageType getStorageType() { - return privateStorageType; - } - - private void setStorageType(StorageType value) { - privateStorageType = value; } private String privateStoragePoolName; @@ -66,11 +55,10 @@ privateMasterVersion = value; } - public CreateStoragePoolVDSCommandParameters(Guid vdsId, StorageType storageType, Guid storagePoolId, + public CreateStoragePoolVDSCommandParameters(Guid vdsId, Guid storagePoolId, String poolName, Guid masterDomainId, List<Guid> domainsIdList, int masterVersion) { super(vdsId); setStoragePoolId(storagePoolId); - setStorageType(storageType); setStoragePoolName(poolName); setMasterDomainId(masterDomainId); setDomainsIdList(domainsIdList); @@ -79,17 +67,15 @@ public CreateStoragePoolVDSCommandParameters() { privateStoragePoolId = Guid.Empty; - privateStorageType = StorageType.UNKNOWN; privateMasterDomainId = Guid.Empty; } @Override public String toString() { - return String.format("%s, storagePoolId=%s, storageType=%s, storagePoolName=%s, masterDomainId=%s, " + + return String.format("%s, storagePoolId=%s, storagePoolName=%s, masterDomainId=%s, " + "domainsIdList=%s, masterVersion=%s", super.toString(), getStoragePoolId(), - getStorageType(), getStoragePoolName(), getMasterDomainId(), getDomainsIdList(), diff --git a/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/CreateStoragePoolVDSCommand.java b/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/CreateStoragePoolVDSCommand.java index 2d82b3d..777f82d 100644 --- a/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/CreateStoragePoolVDSCommand.java +++ b/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/CreateStoragePoolVDSCommand.java @@ -20,7 +20,8 @@ ids[i] = guids[i].toString(); } - status = getBroker().createStoragePool(getParameters().getStorageType().getValue(), + //The first parameter, poolType parameter is ignored by VDSM and thus can be set to any arbitrary value + status = getBroker().createStoragePool(0, getParameters().getStoragePoolId().toString(), getParameters().getStoragePoolName(), getParameters().getMasterDomainId().toString(), ids, getParameters().getMasterVersion(), Config.<String> getValue(ConfigValues.LockPolicy), diff --git a/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/IVdsServer.java b/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/IVdsServer.java index 8fa530d..1adbc61 100644 --- a/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/IVdsServer.java +++ b/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/IVdsServer.java @@ -109,6 +109,7 @@ StatusOnlyReturnForXmlRpc disconnectStoragePool(String spUUID, int hostSpmId, String SCSIKey); + // The poolType parameter is ignored by VDSM StatusOnlyReturnForXmlRpc createStoragePool(int poolType, String spUUID, String poolName, String msdUUID, String[] domList, int masterVersion, String lockPolicy, int lockRenewalIntervalSec, int leaseTimeSec, int ioOpTimeoutSec, int leaseRetries); -- To view, visit http://gerrit.ovirt.org/23293 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ia7efe3008fcdcbde4336ad026249b290b6b3eed5 Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Tal Nisan <[email protected]> _______________________________________________ Engine-patches mailing list [email protected] http://lists.ovirt.org/mailman/listinfo/engine-patches
