Omer Frenkel has uploaded a new change for review.
Change subject: core: fix constructors for vmBase classes
......................................................................
core: fix constructors for vmBase classes
Change-Id: Ia74cc3633680f727f9912bc58d9a3183f048e648
Signed-off-by: Omer Frenkel <ofren...@redhat.com>
---
M
backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/AddVmTemplateCommand.java
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
M
backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/VmTemplate.java
4 files changed, 93 insertions(+), 75 deletions(-)
git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/74/22974/1
diff --git
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/AddVmTemplateCommand.java
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/AddVmTemplateCommand.java
index 63be43c..72ab762 100644
---
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/AddVmTemplateCommand.java
+++
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/AddVmTemplateCommand.java
@@ -414,7 +414,8 @@
0,
new Date(),
getParameters().getDescription(),
- getParameters().getMasterVm().getMemSizeMb(),
getVmTemplateName(),
+ getParameters().getMasterVm().getMemSizeMb(),
+ getVmTemplateName(),
getParameters().getMasterVm().getNumOfSockets(),
getParameters().getMasterVm().getCpuPerSocket(),
getParameters().getMasterVm().getOsId(),
@@ -440,18 +441,18 @@
getParameters().getMasterVm().isStateless(),
getParameters().getMasterVm().isRunAndPause(),
getUserId(),
- getParameters().getTemplateType()));
-
getVmTemplate().setAutoStartup(getParameters().getMasterVm().isAutoStartup());
-
getVmTemplate().setPriority(getParameters().getMasterVm().getPriority());
-
getVmTemplate().setDefaultDisplayType(getParameters().getMasterVm().getDefaultDisplayType());
-
getVmTemplate().setInitrdUrl(getParameters().getMasterVm().getInitrdUrl());
-
getVmTemplate().setKernelUrl(getParameters().getMasterVm().getKernelUrl());
-
getVmTemplate().setKernelParams(getParameters().getMasterVm().getKernelParams());
- getVmTemplate().setQuotaId(getParameters().getMasterVm().getQuotaId());
-
getVmTemplate().setDedicatedVmForVds(getParameters().getMasterVm().getDedicatedVmForVds());
-
getVmTemplate().setMigrationSupport(getParameters().getMasterVm().getMigrationSupport());
-
getVmTemplate().setAllowConsoleReconnect(getParameters().getMasterVm().isAllowConsoleReconnect());
- getVmTemplate().setIsoPath(getParameters().getMasterVm().getIsoPath());
+ getParameters().getTemplateType(),
+ getParameters().getMasterVm().isAutoStartup(),
+ getParameters().getMasterVm().getPriority(),
+ getParameters().getMasterVm().getDefaultDisplayType(),
+ getParameters().getMasterVm().getInitrdUrl(),
+ getParameters().getMasterVm().getKernelUrl(),
+ getParameters().getMasterVm().getKernelParams(),
+ getParameters().getMasterVm().getQuotaId(),
+ getParameters().getMasterVm().getDedicatedVmForVds(),
+ getParameters().getMasterVm().getMigrationSupport(),
+
getParameters().getMasterVm().isAllowConsoleReconnect(),
+ getParameters().getMasterVm().getIsoPath()));
DbFacade.getInstance().getVmTemplateDao().save(getVmTemplate());
getCompensationContext().snapshotNewEntity(getVmTemplate());
setActionReturnValue(getVmTemplate().getId());
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 c0cf842..ddeef07 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
@@ -226,7 +226,7 @@
@EditableOnVmStatusField
@EditableOnTemplate
- protected DisplayType defaultDisplayType;
+ private DisplayType defaultDisplayType;
@EditableOnVmStatusField
@EditableOnTemplate
@@ -243,7 +243,9 @@
private Guid createdByUserId;
- public VmBase(Guid id,
+ public VmBase(
+ String name,
+ Guid id,
Guid vdsGroupId,
int osId,
Date creationDate,
@@ -278,8 +280,13 @@
String vncKeyboardLayout,
int minAllocatedMem,
boolean runAndPause,
- Guid createdByUserId) {
+ Guid createdByUserId,
+ MigrationSupport migrationSupport,
+ boolean allowConsoleReconnect,
+ Guid dedicatedVmForVds,
+ DisplayType defaultDisplayType) {
this();
+ this.name = name;
this.id = id;
this.vdsGroupId = vdsGroupId;
this.osId = osId;
@@ -315,8 +322,11 @@
this.minAllocatedMem = minAllocatedMem;
this.runAndPause = runAndPause;
this.createdByUserId = createdByUserId;
- defaultDisplayType = DisplayType.qxl;
+ this.defaultDisplayType = defaultDisplayType;
setQuotaId(quotaId);
+ this.migrationSupport = migrationSupport;
+ this.allowConsoleReconnect = allowConsoleReconnect;
+ this.dedicatedVmForVds = dedicatedVmForVds;
}
public long getDbGeneration() {
@@ -659,6 +669,7 @@
result = prime * result + ((tunnelMigration == null) ? 0 :
tunnelMigration.hashCode());
result = prime * result + ((vncKeyboardLayout == null) ? 0 :
vncKeyboardLayout.hashCode());
result = prime * result + ((createdByUserId == null) ? 0 :
createdByUserId.hashCode());
+ result = prime * result + ((defaultDisplayType == null) ? 0 :
defaultDisplayType.hashCode());
return result;
}
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 9b873f2..b887fa6 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
@@ -57,57 +57,60 @@
setNiceLevel(0);
setCpuShares(0);
setDefaultBootSequence(BootSequence.C);
- defaultDisplayType = DisplayType.qxl;
+ setDefaultDisplayType(DisplayType.qxl);
setVmType(VmType.Desktop);
vmtGuid = Guid.Empty;
}
public VmStatic(VmStatic vmStatic) {
- super(vmStatic.getId(),
- vmStatic.getVdsGroupId(),
- vmStatic.getOsId(),
- vmStatic.getCreationDate(),
- vmStatic.getDescription(),
- vmStatic.getComment(),
- vmStatic.getMemSizeMb(),
- vmStatic.getNumOfSockets(),
- vmStatic.getCpuPerSocket(),
- vmStatic.getNumOfMonitors(),
- vmStatic.getSingleQxlPci(),
- vmStatic.getDomain(),
- vmStatic.getTimeZone(),
- vmStatic.getVmType(),
- vmStatic.getUsbPolicy(),
- vmStatic.isFailBack(),
- vmStatic.getDefaultBootSequence(),
- vmStatic.getNiceLevel(),
- vmStatic.getCpuShares(),
- vmStatic.getPriority(),
- vmStatic.isAutoStartup(),
- vmStatic.isStateless(),
- vmStatic.getIsoPath(),
- vmStatic.getOrigin(),
- vmStatic.getKernelUrl(),
- vmStatic.getKernelParams(),
- vmStatic.getInitrdUrl(),
- vmStatic.getQuotaId(),
- vmStatic.isSmartcardEnabled(),
- vmStatic.isDeleteProtected(),
- vmStatic.getSsoMethod(),
- vmStatic.getTunnelMigration(),
- vmStatic.getVncKeyboardLayout(),
- vmStatic.getMinAllocatedMem(),
- vmStatic.isRunAndPause(),
- vmStatic.getCreatedByUserId());
- setName(vmStatic.getName());
+ this((VmBase)vmStatic);
vmtGuid = vmStatic.getVmtGuid();
setCustomProperties(vmStatic.getCustomProperties());
- setNumOfMonitors(vmStatic.getNumOfMonitors());
setInitialized(vmStatic.isInitialized());
- setDefaultDisplayType(vmStatic.getDefaultDisplayType());
- setDedicatedVmForVds(vmStatic.getDedicatedVmForVds());
- setMigrationSupport(vmStatic.getMigrationSupport());
- setAllowConsoleReconnect(vmStatic.isAllowConsoleReconnect());
+ }
+
+ public VmStatic(VmBase vmBase) {
+ super(vmBase.getName(),
+ vmBase.getId(),
+ vmBase.getVdsGroupId(),
+ vmBase.getOsId(),
+ vmBase.getCreationDate(),
+ vmBase.getDescription(),
+ vmBase.getComment(),
+ vmBase.getMemSizeMb(),
+ vmBase.getNumOfSockets(),
+ vmBase.getCpuPerSocket(),
+ vmBase.getNumOfMonitors(),
+ vmBase.getSingleQxlPci(),
+ vmBase.getDomain(),
+ vmBase.getTimeZone(),
+ vmBase.getVmType(),
+ vmBase.getUsbPolicy(),
+ vmBase.isFailBack(),
+ vmBase.getDefaultBootSequence(),
+ vmBase.getNiceLevel(),
+ vmBase.getCpuShares(),
+ vmBase.getPriority(),
+ vmBase.isAutoStartup(),
+ vmBase.isStateless(),
+ vmBase.getIsoPath(),
+ vmBase.getOrigin(),
+ vmBase.getKernelUrl(),
+ vmBase.getKernelParams(),
+ vmBase.getInitrdUrl(),
+ vmBase.getQuotaId(),
+ vmBase.isSmartcardEnabled(),
+ vmBase.isDeleteProtected(),
+ vmBase.getSsoMethod(),
+ vmBase.getTunnelMigration(),
+ vmBase.getVncKeyboardLayout(),
+ vmBase.getMinAllocatedMem(),
+ vmBase.isRunAndPause(),
+ vmBase.getCreatedByUserId(),
+ vmBase.getMigrationSupport(),
+ vmBase.isAllowConsoleReconnect(),
+ vmBase.getDedicatedVmForVds(),
+ vmBase.getDefaultDisplayType());
}
public String getCustomProperties() {
@@ -187,7 +190,6 @@
public int hashCode() {
final int prime = 31;
int result = super.hashCode();
- result = prime * result + ((defaultDisplayType == null) ? 0 :
defaultDisplayType.hashCode());
result = prime * result + (initialized ? 1231 : 1237);
result = prime * result + diskSize;
result = prime * result + ((getName() == null) ? 0 :
getName().hashCode());
@@ -214,8 +216,7 @@
return false;
}
VmStatic other = (VmStatic) obj;
- return (defaultDisplayType == other.defaultDisplayType
- && initialized == other.initialized
+ return (initialized == other.initialized
&& diskSize == other.diskSize
&& ObjectUtils.objectsEqual(getName(), other.getName())
&& ObjectUtils.objectsEqual(predefinedProperties,
other.predefinedProperties)
diff --git
a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/VmTemplate.java
b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/VmTemplate.java
index dbe37ec..81a2f39 100644
---
a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/VmTemplate.java
+++
b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/VmTemplate.java
@@ -61,8 +61,11 @@
int numOfMonitors, boolean singleQxlPci, int status, int
usbPolicy, String timeZone, int niceLevel,
int cpuShares, boolean failBack, BootSequence defaultBootSequence,
VmType vmType,
boolean smartcardEnabled, boolean deleteProtected, SsoMethod
ssoMethod, Boolean tunnelMigration, String vncKeyboardLayout,
- int minAllocatedMem, boolean stateless, boolean runAndPause, Guid
createdByUserId, VmEntityType templateType) {
- super(
+ int minAllocatedMem, boolean stateless, boolean runAndPause, Guid
createdByUserId, VmEntityType templateType,
+ boolean autoStartup, int priority, DisplayType defaultDisplayType,
String initrdUrl, String kernelUrl,
+ String kernelParams, Guid quotaId, Guid dedicatedVmForVds,
MigrationSupport migrationSupport,
+ boolean allowConsoleReconnect, String isoPath) {
+ super(name,
vmtGuid,
vdsGroupId,
osId,
@@ -82,15 +85,15 @@
defaultBootSequence,
niceLevel,
cpuShares,
- 0,
- false,
+ priority,
+ autoStartup,
stateless,
- null,
+ isoPath,
OriginType.valueOf(Config.<String>
getValue(ConfigValues.OriginType)),
- null,
- null,
- null,
- null,
+ kernelUrl,
+ kernelParams,
+ initrdUrl,
+ quotaId,
smartcardEnabled,
deleteProtected,
ssoMethod,
@@ -98,14 +101,16 @@
vncKeyboardLayout,
minAllocatedMem,
runAndPause,
- createdByUserId);
+ createdByUserId,
+ migrationSupport,
+ allowConsoleReconnect,
+ dedicatedVmForVds,
+ defaultDisplayType);
diskTemplateMap = new HashMap<Guid, DiskImage>();
diskImageMap = new HashMap<Guid, DiskImage>();
this.childCount = childCount;
- setName(name);
- this.setNumOfMonitors(numOfMonitors);
this.setStatus(VmTemplateStatus.forValue(status));
setTemplateType(templateType);
}
--
To view, visit http://gerrit.ovirt.org/22974
To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ia74cc3633680f727f9912bc58d9a3183f048e648
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
