Ravi Nori has uploaded a new change for review. Change subject: tools: engine-config cleanup 2.2 SupportStorageFormat ......................................................................
tools: engine-config cleanup 2.2 SupportStorageFormat Remove deprecated config values for version 2.2 from engine-config Removed SupportStorageFormat key and the code surrounding the logic. Change-Id: I892af2405d55233e465f2d0da1cd4f0378076c88 Bug-Url: https://bugzilla.redhat.com/show_bug.cgi?id=859045 Signed-off-by: Ravi Nori <[email protected]> --- M backend/manager/dbscripts/upgrade/pre_upgrade/0000_config.sql M backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/storage/RemoveStorageDomainTest.java M backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/config/ConfigValues.java M backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/vdscommands/GetVGInfoVDSCommandParameters.java D backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/vdscommands/RemoveVGVDSCommandParameters.java M backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/vdscommands/VDSCommandType.java M backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/CreateStorageDomainVDSCommand.java M backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/IVdsServer.java D backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/RemoveVGVDSCommand.java M backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/SpmStartVDSCommand.java M backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/VdsServerConnector.java M backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/VdsServerWrapper.java 12 files changed, 31 insertions(+), 170 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/90/9490/1 diff --git a/backend/manager/dbscripts/upgrade/pre_upgrade/0000_config.sql b/backend/manager/dbscripts/upgrade/pre_upgrade/0000_config.sql index 8aec096..386e9a4 100644 --- a/backend/manager/dbscripts/upgrade/pre_upgrade/0000_config.sql +++ b/backend/manager/dbscripts/upgrade/pre_upgrade/0000_config.sql @@ -451,10 +451,6 @@ select fn_db_add_config_value('SupportedStorageFormats','0,2,3','3.1'); select fn_db_add_config_value('SupportedStorageFormats','0,2,3','3.2'); select fn_db_add_config_value('SupportedVDSMVersions','4.5,4.9','general'); -select fn_db_add_config_value('SupportStorageFormat','false','2.2'); -select fn_db_add_config_value('SupportStorageFormat','true','3.0'); -select fn_db_add_config_value('SupportStorageFormat','true','3.1'); -select fn_db_add_config_value('SupportStorageFormat','true','3.2'); select fn_db_add_config_value('SupportForceCreateVG','false','2.2'); select fn_db_add_config_value('SupportForceCreateVG','false','3.0'); select fn_db_add_config_value('SupportForceCreateVG','true','3.1'); @@ -662,6 +658,10 @@ select fn_db_delete_config_value('SupportGetDevicesVisibility','3.0'); select fn_db_delete_config_value('SupportGetDevicesVisibility','3.1'); select fn_db_delete_config_value('SupportGetDevicesVisibility','3.2'); +select fn_db_delete_config_value('SupportStorageFormat','2.2'); +select fn_db_delete_config_value('SupportStorageFormat','3.0'); +select fn_db_delete_config_value('SupportStorageFormat','3.1'); +select fn_db_delete_config_value('SupportStorageFormat','3.2'); ------------------------------------------------------------------------------------ -- Split config section -- The purpose of this section is to treat config option that was once diff --git a/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/storage/RemoveStorageDomainTest.java b/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/storage/RemoveStorageDomainTest.java index 1834dd8..f5c68b7 100644 --- a/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/storage/RemoveStorageDomainTest.java +++ b/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/storage/RemoveStorageDomainTest.java @@ -33,7 +33,6 @@ import org.ovirt.engine.core.common.businessentities.storage_pool_iso_map; import org.ovirt.engine.core.common.interfaces.VDSBrokerFrontend; import org.ovirt.engine.core.common.vdscommands.FormatStorageDomainVDSCommandParameters; -import org.ovirt.engine.core.common.vdscommands.RemoveVGVDSCommandParameters; import org.ovirt.engine.core.common.vdscommands.VDSCommandType; import org.ovirt.engine.core.common.vdscommands.VDSReturnValue; import org.ovirt.engine.core.compat.Guid; @@ -136,11 +135,6 @@ if (format || (type != StorageDomainType.ISO && type != StorageDomainType.ImportExport)) { setUpStorageHelper(cmd, dom, true, failure); VDSBrokerFrontend vdsBroker = expectFormat(setUpVdsBroker(), failure); - - if (storageType == StorageType.ISCSI) { - expectRemove(vdsBroker); - } - } else { setUpStorageHelper(cmd, dom, false, false); } @@ -160,14 +154,6 @@ protected VDSBrokerFrontend setUpVdsBroker() { VDSBrokerFrontend vdsBroker = mock(VDSBrokerFrontend.class); when(backend.getResourceManager()).thenReturn(vdsBroker); - return vdsBroker; - } - - protected VDSBrokerFrontend expectRemove(VDSBrokerFrontend vdsBroker) { - VDSReturnValue ret = new VDSReturnValue(); - ret.setSucceeded(true); - when(vdsBroker.RunVdsCommand(eq(VDSCommandType.RemoveVG), - any(RemoveVGVDSCommandParameters.class))).thenReturn(ret); return vdsBroker; } diff --git a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/config/ConfigValues.java b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/config/ConfigValues.java index a824ed4..33a1940 100644 --- a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/config/ConfigValues.java +++ b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/config/ConfigValues.java @@ -1002,10 +1002,6 @@ @DefaultValueAttribute("default,ich6") DesktopAudioDeviceType(294), - @TypeConverterAttribute(Boolean.class) - @DefaultValueAttribute("false") - SupportStorageFormat(295), - @Reloadable @TypeConverterAttribute(String.class) @DefaultValueAttribute("0") diff --git a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/vdscommands/GetVGInfoVDSCommandParameters.java b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/vdscommands/GetVGInfoVDSCommandParameters.java index 458fb4d..1a9063c 100644 --- a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/vdscommands/GetVGInfoVDSCommandParameters.java +++ b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/vdscommands/GetVGInfoVDSCommandParameters.java @@ -2,11 +2,27 @@ import org.ovirt.engine.core.compat.*; -public class GetVGInfoVDSCommandParameters extends RemoveVGVDSCommandParameters { - public GetVGInfoVDSCommandParameters(Guid vdsId, String vgId) { - super(vdsId, vgId); - } +public class GetVGInfoVDSCommandParameters extends VdsIdVDSCommandParametersBase { + private String privateVGID; public GetVGInfoVDSCommandParameters() { } + + public GetVGInfoVDSCommandParameters(Guid vdsId, String vgId) { + super(vdsId); + setVGID(vgId); + } + + public String getVGID() { + return privateVGID; + } + + private void setVGID(String value) { + privateVGID = value; + } + + @Override + public String toString() { + return String.format("%s, VGID=%s", super.toString(), getVGID()); + } } diff --git a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/vdscommands/RemoveVGVDSCommandParameters.java b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/vdscommands/RemoveVGVDSCommandParameters.java deleted file mode 100644 index e08e5ec..0000000 --- a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/vdscommands/RemoveVGVDSCommandParameters.java +++ /dev/null @@ -1,29 +0,0 @@ -package org.ovirt.engine.core.common.vdscommands; - -import org.ovirt.engine.core.compat.Guid; - -@Deprecated -public class RemoveVGVDSCommandParameters extends VdsIdVDSCommandParametersBase { - public RemoveVGVDSCommandParameters(Guid vdsId, String vgId) { - super(vdsId); - setVGID(vgId); - } - - private String privateVGID; - - public String getVGID() { - return privateVGID; - } - - private void setVGID(String value) { - privateVGID = value; - } - - public RemoveVGVDSCommandParameters() { - } - - @Override - public String toString() { - return String.format("%s, VGID=%s", super.toString(), getVGID()); - } -} diff --git a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/vdscommands/VDSCommandType.java b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/vdscommands/VDSCommandType.java index 92ddbf4..726bd07 100644 --- a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/vdscommands/VDSCommandType.java +++ b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/vdscommands/VDSCommandType.java @@ -98,7 +98,6 @@ VmReplicateDiskFinish("org.ovirt.engine.core.vdsbroker.vdsbroker"), GetImageDomainsList("org.ovirt.engine.core.vdsbroker.irsbroker"), CreateVG("org.ovirt.engine.core.vdsbroker.vdsbroker"), - RemoveVG("org.ovirt.engine.core.vdsbroker.vdsbroker"), GetVGList("org.ovirt.engine.core.vdsbroker.vdsbroker"), GetVGInfo("org.ovirt.engine.core.vdsbroker.vdsbroker"), GetDeviceList("org.ovirt.engine.core.vdsbroker.vdsbroker"), diff --git a/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/CreateStorageDomainVDSCommand.java b/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/CreateStorageDomainVDSCommand.java index 1a4513b..ce1a867 100644 --- a/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/CreateStorageDomainVDSCommand.java +++ b/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/CreateStorageDomainVDSCommand.java @@ -1,7 +1,5 @@ package org.ovirt.engine.core.vdsbroker.vdsbroker; -import org.ovirt.engine.core.common.config.Config; -import org.ovirt.engine.core.common.config.ConfigValues; import org.ovirt.engine.core.common.vdscommands.CreateStorageDomainVDSCommandParameters; public class CreateStorageDomainVDSCommand<P extends CreateStorageDomainVDSCommandParameters> @@ -12,22 +10,12 @@ @Override protected void ExecuteVdsBrokerCommand() { - if (!Config.<Boolean> GetValue(ConfigValues.SupportStorageFormat, - getVds().getvds_group_compatibility_version() - .toString())) { - status = getBroker().createStorageDomain(getParameters().getStorageDomain().getstorage_type().getValue(), - getParameters().getStorageDomain().getId().toString(), - getParameters().getStorageDomain().getstorage_name(), getParameters().getArgs(), - getParameters().getStorageDomain().getstorage_domain_type().getValue()); - } else { - status = - getBroker().createStorageDomain(getParameters().getStorageDomain().getstorage_type().getValue(), - getParameters().getStorageDomain().getId().toString(), - getParameters().getStorageDomain().getstorage_name(), - getParameters().getArgs(), - getParameters().getStorageDomain().getstorage_domain_type().getValue(), - getParameters().getStorageDomain().getStorageFormat().getValue()); - } + status = getBroker().createStorageDomain(getParameters().getStorageDomain().getstorage_type().getValue(), + getParameters().getStorageDomain().getId().toString(), + getParameters().getStorageDomain().getstorage_name(), + getParameters().getArgs(), + getParameters().getStorageDomain().getstorage_domain_type().getValue(), + getParameters().getStorageDomain().getStorageFormat().getValue()); ProceedProxyReturnValue(); } } 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 99c7c21..6eab845 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 @@ -104,9 +104,6 @@ StatusOnlyReturnForXmlRpc validateStorageDomain(String sdUUID); StatusOnlyReturnForXmlRpc createStorageDomain(int domainType, String sdUUID, String domainName, String arg, - int storageType); - - StatusOnlyReturnForXmlRpc createStorageDomain(int domainType, String sdUUID, String domainName, String arg, int storageType, String storageFormatType); StatusOnlyReturnForXmlRpc formatStorageDomain(String sdUUID); @@ -136,9 +133,6 @@ OneUuidReturnForXmlRpc createVG(String sdUUID, String[] deviceList, boolean force); - @Deprecated - StatusOnlyReturnForXmlRpc removeVG(String vgUUID); - VGListReturnForXmlRpc getVGList(); OneVGReturnForXmlRpc getVGInfo(String vgUUID); @@ -152,13 +146,6 @@ IQNListReturnForXmlRpc discoverSendTargets(Map<String, String> args); SessionsListReturnForXmlRpc getSessionList(); - - OneUuidReturnForXmlRpc spmStart(String spUUID, - int prevID, - String prevLVER, - int recoveryMode, - String SCSIFencing, - int maxHostId); OneUuidReturnForXmlRpc spmStart(String spUUID, int prevID, diff --git a/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/RemoveVGVDSCommand.java b/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/RemoveVGVDSCommand.java deleted file mode 100644 index 3fc2950..0000000 --- a/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/RemoveVGVDSCommand.java +++ /dev/null @@ -1,20 +0,0 @@ -package org.ovirt.engine.core.vdsbroker.vdsbroker; - -import org.ovirt.engine.core.common.vdscommands.*; - -/** - * The following command should remove a vg , the command is not supported from vdsm 3.0 - * only suitable for vdsm 2.2. - */ -@Deprecated -public class RemoveVGVDSCommand<P extends RemoveVGVDSCommandParameters> extends VdsBrokerCommand<P> { - public RemoveVGVDSCommand(P parameters) { - super(parameters); - } - - @Override - protected void ExecuteVdsBrokerCommand() { - status = getBroker().removeVG(getParameters().getVGID()); - ProceedProxyReturnValue(); - } -} diff --git a/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/SpmStartVDSCommand.java b/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/SpmStartVDSCommand.java index 1a0b492..9e00a4b 100644 --- a/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/SpmStartVDSCommand.java +++ b/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/SpmStartVDSCommand.java @@ -25,21 +25,11 @@ @Override protected void ExecuteVdsBrokerCommand() { - if (!Config.<Boolean> GetValue(ConfigValues.SupportStorageFormat, - getVds().getvds_group_compatibility_version() - .toString())) { - _result = getBroker().spmStart(getParameters().getStoragePoolId().toString(), - getParameters().getPrevId(), getParameters().getPrevLVER(), - getParameters().getRecoveryMode().getValue(), - (new Boolean(getParameters().getSCSIFencing())).toString().toLowerCase(), - Config.<Integer> GetValue(ConfigValues.MaxNumberOfHostsInStoragePool)); - } else { - _result = getBroker().spmStart(getParameters().getStoragePoolId().toString(), + _result = getBroker().spmStart(getParameters().getStoragePoolId().toString(), getParameters().getPrevId(), getParameters().getPrevLVER(), getParameters().getRecoveryMode().getValue(), (new Boolean(getParameters().getSCSIFencing())).toString().toLowerCase(), Config.<Integer> GetValue(ConfigValues.MaxNumberOfHostsInStoragePool), getParameters().getStoragePoolFormatType().getValue()); - } ProceedProxyReturnValue(); Guid taskId = new Guid(_result.mUuid); diff --git a/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/VdsServerConnector.java b/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/VdsServerConnector.java index 2499b4f..e42f931 100644 --- a/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/VdsServerConnector.java +++ b/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/VdsServerConnector.java @@ -91,9 +91,6 @@ public Map<String, Object> validateStorageDomain(String sdUUID); public Map<String, Object> createStorageDomain(int domainType, String sdUUID, String domainName, String arg, - int storageType); - - public Map<String, Object> createStorageDomain(int domainType, String sdUUID, String domainName, String arg, int storageType, String storageFormatType); public Map<String, Object> formatStorageDomain(String sdUUID); @@ -123,8 +120,6 @@ public Map<String, Object> createVG(String sdUUID, String[] deviceList, boolean force); - public Map<String, Object> removeVG(String vgUUID); - public Map<String, Object> getVGList(); public Map<String, Object> getVGInfo(String vgUUID); @@ -138,13 +133,6 @@ public Map<String, Object> discoverSendTargets(Map<String, String> args); public Map<String, Object> getSessionList(); - - public Map<String, Object> spmStart(String spUUID, - int prevID, - String prevLVER, - int recoveryMode, - String SCSIFencing, - int maxHostId); public Map<String, Object> spmStart(String spUUID, int prevID, diff --git a/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/VdsServerWrapper.java b/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/VdsServerWrapper.java index b1f47da..e4e2360 100644 --- a/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/VdsServerWrapper.java +++ b/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/VdsServerWrapper.java @@ -511,20 +511,6 @@ @Override public StatusOnlyReturnForXmlRpc createStorageDomain(int domainType, String sdUUID, String domainName, String arg, - int storageType) { - try { - Map<String, Object> xmlRpcReturnValue = vdsServer.createStorageDomain(domainType, sdUUID, domainName, arg, - storageType); - StatusOnlyReturnForXmlRpc wrapper = new StatusOnlyReturnForXmlRpc(xmlRpcReturnValue); - return wrapper; - } catch (UndeclaredThrowableException ute) { - throw new XmlRpcRunTimeException(ute); - } - - } - - @Override - public StatusOnlyReturnForXmlRpc createStorageDomain(int domainType, String sdUUID, String domainName, String arg, int storageType, String storageFormatType) { try { Map<String, Object> xmlRpcReturnValue = vdsServer.createStorageDomain(domainType, sdUUID, domainName, arg, @@ -681,18 +667,6 @@ } @Override - public StatusOnlyReturnForXmlRpc removeVG(String vgUUID) { - try { - Map<String, Object> xmlRpcReturnValue = vdsServer.removeVG(vgUUID); - StatusOnlyReturnForXmlRpc wrapper = new StatusOnlyReturnForXmlRpc(xmlRpcReturnValue); - return wrapper; - } catch (UndeclaredThrowableException ute) { - throw new XmlRpcRunTimeException(ute); - } - - } - - @Override public VGListReturnForXmlRpc getVGList() { try { Map<String, Object> xmlRpcReturnValue = vdsServer.getVGList(); @@ -768,20 +742,6 @@ try { Map<String, Object> xmlRpcReturnValue = vdsServer.getSessionList(); SessionsListReturnForXmlRpc wrapper = new SessionsListReturnForXmlRpc(xmlRpcReturnValue); - return wrapper; - } catch (UndeclaredThrowableException ute) { - throw new XmlRpcRunTimeException(ute); - } - - } - - @Override - public OneUuidReturnForXmlRpc spmStart(String spUUID, int prevID, String prevLVER, int recoveryMode, - String SCSIFencing, int maxHostId) { - try { - Map<String, Object> xmlRpcReturnValue = vdsServer.spmStart(spUUID, prevID, prevLVER, recoveryMode, - SCSIFencing, maxHostId); - OneUuidReturnForXmlRpc wrapper = new OneUuidReturnForXmlRpc(xmlRpcReturnValue); return wrapper; } catch (UndeclaredThrowableException ute) { throw new XmlRpcRunTimeException(ute); -- To view, visit http://gerrit.ovirt.org/9490 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I892af2405d55233e465f2d0da1cd4f0378076c88 Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Ravi Nori <[email protected]> _______________________________________________ Engine-patches mailing list [email protected] http://lists.ovirt.org/mailman/listinfo/engine-patches
