Omer Frenkel has uploaded a new change for review.
Change subject: webadmin: edit running vm
......................................................................
webadmin: edit running vm
Add column in vm main tab to show if vm has next-run configuration.
on edit vm, get the next-run configuration if available.
Change-Id: Ica093428d180fb280d53fd40dc5a4109b2aa842e
Signed-off-by: Omer Frenkel <ofren...@redhat.com>
---
M
frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/dataprovider/AsyncDataProvider.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/VmListModel.java
M
frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/tab/MainTabVirtualMachineView.java
A
frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/widget/table/column/NextRunConfigurationColumn.java
5 files changed, 34 insertions(+), 7 deletions(-)
git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/69/27369/1
diff --git
a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/dataprovider/AsyncDataProvider.java
b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/dataprovider/AsyncDataProvider.java
index b10e5d2..cbfc2de 100644
---
a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/dataprovider/AsyncDataProvider.java
+++
b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/dataprovider/AsyncDataProvider.java
@@ -646,6 +646,17 @@
Frontend.getInstance().runQuery(VdcQueryType.GetVmByVmId, new
IdQueryParameters(vmId), aQuery);
}
+ public static void getVmNextRunConfiguration(AsyncQuery aQuery, Guid vmId)
{
+ aQuery.converterCallback = new IAsyncConverter() {
+ @Override
+ public Object Convert(Object source, AsyncQuery _asyncQuery)
+ {
+ return source;
+ }
+ };
+
Frontend.getInstance().runQuery(VdcQueryType.GetVmNextRunConfiguration, new
IdQueryParameters(vmId), aQuery);
+ }
+
public static void getDataCenterList(AsyncQuery aQuery) {
aQuery.converterCallback = new IAsyncConverter() {
@Override
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 725d195..6936b88 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
@@ -166,7 +166,6 @@
getModel().getDescription().setEntity(vm.getVmDescription());
getModel().getComment().setEntity(vm.getComment());
getModel().getMemSize().setEntity(vm.getVmMemSizeMb());
- getModel().getMemSize().setIsChangable(vm.isDown());
getModel().getMinAllocatedMemory().setEntity(vm.getMinAllocatedMem());
getModel().getOSType().setSelectedItem(vm.getVmOsId());
getModel().getUsbPolicy().setSelectedItem(vm.getUsbPolicy());
@@ -177,13 +176,11 @@
getModel().getIsHighlyAvailable().setEntity(vm.isAutoStartup());
getModel().getTotalCPUCores().setEntity(Integer.toString(vm.getNumOfCpus()));
- getModel().getTotalCPUCores().setIsChangable(!vm.isRunning());
getModel().getIsStateless().setEntity(vm.isStateless());
getModel().getIsStateless().setIsAvailable(vm.getVmPoolId() == null);
getModel().getIsRunAndPause().setEntity(vm.isRunAndPause());
- getModel().getIsRunAndPause().setIsChangable(!vm.isRunning());
getModel().getIsRunAndPause().setIsAvailable(vm.getVmPoolId() == null);
getModel().getIsSmartcardEnabled().setEntity(vm.isSmartcardEnabled());
@@ -191,9 +188,6 @@
getModel().selectSsoMethod(vm.getSsoMethod());
getModel().getNumOfSockets().setSelectedItem(vm.getNumOfSockets());
- getModel().getNumOfSockets().setIsChangable(isHotSetCpuSupported() ||
!vm.isRunning());
-
- getModel().getCoresPerSocket().setIsChangable(!vm.isRunning());
getModel().getKernel_parameters().setEntity(vm.getKernelParams());
getModel().getKernel_path().setEntity(vm.getKernelUrl());
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 e37ce1f..c230e12 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
@@ -765,7 +765,11 @@
vmInitLoaded((VM) result);
}
};
- AsyncDataProvider.getVmById(getVmInitQuery, vm.getId());
+ if (vm.isNextRunConfigurationExists()) {
+ AsyncDataProvider.getVmNextRunConfiguration(getVmInitQuery,
vm.getId());
+ } else {
+ AsyncDataProvider.getVmById(getVmInitQuery, vm.getId());
+ }
}
diff --git
a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/tab/MainTabVirtualMachineView.java
b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/tab/MainTabVirtualMachineView.java
index b656ed5..f321d20 100644
---
a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/tab/MainTabVirtualMachineView.java
+++
b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/tab/MainTabVirtualMachineView.java
@@ -30,6 +30,7 @@
import
org.ovirt.engine.ui.webadmin.widget.action.WebAdminImageButtonDefinition;
import
org.ovirt.engine.ui.webadmin.widget.action.WebAdminMenuBarButtonDefinition;
import org.ovirt.engine.ui.webadmin.widget.table.column.CommentColumn;
+import
org.ovirt.engine.ui.webadmin.widget.table.column.NextRunConfigurationColumn;
import org.ovirt.engine.ui.webadmin.widget.table.column.OneColorPercentColumn;
import org.ovirt.engine.ui.webadmin.widget.table.column.PercentColumn;
import org.ovirt.engine.ui.webadmin.widget.table.column.ProgressBarColumn;
@@ -69,6 +70,8 @@
getTable().addColumn(new VmTypeColumn(), constants.empty(), "30px");
//$NON-NLS-1$
+ getTable().addColumn(new NextRunConfigurationColumn(),
constants.empty(), "30px"); //$NON-NLS-1$
+
TextColumnWithTooltip<VM> nameColumn = new TextColumnWithTooltip<VM>()
{
@Override
public String getValue(VM object) {
diff --git
a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/widget/table/column/NextRunConfigurationColumn.java
b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/widget/table/column/NextRunConfigurationColumn.java
new file mode 100644
index 0000000..3e3f466
--- /dev/null
+++
b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/widget/table/column/NextRunConfigurationColumn.java
@@ -0,0 +1,15 @@
+package org.ovirt.engine.ui.webadmin.widget.table.column;
+
+import com.google.gwt.resources.client.ImageResource;
+import org.ovirt.engine.core.common.businessentities.VM;
+
+public class NextRunConfigurationColumn extends
WebAdminImageResourceColumn<VM> {
+
+ @Override
+ public ImageResource getValue(VM vm) {
+ if (vm.isNextRunConfigurationExists()) {
+ return getApplicationResources().arrowRightMiddle();
+ }
+ return getApplicationResources().arrowLeft();
+ }
+}
--
To view, visit http://gerrit.ovirt.org/27369
To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ica093428d180fb280d53fd40dc5a4109b2aa842e
Gerrit-PatchSet: 1
Gerrit-Project: ovirt-engine
Gerrit-Branch: master
Gerrit-Owner: Omer Frenkel <ofren...@redhat.com>
_______________________________________________
Engine-patches mailing list
Engine-patches@ovirt.org
http://lists.ovirt.org/mailman/listinfo/engine-patches
