Federico Simoncelli has uploaded a new change for review.
Change subject: [wip] core: move the storage domain V3 to DC 3.2
......................................................................
[wip] core: move the storage domain V3 to DC 3.2
Change-Id: Ia0f25ffe4ed85fad249f57d36c763059d17b0537
Signed-off-by: Federico Simoncelli <fsimo...@redhat.com>
---
M backend/manager/dbscripts/upgrade/pre_upgrade/0000_config.sql
M
backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/AddStoragePoolWithStoragesCommand.java
M
backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/UpdateStoragePoolCommand.java
M
frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/datacenters/DataCenterStorageListModel.java
M
frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/storage/StorageModel.java
5 files changed, 9 insertions(+), 9 deletions(-)
git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/97/9197/1
diff --git a/backend/manager/dbscripts/upgrade/pre_upgrade/0000_config.sql
b/backend/manager/dbscripts/upgrade/pre_upgrade/0000_config.sql
index 785214f..ec468fd 100644
--- a/backend/manager/dbscripts/upgrade/pre_upgrade/0000_config.sql
+++ b/backend/manager/dbscripts/upgrade/pre_upgrade/0000_config.sql
@@ -463,7 +463,7 @@
select fn_db_add_config_value('SupportedClusterLevels','2.2,3.0','general');
select fn_db_add_config_value('SupportedStorageFormats','0','2.2');
select fn_db_add_config_value('SupportedStorageFormats','0,2','3.0');
-select fn_db_add_config_value('SupportedStorageFormats','0,2,3','3.1');
+select fn_db_add_config_value('SupportedStorageFormats','0,2','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('SupportGetDevicesVisibility','false','2.2');
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 6a7da6f..6a399f3 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
@@ -152,10 +152,10 @@
}
final storage_domain_static staticDomain =
storageDomain.getStorageStaticData();
boolean staticDomainChanged = false;
- // for data centers >= 3.1 we enforce the domain
version to V3
+ // for data centers >= 3.2 we enforce the domain
version to V3
// this strictly needs to be before selecting the
masterStorageDomain because the pool master
// version (setmaster_domain_version) depends on the
domain upgrade.
- if
(getStoragePool().getcompatibility_version().compareTo(Version.v3_1) >= 0
+ if
(getStoragePool().getcompatibility_version().compareTo(Version.v3_2) >= 0
&& staticDomain.getStorageFormat() !=
StorageFormatType.V3) {
if (!staticDomainChanged) {
getCompensationContext().snapshotEntity(staticDomain);
diff --git
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/UpdateStoragePoolCommand.java
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/UpdateStoragePoolCommand.java
index 045f269..cf87d05 100644
---
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/UpdateStoragePoolCommand.java
+++
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/UpdateStoragePoolCommand.java
@@ -96,10 +96,10 @@
// TODO: The entire version -> format type scheme should be moved to a
place
// when everyone can utilize it.
- if (spVersion.compareTo(Version.v3_0) == 0) {
- targetFormat = StorageFormatType.V2;
- } else if (spVersion.compareTo(Version.v3_1) == 0) {
+ if (spVersion.compareTo(Version.v3_2) >= 0) {
targetFormat = StorageFormatType.V3;
+ } else if (spVersion.compareTo(Version.v3_0) >= 0) {
+ targetFormat = StorageFormatType.V2;
} else {
targetFormat = StorageFormatType.V1;
}
diff --git
a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/datacenters/DataCenterStorageListModel.java
b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/datacenters/DataCenterStorageListModel.java
index 23abb84..7c69cb5 100644
---
a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/datacenters/DataCenterStorageListModel.java
+++
b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/datacenters/DataCenterStorageListModel.java
@@ -355,7 +355,7 @@
if
(a.getStorageStaticData().getStorageFormat() == StorageFormatType.V3
&& dcStorageModel.getEntity()
.getcompatibility_version()
- .compareTo(Version.v3_0)
<= 0) {
+ .compareTo(Version.v3_1)
<= 0) {
continue;
}
// skip V2 format for DC <= 2.2
diff --git
a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/storage/StorageModel.java
b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/storage/StorageModel.java
index a22a43e..c433f7f 100644
---
a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/storage/StorageModel.java
+++
b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/storage/StorageModel.java
@@ -649,12 +649,12 @@
formats.add(StorageFormatType.V1);
}
else if ((getSelectedItem().getType() == StorageType.ISCSI ||
getSelectedItem().getType() == StorageType.FCP)
- &&
dataCenter.getcompatibility_version().compareTo(Version.v3_0) == 0)
+ &&
dataCenter.getcompatibility_version().compareTo(Version.v3_2) < 0)
{
formats.add(StorageFormatType.V2);
selectItem = StorageFormatType.V2;
}
- else if
(dataCenter.getcompatibility_version().compareTo(Version.v3_1) >= 0)
+ else
{
formats.add(StorageFormatType.V3);
selectItem = StorageFormatType.V3;
--
To view, visit http://gerrit.ovirt.org/9197
To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ia0f25ffe4ed85fad249f57d36c763059d17b0537
Gerrit-PatchSet: 1
Gerrit-Project: ovirt-engine
Gerrit-Branch: master
Gerrit-Owner: Federico Simoncelli <fsimo...@redhat.com>
_______________________________________________
Engine-patches mailing list
Engine-patches@ovirt.org
http://lists.ovirt.org/mailman/listinfo/engine-patches
