Laszlo Hornyak has uploaded a new change for review.
Change subject: engine: watchdog - frontend
......................................................................
engine: watchdog - frontend
- added watchdog to the high availability tab in the new/edit vm
- functionality also availablt in templates
Change-Id: Ie3f72fabf35d32a05a75652ced362c5bee32b8d7
Signed-off-by: Laszlo Hornyak <lhorn...@redhat.com>
---
M
frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/CommonApplicationConstants.java
M
frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/uicommon/popup/AbstractVmPopupWidget.java
M
frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/uicommon/popup/AbstractVmPopupWidget.ui.xml
M
frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/Cloner.java
M
frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/templates/TemplateListModel.java
M
frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/userportal/UserPortalListModel.java
M
frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/ExistingVmModelBehavior.java
M
frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/NewVmModelBehavior.java
M
frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/PoolModelBehaviorBase.java
M
frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/TemplateVmModelBehavior.java
M
frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/UnitVmModel.java
M
frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/VmListModel.java
M
frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/VmSnapshotListModel.java
13 files changed, 117 insertions(+), 1 deletion(-)
git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/59/13059/1
diff --git
a/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/CommonApplicationConstants.java
b/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/CommonApplicationConstants.java
index 1fc3d0f..290de33 100644
---
a/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/CommonApplicationConstants.java
+++
b/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/CommonApplicationConstants.java
@@ -394,6 +394,12 @@
@DefaultStringValue("Highly Available")
String highlyAvailableVmPopup();
+ @DefaultStringValue("Watchdog Action")
+ String watchdogAction();
+
+ @DefaultStringValue("Watchdog Model")
+ String watchdogModel();
+
@DefaultStringValue("Template Provisioning")
String templateProvisVmPopup();
@@ -433,6 +439,9 @@
@DefaultStringValue("Priority for Run/Migration queue:")
String priorForRunMigrationQueueVmPopup();
+ @DefaultStringValue("Watchdog")
+ String watchdog();
+
@DefaultStringValue("Memory Allocation:")
String memAllocVmPopup();
diff --git
a/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/uicommon/popup/AbstractVmPopupWidget.java
b/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/uicommon/popup/AbstractVmPopupWidget.java
index 0866137..301fe5f 100644
---
a/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/uicommon/popup/AbstractVmPopupWidget.java
+++
b/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/uicommon/popup/AbstractVmPopupWidget.java
@@ -340,6 +340,17 @@
@WithElementId("priority")
public EntityModelCellTable<ListModel> priorityEditor;
+ @UiField(provided = true)
+ @Path(value = "watchdogModel.entity")
+ @WithElementId("watchdogModel")
+ public ListModelListBoxEditor<Object> watchdogModelEditor;
+
+ @UiField(provided = true)
+ @Path(value = "watchdogAction.entity")
+ @WithElementId("watchdogAction")
+ public ListModelListBoxEditor<Object> watchdogActionEditor;
+
+
// ==Resource Allocation Tab==
@UiField
protected DialogTab resourceAllocationTab;
@@ -475,6 +486,8 @@
// TODO: How to align right without creating the widget manually?
hostCpuEditor = new EntityModelCheckBoxEditor(Align.RIGHT);
isHighlyAvailableEditor = new EntityModelCheckBoxEditor(Align.RIGHT);
+ watchdogModelEditor = new ListModelListBoxEditor<Object>();
+ watchdogActionEditor = new ListModelListBoxEditor<Object>();
isStatelessEditor = new EntityModelCheckBoxEditor(Align.RIGHT);
isDeleteProtectedEditor = new EntityModelCheckBoxEditor(Align.RIGHT);
isSmartcardEnabledEditor = new EntityModelCheckBoxEditor(Align.RIGHT);
@@ -727,6 +740,10 @@
// High Availability Tab
isHighlyAvailableEditor.setLabel(constants.highlyAvailableVmPopup());
+
+ // watchdog
+ watchdogActionEditor.setLabel(constants.watchdogAction());
+ watchdogModelEditor.setLabel(constants.watchdogModel());
// Resource Allocation Tab
provisioningEditor.setLabel(constants.templateProvisVmPopup());
@@ -1100,6 +1117,9 @@
isHighlyAvailableEditor.setTabIndex(nextTabIndex++);
priorityEditor.setTabIndex(nextTabIndex++);
+ watchdogModelEditor.setTabIndex(nextTabIndex++);
+ watchdogActionEditor.setTabIndex(nextTabIndex++);
+
// ==Resource Allocation Tab==
nextTabIndex = resourceAllocationTab.setTabIndexes(nextTabIndex);
minAllocatedMemoryEditor.setTabIndex(nextTabIndex++);
diff --git
a/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/uicommon/popup/AbstractVmPopupWidget.ui.xml
b/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/uicommon/popup/AbstractVmPopupWidget.ui.xml
index 1288d98..fcd9372 100644
---
a/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/uicommon/popup/AbstractVmPopupWidget.ui.xml
+++
b/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/uicommon/popup/AbstractVmPopupWidget.ui.xml
@@ -356,6 +356,11 @@
<g:Label
addStyleNames="{style.sectionLabel}"
text="{constants.priorForRunMigrationQueueVmPopup}" />
<e:EntityModelCellTable
ui:field="priorityEditor" />
</g:FlowPanel>
+ <g:FlowPanel
addStyleNames="{style.sectionPanel}">
+ <g:Label
addStyleNames="{style.sectionLabel}" text="{constants.watchdog}" />
+
<e:ListModelListBoxEditor ui:field="watchdogModelEditor" />
+
<e:ListModelListBoxEditor ui:field="watchdogActionEditor" />
+ </g:FlowPanel>
</g:FlowPanel>
</t:content>
</t:DialogTab>
diff --git
a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/Cloner.java
b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/Cloner.java
index 6db6e58..23e15dd 100644
---
a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/Cloner.java
+++
b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/Cloner.java
@@ -94,6 +94,8 @@
// vm.ActualDiskWithSnapshotsSize =
instance.ActualDiskWithSnapshotsSize;
vm.setAppList(instance.getAppList());
vm.setAutoStartup(instance.isAutoStartup());
+ vm.setWatchdogAction(instance.getWatchdogAction());
+ vm.setWatchdogModel(instance.getWatchdogModel());
vm.setBootSequence(instance.getBootSequence());
vm.setClientIp(instance.getClientIp());
vm.setCpuPerSocket(instance.getCpuPerSocket());
@@ -360,6 +362,8 @@
obj.setDiskImageMap(instance.getDiskImageMap());
obj.setInterfaces(instance.getInterfaces());
obj.setAutoStartup(instance.isAutoStartup());
+ obj.setWatchdogAction(instance.getWatchdogAction());
+ obj.setWatchdogModel(instance.getWatchdogModel());
obj.setchild_count(instance.getchild_count());
obj.setCpuPerSocket(instance.getCpuPerSocket());
obj.setCreationDate(instance.getCreationDate());
@@ -399,6 +403,8 @@
obj.setIsoPath(instance.getIsoPath());
obj.setOrigin(instance.getOrigin());
obj.setAutoStartup(instance.isAutoStartup());
+ obj.setWatchdogAction(instance.getWatchdogAction());
+ obj.setWatchdogModel(instance.getWatchdogModel());
obj.setCpuPerSocket(instance.getCpuPerSocket());
obj.setCreationDate(instance.getCreationDate());
obj.setDedicatedVmForVds(instance.getDedicatedVmForVds());
diff --git
a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/templates/TemplateListModel.java
b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/templates/TemplateListModel.java
index deded26..0d7b3e7 100644
---
a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/templates/TemplateListModel.java
+++
b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/templates/TemplateListModel.java
@@ -524,6 +524,8 @@
template.setDefaultBootSequence(model.getBootSequence());
template.setIsoPath(model.getCdImage().getIsChangable() ? (String)
model.getCdImage().getSelectedItem() : ""); //$NON-NLS-1$
template.setAutoStartup((Boolean)
model.getIsHighlyAvailable().getEntity());
+ template.setWatchdogAction((String)
model.getWatchdogAction().getEntity());
+ template.setWatchdogModel((String)
model.getWatchdogModel().getEntity());
template.setKernelUrl((String) model.getKernel_path().getEntity());
template.setKernelParams((String)
model.getKernel_parameters().getEntity());
template.setInitrdUrl((String) model.getInitrd_path().getEntity());
diff --git
a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/userportal/UserPortalListModel.java
b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/userportal/UserPortalListModel.java
index 0cf56da..810a4c9 100644
---
a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/userportal/UserPortalListModel.java
+++
b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/userportal/UserPortalListModel.java
@@ -656,6 +656,8 @@
tempVar.setSmartcardEnabled((Boolean)
model.getIsSmartcardEnabled().getEntity());
tempVar.setDefaultBootSequence(model.getBootSequence());
tempVar.setAutoStartup((Boolean)
model.getIsHighlyAvailable().getEntity());
+
tempVar.setWatchdogAction((String)model.getWatchdogAction().getEntity());
+ tempVar.setWatchdogModel((String)model.getWatchdogModel().getEntity());
tempVar.setIsoPath(model.getCdImage().getIsChangable() ? (String)
model.getCdImage().getSelectedItem() : ""); //$NON-NLS-1$
tempVar.setInitrdUrl(vm.getInitrdUrl());
tempVar.setKernelUrl(vm.getKernelUrl());
@@ -1352,6 +1354,8 @@
gettempVm().setIsoPath(model.getCdImage().getIsChangable() ? (String)
model.getCdImage()
.getSelectedItem() : ""); //$NON-NLS-1$
gettempVm().setAutoStartup((Boolean)
model.getIsHighlyAvailable().getEntity());
+ gettempVm().setWatchdogAction((String)
model.getWatchdogAction().getEntity());
+ gettempVm().setWatchdogModel((String)
model.getWatchdogModel().getEntity());
gettempVm().setInitrdUrl((String) model.getInitrd_path().getEntity());
gettempVm().setKernelUrl((String) model.getKernel_path().getEntity());
diff --git
a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/ExistingVmModelBehavior.java
b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/ExistingVmModelBehavior.java
index 5214def..29a9439 100644
---
a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/ExistingVmModelBehavior.java
+++
b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/ExistingVmModelBehavior.java
@@ -123,6 +123,8 @@
getModel().getAllowConsoleReconnect().setEntity(vm.getAllowConsoleReconnect());
getModel().setBootSequence(vm.getDefaultBootSequence());
getModel().getIsHighlyAvailable().setEntity(vm.isAutoStartup());
+ getModel().getWatchdogModel().setEntity(vm.getWatchdogModel());
+ getModel().getWatchdogAction().setEntity(vm.getWatchdogAction());
getModel().getTotalCPUCores().setEntity(Integer.toString(vm.getNumOfCpus()));
getModel().getTotalCPUCores().setIsChangable(!vm.isRunning());
diff --git
a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/NewVmModelBehavior.java
b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/NewVmModelBehavior.java
index c412db1..f1930b3 100644
---
a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/NewVmModelBehavior.java
+++
b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/NewVmModelBehavior.java
@@ -94,6 +94,8 @@
getModel().getUsbPolicy().setSelectedItem(template.getUsbPolicy());
getModel().setBootSequence(template.getDefaultBootSequence());
getModel().getIsHighlyAvailable().setEntity(template.isAutoStartup());
+
getModel().getWatchdogModel().setEntity(template.getWatchdogModel());
+
getModel().getWatchdogAction().setEntity(template.getWatchdogAction());
updateHostPinning(template.getMigrationSupport());
doChangeDefautlHost(template.getDedicatedVmForVds());
diff --git
a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/PoolModelBehaviorBase.java
b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/PoolModelBehaviorBase.java
index b838696..d651921 100644
---
a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/PoolModelBehaviorBase.java
+++
b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/PoolModelBehaviorBase.java
@@ -118,6 +118,8 @@
getModel().getUsbPolicy().setSelectedItem(vmBase.getUsbPolicy());
getModel().setBootSequence(vmBase.getDefaultBootSequence());
getModel().getIsHighlyAvailable().setEntity(vmBase.isAutoStartup());
+ getModel().getWatchdogModel().setEntity(vmBase.getWatchdogModel());
+
getModel().getWatchdogAction().setEntity(vmBase.getWatchdogAction());
getModel().getIsDeleteProtected().setEntity(vmBase.isDeleteProtected());
getModel().getIsSmartcardEnabled().setEntity(vmBase.isSmartcardEnabled());
diff --git
a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/TemplateVmModelBehavior.java
b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/TemplateVmModelBehavior.java
index 7c7df0c..75d3263 100644
---
a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/TemplateVmModelBehavior.java
+++
b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/TemplateVmModelBehavior.java
@@ -146,6 +146,8 @@
getModel().getAllowConsoleReconnect().setEntity(this.template.isAllowConsoleReconnect());
getModel().setBootSequence(this.template.getDefaultBootSequence());
getModel().getIsHighlyAvailable().setEntity(this.template.isAutoStartup());
+
getModel().getWatchdogAction().setEntity(this.template.getWatchdogAction());
+
getModel().getWatchdogModel().setEntity(this.template.getWatchdogModel());
getModel().getTotalCPUCores().setEntity(Integer.toString(this.template.getNumOfCpus()));
getModel().getNumOfSockets().setSelectedItem(this.template.getNumOfSockets());
getModel().getIsStateless().setEntity(this.template.isStateless());
diff --git
a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/UnitVmModel.java
b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/UnitVmModel.java
index 0a383e5..9325f90 100644
---
a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/UnitVmModel.java
+++
b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/UnitVmModel.java
@@ -1124,6 +1124,24 @@
setHostCpu(new NotChangableForVmInPoolEntityModel());
getHostCpu().getEntityChangedEvent().addListener(this);
+ setWatchdogAction(new NotChangableForVmInPoolListModel());
+ getWatchdogAction().getEntityChangedEvent().addListener(this);
+ ArrayList<String> watchDogActions = new ArrayList<String>();
+ watchDogActions.add("none"); //$NON-NLS-1$
+ watchDogActions.add("reset"); //$NON-NLS-1$
+ watchDogActions.add("shutdown"); //$NON-NLS-1$
+ watchDogActions.add("dump"); //$NON-NLS-1$
+ watchDogActions.add("pause"); //$NON-NLS-1$
+ getWatchdogAction().setItems(watchDogActions);
+
+ setWatchdogModel(new NotChangableForVmInPoolListModel());
+ getWatchdogModel().getEntityChangedEvent().addListener(this);
+ ArrayList<String> watchDogModels = new ArrayList<String>();
+ watchDogModels.add(""); //$NON-NLS-1$
+ watchDogModels.add("i6300esb"); //$NON-NLS-1$
+ watchDogModels.add("ib700"); //$NON-NLS-1$
+ getWatchdogModel().setItems(watchDogModels);
+
setIsAutoAssign(new NotChangableForVmInPoolEntityModel());
getIsAutoAssign().getEntityChangedEvent().addListener(this);
@@ -1209,7 +1227,7 @@
InitAllowConsoleReconnect();
InitMinimalVmMemSize();
InitMaximalVmMemSize32OS();
- initMigrationMode();
+ InitWatchdog();
behavior.Initialize(SystemTreeSelectedItem);
}
@@ -1308,7 +1326,18 @@
if ((Boolean) getProvisioningClone_IsSelected().getEntity()) {
getProvisioning().setEntity(true);
}
+ } else if (sender == getWatchdogModel()) {
+ WatchdogModel_EntityChanged(sender, args);
}
+ }
+ }
+
+ private void WatchdogModel_EntityChanged(Object sender, EventArgs args) {
+ if("".equals(getWatchdogModel().getEntity())) {
+ getWatchdogAction().setIsChangable(false);
+ getWatchdogAction().setEntity(""); //$NON-NLS-1$
+ } else {
+ getWatchdogAction().setIsChangable(true);
}
}
@@ -2158,4 +2187,28 @@
super.setIsChangable(value);
}
}
+
+ private ListModel watchdogModel;
+ public ListModel getWatchdogModel() {
+ return watchdogModel;
+ }
+
+ public void setWatchdogModel(ListModel watchdogModel) {
+ this.watchdogModel = watchdogModel;
+ }
+
+ private ListModel watchdogAction;
+
+ public ListModel getWatchdogAction() {
+ return watchdogAction;
+ }
+
+ public void setWatchdogAction(ListModel watchdogAction) {
+ this.watchdogAction = watchdogAction;
+ }
+
+ private void InitWatchdog() {
+//lofasz
+ }
+
}
diff --git
a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/VmListModel.java
b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/VmListModel.java
index 5389958..b6321da 100644
---
a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/VmListModel.java
+++
b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/VmListModel.java
@@ -1752,6 +1752,8 @@
model.getCommands().add(tempVar2);
model.getIsHighlyAvailable().setEntity(vm.getStaticData().isAutoStartup());
+ model.getWatchdogAction().setEntity(vm.getWatchdogAction());
+ model.getWatchdogModel().setEntity(vm.getWatchdogModel());
}
private void OnNewTemplate()
@@ -1838,6 +1840,8 @@
tempVar.setDeleteProtected((Boolean)
model.getIsDeleteProtected().getEntity());
tempVar.setDefaultBootSequence(model.getBootSequence());
tempVar.setAutoStartup((Boolean)
model.getIsHighlyAvailable().getEntity());
+
tempVar.setWatchdogAction((String)model.getWatchdogAction().getEntity());
+ tempVar.setWatchdogModel((String)model.getWatchdogModel().getEntity());
tempVar.setIsoPath(model.getCdImage().getIsChangable() ? (String)
model.getCdImage().getSelectedItem() : ""); //$NON-NLS-1$
tempVar.setUsbPolicy(vm.getUsbPolicy());
tempVar.setInitrdUrl(vm.getInitrdUrl());
@@ -2413,6 +2417,9 @@
: ""); //$NON-NLS-1$
getcurrentVm().setAutoStartup((Boolean)
model.getIsHighlyAvailable().getEntity());
+ getcurrentVm().setWatchdogAction((String)
model.getWatchdogAction().getEntity());
+ getcurrentVm().setWatchdogModel((String)
model.getWatchdogModel().getEntity());
+
getcurrentVm().setInitrdUrl((String)
model.getInitrd_path().getEntity());
getcurrentVm().setKernelUrl((String)
model.getKernel_path().getEntity());
getcurrentVm().setKernelParams((String)
model.getKernel_parameters().getEntity());
diff --git
a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/VmSnapshotListModel.java
b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/VmSnapshotListModel.java
index 205e78b..6a95c4d 100644
---
a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/VmSnapshotListModel.java
+++
b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/VmSnapshotListModel.java
@@ -579,6 +579,8 @@
getcurrentVm().setIsoPath(model.getCdImage().getIsChangable() ?
(String) model.getCdImage().getSelectedItem() : "");
//$NON-NLS-1$
getcurrentVm().setAutoStartup((Boolean)
model.getIsHighlyAvailable().getEntity());
+
getcurrentVm().setWatchdogAction((String)model.getWatchdogAction().getEntity());
+
getcurrentVm().setWatchdogModel((String)model.getWatchdogModel().getEntity());
getcurrentVm().setInitrdUrl((String)
model.getInitrd_path().getEntity());
getcurrentVm().setKernelUrl((String)
model.getKernel_path().getEntity());
getcurrentVm().setKernelParams((String)
model.getKernel_parameters().getEntity());
--
To view, visit http://gerrit.ovirt.org/13059
To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ie3f72fabf35d32a05a75652ced362c5bee32b8d7
Gerrit-PatchSet: 1
Gerrit-Project: ovirt-engine
Gerrit-Branch: master
Gerrit-Owner: Laszlo Hornyak <lhorn...@redhat.com>
_______________________________________________
Engine-patches mailing list
Engine-patches@ovirt.org
http://lists.ovirt.org/mailman/listinfo/engine-patches
