Omer Frenkel has uploaded a new change for review.
Change subject: frontend: add memory to edit running vm dialog
......................................................................
frontend: add memory to edit running vm dialog
show user also memory can be hot plugged when updating a running vm.
Change-Id: I2762e34c23d56ec1bb5d0c40b1e8742e4a8492c7
Signed-off-by: Omer Frenkel <ofren...@redhat.com>
---
M
frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/CommonApplicationMessages.java
M
frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/uicommon/popup/vm/VmNextRunConfigurationWidget.java
M
frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/uicommon/popup/vm/VmNextRunConfigurationWidget.ui.xml
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/VmListModel.java
M
frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/VmNextRunConfigurationModel.java
6 files changed, 42 insertions(+), 5 deletions(-)
git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/25/42125/1
diff --git
a/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/CommonApplicationMessages.java
b/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/CommonApplicationMessages.java
index d39e6df..5c04d88 100644
---
a/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/CommonApplicationMessages.java
+++
b/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/CommonApplicationMessages.java
@@ -155,9 +155,15 @@
@DefaultMessage("Some of the changes will be applied only on the vm next
start.")
String nextRunConfigurationExists();
- @DefaultMessage("The following values can be applied immediately:<br/>-
cpu")
+ @DefaultMessage("The following values can be applied immediately:<br/>")
String nextRunConfigurationCanBeAppliedImmediately();
+ @DefaultMessage("- cpu<br/>")
+ String nextRunConfigurationCpuValue();
+
+ @DefaultMessage("- memory<br/>")
+ String nextRunConfigurationMemoryValue();
+
@DefaultMessage("{0} (Previewing: {1})")
String snapshotPreviewing(String snapshotDescription, String diskAliases);
diff --git
a/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/uicommon/popup/vm/VmNextRunConfigurationWidget.java
b/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/uicommon/popup/vm/VmNextRunConfigurationWidget.java
index 6aa7615..f219e94 100644
---
a/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/uicommon/popup/vm/VmNextRunConfigurationWidget.java
+++
b/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/uicommon/popup/vm/VmNextRunConfigurationWidget.java
@@ -40,7 +40,15 @@
@UiField
@Ignore
- HTML message2;
+ HTML applyNowTitleMessage;
+
+ @UiField
+ @Ignore
+ HTML applyNowCpuMessage;
+
+ @UiField
+ @Ignore
+ HTML applyNowMemoryMessage;
@UiField
@Ignore
@@ -67,7 +75,10 @@
private final static CommonApplicationConstants constants =
AssetProvider.getConstants();
private final static CommonApplicationMessages messages =
AssetProvider.getMessages();
+ StringBuilder hotPlugFieldsText;
+
public VmNextRunConfigurationWidget() {
+ hotPlugFieldsText = new StringBuilder();
initEditors();
initWidget(ViewUiBinder.uiBinder.createAndBindUi(this));
localize();
@@ -82,7 +93,9 @@
void localize() {
message1.setHTML(listItem(messages.nextRunConfigurationExists()));
-
message2.setHTML(listItem(messages.nextRunConfigurationCanBeAppliedImmediately()));
+
applyNowTitleMessage.setHTML(listItem(messages.nextRunConfigurationCanBeAppliedImmediately()));
+
applyNowCpuMessage.setHTML(listItem(messages.nextRunConfigurationCpuValue()));
+
applyNowMemoryMessage.setHTML(listItem(messages.nextRunConfigurationMemoryValue()));
applyCpuLaterEditor.setLabel(constants.applyLater());
changedFieldsExpander.setTitleWhenExpanded(constants.changedFieldsList());
@@ -96,7 +109,9 @@
@Override
public void edit(VmNextRunConfigurationModel object) {
driver.edit(object);
- cpuPanel.setVisible(object.isCpuPluggable());
+ cpuPanel.setVisible(object.isCpuPluggable() ||
object.isMemoryPluggable());
+ applyNowCpuMessage.setVisible(object.isCpuPluggable());
+ applyNowMemoryMessage.setVisible(object.isMemoryPluggable());
SafeHtmlBuilder changedFieldsBuilder = new SafeHtmlBuilder();
for (String field: object.getChangedFields()) {
@@ -104,6 +119,7 @@
changedFieldsBuilder.append(listItem(escapedField));
}
changedFields.setHTML(changedFieldsBuilder.toSafeHtml());
+
}
@Override
diff --git
a/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/uicommon/popup/vm/VmNextRunConfigurationWidget.ui.xml
b/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/uicommon/popup/vm/VmNextRunConfigurationWidget.ui.xml
index 77bb54d..38ca0bf 100644
---
a/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/uicommon/popup/vm/VmNextRunConfigurationWidget.ui.xml
+++
b/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/uicommon/popup/vm/VmNextRunConfigurationWidget.ui.xml
@@ -24,7 +24,9 @@
<g:HTML ui:field="changedFields" />
</g:FlowPanel>
<g:FlowPanel ui:field="cpuPanel">
- <g:HTML ui:field="message2" />
+ <g:HTML ui:field="applyNowTitleMessage" />
+ <g:HTML ui:field="applyNowCpuMessage" />
+ <g:HTML ui:field="applyNowMemoryMessage" />
<ge:EntityModelCheckBoxEditor ui:field="applyCpuLaterEditor"
addStyleNames="{style.contentWidgets}"/>
</g:FlowPanel>
</g:FlowPanel>
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 ef27819..abfd0c3 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
@@ -1098,6 +1098,8 @@
confirmModel.setChangedFields(changedFields);
confirmModel.setCpuPluggable(selectedItem.getCpuPerSocket() ==
gettempVm().getCpuPerSocket() &&
selectedItem.getNumOfSockets() !=
gettempVm().getNumOfSockets());
+ // currentl only hot plug memory is supported here
(no hot unplug)
+
confirmModel.setMemoryPluggable(selectedItem.getMemSizeMb() <
gettempVm().getMemSizeMb());
confirmModel.getCommands().add(new
UICommand("updateExistingVm", UserPortalListModel.this) //$NON-NLS-1$
.setTitle(ConstantsManager.getInstance().getConstants().ok())
.setIsDefault(true));
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 2c08ce5..64070bd 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
@@ -1877,6 +1877,8 @@
confirmModel.setChangedFields(changedFields);
confirmModel.setCpuPluggable(selectedItem.getCpuPerSocket() ==
getcurrentVm().getCpuPerSocket() &&
selectedItem.getNumOfSockets() !=
getcurrentVm().getNumOfSockets());
+ // currentl only hot plug memory is supported here (no
hot unplug)
+
confirmModel.setMemoryPluggable(selectedItem.getMemSizeMb() <
getcurrentVm().getMemSizeMb());
confirmModel.getCommands().add(new
UICommand("updateExistingVm", VmListModel.this) //$NON-NLS-1$
.setTitle(ConstantsManager.getInstance().getConstants().ok())
diff --git
a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/VmNextRunConfigurationModel.java
b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/VmNextRunConfigurationModel.java
index 0f6091a..8791f32 100644
---
a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/VmNextRunConfigurationModel.java
+++
b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/VmNextRunConfigurationModel.java
@@ -9,6 +9,7 @@
private EntityModel<Boolean> applyCpuLater;
private boolean cpuPluggable;
+ private boolean memoryPluggable;
private List<String> changedFields;
public VmNextRunConfigurationModel() {
@@ -38,4 +39,12 @@
public void setChangedFields(List<String> changedFields) {
this.changedFields = changedFields;
}
+
+ public boolean isMemoryPluggable() {
+ return memoryPluggable;
+ }
+
+ public void setMemoryPluggable(boolean memoryPluggable) {
+ this.memoryPluggable = memoryPluggable;
+ }
}
--
To view, visit https://gerrit.ovirt.org/42125
To unsubscribe, visit https://gerrit.ovirt.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I2762e34c23d56ec1bb5d0c40b1e8742e4a8492c7
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
