Allon Mureinik has uploaded a new change for review.
Change subject: webadmin: Warning about storage format upgrade
......................................................................
webadmin: Warning about storage format upgrade
Present a different warning message if upgrading a DC will cause a
storage format upgrade.
Change-Id: I73a5287ad223813ef732f7daccb2ae11af2cecc0
Signed-off-by: Allon Mureinik <amure...@redhat.com>
---
M
frontend/webadmin/modules/gwt-common/src/main/resources/org/ovirt/engine/core/Common.gwt.xml
M
frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/datacenters/DataCenterListModel.java
M
frontend/webadmin/modules/uicompat/src/main/java/org/ovirt/engine/ui/uicompat/UIConstants.java
3 files changed, 19 insertions(+), 4 deletions(-)
git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/98/18698/1
diff --git
a/frontend/webadmin/modules/gwt-common/src/main/resources/org/ovirt/engine/core/Common.gwt.xml
b/frontend/webadmin/modules/gwt-common/src/main/resources/org/ovirt/engine/core/Common.gwt.xml
index 723f954..7f05e9a 100644
---
a/frontend/webadmin/modules/gwt-common/src/main/resources/org/ovirt/engine/core/Common.gwt.xml
+++
b/frontend/webadmin/modules/gwt-common/src/main/resources/org/ovirt/engine/core/Common.gwt.xml
@@ -188,6 +188,7 @@
<include name="common/TimeZoneType.java" />
<include name="common/osinfo/OsRepository.java"/>
<include name="common/utils/SimpleDependecyInjector.java"/>
+ <include name="common/utils/VersionStorageFormatUtil.java"/>
<!-- Required by frontend -->
<include name="common/interfaces/SearchType.java" />
diff --git
a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/datacenters/DataCenterListModel.java
b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/datacenters/DataCenterListModel.java
index 6b37425..0491648 100644
---
a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/datacenters/DataCenterListModel.java
+++
b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/datacenters/DataCenterListModel.java
@@ -15,6 +15,7 @@
import org.ovirt.engine.core.common.businessentities.StorageDomain;
import org.ovirt.engine.core.common.businessentities.StorageDomainSharedStatus;
import org.ovirt.engine.core.common.businessentities.StorageDomainType;
+import org.ovirt.engine.core.common.businessentities.StorageFormatType;
import org.ovirt.engine.core.common.businessentities.StoragePool;
import org.ovirt.engine.core.common.businessentities.StoragePoolStatus;
import org.ovirt.engine.core.common.businessentities.StorageType;
@@ -24,6 +25,7 @@
import org.ovirt.engine.core.common.queries.SearchParameters;
import org.ovirt.engine.core.common.queries.VdcQueryReturnValue;
import org.ovirt.engine.core.common.queries.VdcQueryType;
+import org.ovirt.engine.core.common.utils.VersionStorageFormatUtil;
import org.ovirt.engine.core.compat.Guid;
import org.ovirt.engine.core.compat.StringHelper;
import org.ovirt.engine.core.compat.Version;
@@ -606,16 +608,25 @@
}
else if (!model.getIsNew()
&& getSelectedItem() != null
- && !((Version)
model.getVersion().getSelectedItem()).equals(((StoragePool)
getSelectedItem()).getcompatibility_version())) {
+ && !model.getVersion().getSelectedItem().equals(((StoragePool)
getSelectedItem()).getcompatibility_version())) {
ConfirmationModel confirmModel = new ConfirmationModel();
setConfirmWindow(confirmModel);
confirmModel.setTitle(ConstantsManager.getInstance()
.getConstants()
.changeDataCenterCompatibilityVersionTitle());
confirmModel.setHashName("change_data_center_compatibility_version");
//$NON-NLS-1$
- confirmModel.setMessage(ConstantsManager.getInstance()
- .getConstants()
- .youAreAboutChangeDcCompatibilityVersionMsg());
+
+ StorageFormatType newFormat =
VersionStorageFormatUtil.getFormatForVersion((Version)
model.getVersion().getSelectedItem());
+ StorageFormatType oldFormat =
VersionStorageFormatUtil.getFormatForVersion(((StoragePool)
getSelectedItem()).getcompatibility_version());
+ if (newFormat == oldFormat) {
+ confirmModel.setMessage(ConstantsManager.getInstance()
+ .getConstants()
+ .youAreAboutChangeDcCompatibilityVersionMsg());
+ } else {
+ confirmModel.setMessage(ConstantsManager.getInstance()
+ .getConstants()
+
.youAreAboutChangeDcCompatibilityVersionWithUpgradeMsg());
+ }
UICommand tempVar = new UICommand("OnSaveInternal", this);
//$NON-NLS-1$
tempVar.setTitle(ConstantsManager.getInstance().getConstants().ok());
diff --git
a/frontend/webadmin/modules/uicompat/src/main/java/org/ovirt/engine/ui/uicompat/UIConstants.java
b/frontend/webadmin/modules/uicompat/src/main/java/org/ovirt/engine/ui/uicompat/UIConstants.java
index 1612ebd..44ee613 100644
---
a/frontend/webadmin/modules/uicompat/src/main/java/org/ovirt/engine/ui/uicompat/UIConstants.java
+++
b/frontend/webadmin/modules/uicompat/src/main/java/org/ovirt/engine/ui/uicompat/UIConstants.java
@@ -691,6 +691,9 @@
@DefaultStringValue("You are about to change the Data Center Compatibility
Version. Are you sure you want to continue?")
String youAreAboutChangeDcCompatibilityVersionMsg();
+ @DefaultStringValue("You are about to change the Data Center Compatibility
Version. This will cause the upgrade of all the Storage Domains belonging to
it. Are you sure you want to continue?")
+ String youAreAboutChangeDcCompatibilityVersionWithUpgradeMsg();
+
@DefaultStringValue("Logical Network(s)")
String logicalNetworksMsg();
--
To view, visit http://gerrit.ovirt.org/18698
To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I73a5287ad223813ef732f7daccb2ae11af2cecc0
Gerrit-PatchSet: 1
Gerrit-Project: ovirt-engine
Gerrit-Branch: master
Gerrit-Owner: Allon Mureinik <amure...@redhat.com>
_______________________________________________
Engine-patches mailing list
Engine-patches@ovirt.org
http://lists.ovirt.org/mailman/listinfo/engine-patches
