Shahar Havivi has uploaded a new change for review. Change subject: core: Set default timezone to a Templates and VMs ......................................................................
core: Set default timezone to a Templates and VMs When adding a new template we don't set the default timezone which cause the UI to display a blank timezone. This patch also address the importing VM/Template and adding an upgrade script to set the default timezone to an already created VMs/Templates if its timezone is null. Change-Id: Id55b02a10c2faa17a7a50b64516d902c3d97e06d Bug-Url: https://bugzilla.redhat.com/1087917 Signed-off-by: Shahar Havivi <[email protected]> --- M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/AddVmCommand.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/UpdateVmCommand.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/UpdateVmTemplateCommand.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/VmHandler.java M backend/manager/modules/utils/src/main/java/org/ovirt/engine/core/utils/ovf/OvfReader.java A packaging/dbscripts/upgrade/upgrade_scritp.sql 6 files changed, 20 insertions(+), 5 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/68/28168/1 diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/AddVmCommand.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/AddVmCommand.java index 251de54..9bcbe06 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/AddVmCommand.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/AddVmCommand.java @@ -7,6 +7,7 @@ import java.util.HashMap; import java.util.List; import java.util.Map; + import org.apache.commons.codec.binary.Base64; import org.apache.commons.lang.StringUtils; import org.ovirt.engine.core.bll.job.ExecutionHandler; @@ -164,6 +165,7 @@ if (diskInfoDestinationMap == null) { diskInfoDestinationMap = new HashMap<Guid, DiskImage>(); } + VmHandler.updateDefaultTimeZone(parameters.getVmStaticData()); } diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/UpdateVmCommand.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/UpdateVmCommand.java index 9ff2891..4fb83eb 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/UpdateVmCommand.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/UpdateVmCommand.java @@ -87,6 +87,7 @@ getVmPropertiesUtils().separateCustomPropertiesToUserAndPredefined(clusterVersion, parameters.getVmStaticData()); getVmPropertiesUtils().separateCustomPropertiesToUserAndPredefined(clusterVersion, getVm().getStaticData()); } + VmHandler.updateDefaultTimeZone(parameters.getVmStaticData()); } private VmPropertiesUtils getVmPropertiesUtils() { diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/UpdateVmTemplateCommand.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/UpdateVmTemplateCommand.java index fc59dc9..a4a90ea 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/UpdateVmTemplateCommand.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/UpdateVmTemplateCommand.java @@ -1,5 +1,10 @@ package org.ovirt.engine.core.bll; +import java.util.ArrayList; +import java.util.Collections; +import java.util.List; +import java.util.Map; + import org.apache.commons.lang.ObjectUtils; import org.apache.commons.lang.StringUtils; import org.ovirt.engine.core.bll.quota.QuotaConsumptionParameter; @@ -26,11 +31,6 @@ import org.ovirt.engine.core.dal.dbbroker.auditloghandling.AuditLogDirector; import org.ovirt.engine.core.dal.dbbroker.auditloghandling.AuditLogableBase; -import java.util.ArrayList; -import java.util.Collections; -import java.util.List; -import java.util.Map; - public class UpdateVmTemplateCommand<T extends UpdateVmTemplateParameters> extends VmTemplateCommand<T> implements QuotaVdsDependent, RenamedEntityInfoProvider{ private VmTemplate mOldTemplate; @@ -44,6 +44,8 @@ setStoragePoolId(getVdsGroup().getStoragePoolId() != null ? getVdsGroup().getStoragePoolId() : Guid.Empty); } + //TODO: fix that + VmHandler.updateDefaultTimeZone(parameters.getVmTemplateData()); } @Override diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/VmHandler.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/VmHandler.java index bb297ac..98a86a0 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/VmHandler.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/VmHandler.java @@ -776,4 +776,10 @@ .RunVdsCommand(VDSCommandType.UpdateVmDynamicData, new UpdateVmDynamicDataVDSCommandParameters(vdsId, vmDynamic)); } + + public static void updateDefaultTimeZone(VmBase vmBase) { + if (vmBase.getTimeZone() == null) { + vmBase.setTimeZone(Config.<String> getValue(ConfigValues.DefaultWindowsTimeZone)); + } + } } diff --git a/backend/manager/modules/utils/src/main/java/org/ovirt/engine/core/utils/ovf/OvfReader.java b/backend/manager/modules/utils/src/main/java/org/ovirt/engine/core/utils/ovf/OvfReader.java index a3b5535..f7b529a 100644 --- a/backend/manager/modules/utils/src/main/java/org/ovirt/engine/core/utils/ovf/OvfReader.java +++ b/backend/manager/modules/utils/src/main/java/org/ovirt/engine/core/utils/ovf/OvfReader.java @@ -355,8 +355,11 @@ if (StringUtils.isNotEmpty(node.innerText)) { vmBase.setTimeZone(node.innerText); } + } else { + VmHandler.updateDefaultTimeZone(vmBase); } + node = content.SelectSingleNode(OvfProperties.DEFAULT_BOOT_SEQUENCE); if (node != null) { if (!StringUtils.isEmpty(node.innerText)) { diff --git a/packaging/dbscripts/upgrade/upgrade_scritp.sql b/packaging/dbscripts/upgrade/upgrade_scritp.sql new file mode 100644 index 0000000..8f5878e --- /dev/null +++ b/packaging/dbscripts/upgrade/upgrade_scritp.sql @@ -0,0 +1 @@ +#TODO: fix that -- To view, visit http://gerrit.ovirt.org/28168 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Id55b02a10c2faa17a7a50b64516d902c3d97e06d Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Shahar Havivi <[email protected]> _______________________________________________ Engine-patches mailing list [email protected] http://lists.ovirt.org/mailman/listinfo/engine-patches
