Shahar Havivi has uploaded a new change for review. Change subject: core: sysprep timezone is set as system timezone ......................................................................
core: sysprep timezone is set as system timezone Change-Id: If48c49b7e36d5382965a77c99fd7fa1f5d884578 Bug-Url: https://bugzilla.redhat.com/1088440 Signed-off-by: Shahar Havivi <[email protected]> --- M backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/SysprepHandler.java M frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/uicommon/popup/vm/VmInitWidget.java 2 files changed, 22 insertions(+), 14 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/60/27260/1 diff --git a/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/SysprepHandler.java b/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/SysprepHandler.java index 619b6ba..382486c 100644 --- a/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/SysprepHandler.java +++ b/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/SysprepHandler.java @@ -169,20 +169,23 @@ } private static String getTimeZone(VM vm) { - String timeZone; + String retVal; + String timeZone = null; // Can be empty if the VM was imported. - if (StringUtils.isEmpty(vm.getTimeZone())) { - vm.setTimeZone(Config.<String> getValue(ConfigValues.DefaultWindowsTimeZone)); + if (vm.getVmInit() != null && StringUtils.isNotEmpty(vm.getVmInit().getTimeZone())) { + timeZone = vm.getVmInit().getTimeZone(); + } else { + timeZone = Config.<String> getValue(ConfigValues.DefaultWindowsTimeZone); } if (osRepository.isTimezoneValueInteger(vm.getStaticData(). getOsId(), null)) { // send correct time zone as sysprep expect to get it (a wierd number) - timeZone = getTimezoneIndexByKey(vm.getTimeZone()); + retVal = getTimezoneIndexByKey(timeZone); } else { - timeZone = vm.getTimeZone(); + retVal = timeZone; } - return timeZone; + return retVal; } private static String getSysprepDir() { diff --git a/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/uicommon/popup/vm/VmInitWidget.java b/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/uicommon/popup/vm/VmInitWidget.java index dcabefb..30419ce 100644 --- a/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/uicommon/popup/vm/VmInitWidget.java +++ b/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/uicommon/popup/vm/VmInitWidget.java @@ -92,10 +92,10 @@ @Ignore FlowPanel syspreptOptionsContent; - @UiField + @UiField(provided = true) @Path(value = "windowsSysprepTimeZone.selectedItem") @WithElementId - ListModelListBoxEditor<Object> windowsSysprepTimeZoneEditor; + ListModelListBoxEditor<Map.Entry<String, String>> windowsSysprepTimeZoneEditor; @UiField @Path(value = "windowsSysprepTimeZoneEnabled.entity") @@ -188,7 +188,7 @@ @UiField(provided = true) @Path(value = "timeZoneList.selectedItem") @WithElementId - ListModelListBoxEditor<Object> timeZoneEditor; + ListModelListBoxEditor<Map.Entry<String, String>> timeZoneEditor; @UiField @Ignore @@ -351,12 +351,17 @@ } void initListBoxEditors() { - timeZoneEditor = new ListModelListBoxEditor<Object>(new NullSafeRenderer<Object>() { + timeZoneEditor = new ListModelListBoxEditor<Map.Entry<String, String>>(new NullSafeRenderer<Map.Entry<String, String>>() { @Override - public String renderNullSafe(Object object) { - @SuppressWarnings("unchecked") - Map.Entry<String, String> entry = (Map.Entry<String, String>) object; - return entry.getValue(); + public String renderNullSafe(Map.Entry<String, String> object) { + return object.getValue(); + } + }); + + windowsSysprepTimeZoneEditor = new ListModelListBoxEditor<Map.Entry<String, String>>(new NullSafeRenderer<Map.Entry<String, String>>() { + @Override + public String renderNullSafe(Map.Entry<String, String> object) { + return object.getValue(); } }); -- To view, visit http://gerrit.ovirt.org/27260 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: If48c49b7e36d5382965a77c99fd7fa1f5d884578 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
