Xiaolei Shi has uploaded a new change for review.
Change subject: core: move vm numa fields to VmBase
......................................................................
core: move vm numa fields to VmBase
Move vm numa related fields to VmBase entity since the fields will also
be called in VmTemplate.
Change-Id: Icc69f8167b8468becef728617ec850dc9034d88f
Signed-off-by: Bruce Shi <xiao-lei....@hp.com>
---
M
backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/VmBase.java
M
backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/VmStatic.java
2 files changed, 29 insertions(+), 31 deletions(-)
git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/41/28341/1
diff --git
a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/VmBase.java
b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/VmBase.java
index 8f5d44c..e0337d7 100644
---
a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/VmBase.java
+++
b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/VmBase.java
@@ -219,6 +219,10 @@
@Min(value = 0, message = "VALIDATION.VM.MIGRATION_DOWNTIME_RANGE")
private Integer migrationDowntime;
+ private NumaTuneMode numaTuneMode;
+
+ private List<VmNumaNode> vNumaNodeList;
+
public VmBase() {
name = "";
interfaces = new ArrayList<VmNetworkInterface>();
@@ -239,6 +243,8 @@
singleQxlPci = true;
spiceFileTransferEnabled = true;
spiceCopyPasteEnabled = true;
+ setNumaTuneMode(NumaTuneMode.INTERLEAVE);
+ vNumaNodeList = new ArrayList<VmNumaNode>();
}
@EditableField
@@ -810,6 +816,8 @@
result = prime * result + (bootMenuEnabled ? 1231 : 1237);
result = prime * result + (spiceFileTransferEnabled ? 1231 : 1237);
result = prime * result + (spiceCopyPasteEnabled ? 1231 : 1237);
+ result = prime * result + ((numaTuneMode == null) ? 0 :
numaTuneMode.getValue().hashCode());
+ result = prime * result + ((vNumaNodeList == null) ? 0 :
vNumaNodeList.hashCode());
return result;
}
@@ -859,12 +867,14 @@
&& ObjectUtils.objectsEqual(vncKeyboardLayout,
other.vncKeyboardLayout)
&& ObjectUtils.objectsEqual(createdByUserId,
other.createdByUserId)
&& cpuShares == other.cpuShares
- && ObjectUtils.objectsEqual(migrationDowntime,
other.migrationDowntime))
+ && ObjectUtils.objectsEqual(migrationDowntime,
other.migrationDowntime)
&& serialNumberPolicy == other.serialNumberPolicy
&& ObjectUtils.objectsEqual(customSerialNumber,
other.customSerialNumber)
&& bootMenuEnabled == other.bootMenuEnabled
&& spiceFileTransferEnabled == other.spiceFileTransferEnabled
- && spiceCopyPasteEnabled == other.spiceCopyPasteEnabled;
+ && spiceCopyPasteEnabled == other.spiceCopyPasteEnabled
+ && ObjectUtils.objectsEqual(numaTuneMode.getValue(),
other.numaTuneMode.getValue())
+ && ObjectUtils.objectsEqual(vNumaNodeList,
other.vNumaNodeList));
}
public Guid getQuotaId() {
@@ -1035,4 +1045,21 @@
public boolean isSpiceCopyPasteEnabled() { return spiceCopyPasteEnabled; }
public void setSpiceCopyPasteEnabled(boolean spiceCopyPasteEnabled) {
this.spiceCopyPasteEnabled = spiceCopyPasteEnabled; }
+
+ public NumaTuneMode getNumaTuneMode() {
+ return numaTuneMode;
+ }
+
+ public void setNumaTuneMode(NumaTuneMode numaTuneMode) {
+ this.numaTuneMode = numaTuneMode;
+ }
+
+ public List<VmNumaNode> getvNumaNodeList() {
+ return vNumaNodeList;
+ }
+
+ public void setvNumaNodeList(List<VmNumaNode> vNumaNodeList) {
+ this.vNumaNodeList = vNumaNodeList;
+ }
+
}
diff --git
a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/VmStatic.java
b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/VmStatic.java
index 9ac86ba..5673851 100644
---
a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/VmStatic.java
+++
b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/VmStatic.java
@@ -1,8 +1,5 @@
package org.ovirt.engine.core.common.businessentities;
-import java.util.ArrayList;
-import java.util.List;
-
import javax.validation.constraints.Size;
import javax.validation.groups.Default;
@@ -58,10 +55,6 @@
@EditableField
private boolean useLatestVersion;
- private NumaTuneMode numaTuneMode;
-
- private List<VmNumaNode> vNumaNodeList;
-
public VmStatic() {
setNumOfMonitors(1);
initialized = false;
@@ -71,8 +64,6 @@
setDefaultDisplayType(DisplayType.qxl);
setVmType(VmType.Desktop);
vmtGuid = Guid.Empty;
- setNumaTuneMode(NumaTuneMode.INTERLEAVE);
- vNumaNodeList = new ArrayList<VmNumaNode>();
customProperties = "";
}
@@ -178,8 +169,6 @@
result = prime * result + ((originalTemplateGuid == null) ? 0 :
originalTemplateGuid.hashCode());
result = prime * result + ((originalTemplateName == null) ? 0 :
originalTemplateName.hashCode());
result = prime * result + (useLatestVersion ? 1249 : 1259);
- result = prime * result + ((numaTuneMode == null) ? 0 :
numaTuneMode.getValue().hashCode());
- result = prime * result + ((vNumaNodeList == null) ? 0 :
vNumaNodeList.hashCode());
return result;
}
@@ -208,8 +197,6 @@
&& ObjectUtils.objectsEqual(originalTemplateGuid,
other.originalTemplateGuid)
&& ObjectUtils.objectsEqual(originalTemplateName,
other.originalTemplateName)
&& useLatestVersion == other.useLatestVersion
- && ObjectUtils.objectsEqual(numaTuneMode.getValue(),
other.numaTuneMode.getValue())
- && ObjectUtils.objectsEqual(vNumaNodeList, other.vNumaNodeList)
);
}
@@ -267,22 +254,6 @@
public void setUseLatestVersion(boolean useLatestVersion) {
this.useLatestVersion = useLatestVersion;
- }
-
- public NumaTuneMode getNumaTuneMode() {
- return numaTuneMode;
- }
-
- public void setNumaTuneMode(NumaTuneMode numaTuneMode) {
- this.numaTuneMode = numaTuneMode;
- }
-
- public List<VmNumaNode> getvNumaNodeList() {
- return vNumaNodeList;
- }
-
- public void setvNumaNodeList(List<VmNumaNode> vNumaNodeList) {
- this.vNumaNodeList = vNumaNodeList;
}
}
--
To view, visit http://gerrit.ovirt.org/28341
To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Icc69f8167b8468becef728617ec850dc9034d88f
Gerrit-PatchSet: 1
Gerrit-Project: ovirt-engine
Gerrit-Branch: master
Gerrit-Owner: Xiaolei Shi <xiao-lei....@hp.com>
_______________________________________________
Engine-patches mailing list
Engine-patches@ovirt.org
http://lists.ovirt.org/mailman/listinfo/engine-patches
