Amit Aviram has uploaded a new change for review.
Change subject: core: StorageHandlingCommandBase, Config values cleanup.
......................................................................
core: StorageHandlingCommandBase, Config values cleanup.
getSupportedStorageFormats function in StorageHandlingCommandBase is out of
date since format matching to storage needs to be done with
VersionStorageFormatUtil. Hence the config value SupportedStorageFormats
that was used by that function was also removed.
Change-Id: Ia0c9bdc034fd09054ab11137bbc372514d3e74bc
Signed-off-by: Amit Aviram <aavi...@redhat.com>
---
M
backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/StorageHandlingCommandBase.java
M
backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/storage/AddExistingFileStorageDomainCommandTest.java
M
backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/storage/AddStorageDomainCommonTest.java
M
backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/storage/StorageHandlingCommandBaseTest.java
M
backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/config/ConfigValues.java
M packaging/dbscripts/upgrade/pre_upgrade/0000_config.sql
6 files changed, 3 insertions(+), 27 deletions(-)
git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/18/36318/1
diff --git
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/StorageHandlingCommandBase.java
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/StorageHandlingCommandBase.java
index 6fdd662..9e4c067 100644
---
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/StorageHandlingCommandBase.java
+++
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/StorageHandlingCommandBase.java
@@ -38,7 +38,6 @@
import org.ovirt.engine.core.common.vdscommands.VDSReturnValue;
import org.ovirt.engine.core.compat.Guid;
import org.ovirt.engine.core.compat.TransactionScopeOption;
-import org.ovirt.engine.core.compat.Version;
import org.ovirt.engine.core.dal.dbbroker.DbFacade;
import org.ovirt.engine.core.dao.DiskImageDAO;
import org.ovirt.engine.core.dao.StoragePoolIsoMapDAO;
@@ -408,11 +407,6 @@
/** @return The maximum length for a storage pool's name, from the
configuration. */
protected Integer getStoragePoolNameSizeLimit() {
return Config.<Integer>
getValue(ConfigValues.StoragePoolNameSizeLimit);
- }
-
- /** @return The supported storage domain formats, delimited by commas
(","). */
- protected String getSupportedStorageFormats(Version version) {
- return Config.<String> getValue(ConfigValues.SupportedStorageFormats,
version.toString());
}
/* Overidden DAO access methods, for easier testing */
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 205a106..150fa14 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
@@ -48,9 +48,7 @@
@ClassRule
public static MockConfigRule mcr = new MockConfigRule(
- mockConfig(ConfigValues.StorageDomainNameSizeLimit,
SD_MAX_NAME_LENGTH),
- mockConfig(ConfigValues.SupportedStorageFormats,
Version.v3_4.toString(), "3"),
- mockConfig(ConfigValues.SupportedStorageFormats,
Version.v3_5.toString(), "3")
+ mockConfig(ConfigValues.StorageDomainNameSizeLimit,
SD_MAX_NAME_LENGTH)
);
@Mock
diff --git
a/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/storage/AddStorageDomainCommonTest.java
b/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/storage/AddStorageDomainCommonTest.java
index 06e8290..1c4016b 100644
---
a/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/storage/AddStorageDomainCommonTest.java
+++
b/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/storage/AddStorageDomainCommonTest.java
@@ -43,10 +43,8 @@
@ClassRule
public static MockConfigRule mcr = new MockConfigRule(
- mockConfig(ConfigValues.StorageDomainNameSizeLimit, 10),
- mockConfig(ConfigValues.SupportedStorageFormats,
Version.v3_5.toString(), "0,2,3"),
- mockConfig(ConfigValues.SupportedStorageFormats,
Version.v3_0.toString(), "0")
- );
+ mockConfig(ConfigValues.StorageDomainNameSizeLimit, 10)
+ );
@Mock
private VdsDAO vdsDao;
diff --git
a/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/storage/StorageHandlingCommandBaseTest.java
b/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/storage/StorageHandlingCommandBaseTest.java
index 91430f8..f3a7a67 100644
---
a/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/storage/StorageHandlingCommandBaseTest.java
+++
b/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/storage/StorageHandlingCommandBaseTest.java
@@ -54,12 +54,6 @@
@ClassRule
public static MockConfigRule mcr = new MockConfigRule(
// Indicates a supported storage format of V2 & V3 in version 3.4
- mockConfig(ConfigValues.SupportedStorageFormats,
Version.v3_0.toString(), "0,1"),
- mockConfig(ConfigValues.SupportedStorageFormats,
Version.v3_1.toString(), "3"),
- mockConfig(ConfigValues.SupportedStorageFormats,
Version.v3_2.toString(), "3"),
- mockConfig(ConfigValues.SupportedStorageFormats,
Version.v3_3.toString(), "3"),
- mockConfig(ConfigValues.SupportedStorageFormats,
Version.v3_4.toString(), "3"),
- mockConfig(ConfigValues.SupportedStorageFormats,
Version.v3_5.toString(), "3"),
mockConfig(ConfigValues.GlusterFsStorageEnabled,
Version.v3_0.toString(), false),
mockConfig(ConfigValues.GlusterFsStorageEnabled,
Version.v3_4.toString(), true),
mockConfig(ConfigValues.GlusterFsStorageEnabled,
Version.v3_5.toString(), true),
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 209803f..52fa293 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
@@ -796,11 +796,6 @@
@DefaultValueAttribute("30")
LDAPQueryTimeout,
- @Reloadable
- @TypeConverterAttribute(String.class)
- @DefaultValueAttribute("0")
- SupportedStorageFormats,
-
@TypeConverterAttribute(String.class)
@DefaultValueAttribute("ILIKE")
@OptionBehaviourAttribute(behaviour = OptionBehaviour.ValueDependent,
dependentOn = ConfigValues.DBEngine,
diff --git a/packaging/dbscripts/upgrade/pre_upgrade/0000_config.sql
b/packaging/dbscripts/upgrade/pre_upgrade/0000_config.sql
index e1c31df..5595dfb 100644
--- a/packaging/dbscripts/upgrade/pre_upgrade/0000_config.sql
+++ b/packaging/dbscripts/upgrade/pre_upgrade/0000_config.sql
@@ -472,8 +472,6 @@
select
fn_db_add_config_value('HostStorageConnectionAndPoolRefreshTimeInSeconds','30','general');
select
fn_db_add_config_value('SucceededJobCleanupTimeInMinutes','10','general');
select fn_db_add_config_value('SupportedClusterLevels','3.0','general');
-select fn_db_add_config_value('SupportedStorageFormats','0,2','3.0');
-select fn_db_add_config_value_for_versions_up_to('SupportedStorageFormats',
'0,2,3','3.5');
select
fn_db_add_config_value('SupportedVDSMVersions','4.9,4.10,4.11,4.12,4.13,4.14','general');
select fn_db_add_config_value('SupportForceCreateVG','false','3.0');
@@ -774,7 +772,6 @@
select
fn_db_update_config_value('ClusterEmulatedMachines','rhel6.4.0,pc-1.0,pseries','3.3');
select fn_db_update_config_value('SpiceDriverNameInGuest','{"windows":
"RHEV-Spice", "linux" : "xorg-x11-drv-qxl" }','general');
select
fn_db_update_config_value('SupportedClusterLevels','3.0,3.1,3.2,3.3,3.4,3.5','general');
-select
fn_db_update_config_value('SupportedStorageFormats','0,2,3','3.1,3.2,3.3,3.4,3.5');
select
fn_db_update_config_value('SupportedVDSMVersions','4.9,4.10,4.11,4.12,4.13,4.14,4.15','general');
select fn_db_update_config_value('VdcVersion','3.5.0.0','general');
select fn_db_update_config_value('ProductRPMVersion','3.5.0.0','general');
--
To view, visit http://gerrit.ovirt.org/36318
To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ia0c9bdc034fd09054ab11137bbc372514d3e74bc
Gerrit-PatchSet: 1
Gerrit-Project: ovirt-engine
Gerrit-Branch: master
Gerrit-Owner: Amit Aviram <aavi...@redhat.com>
_______________________________________________
Engine-patches mailing list
Engine-patches@ovirt.org
http://lists.ovirt.org/mailman/listinfo/engine-patches
