Roy Golan has uploaded a new change for review.
Change subject: core: fix serialization issue with vmTemplate
......................................................................
core: fix serialization issue with vmTemplate
also sanitize the method names
Change-Id: I7689acb65594994a553e79c2c18558f98824f285
Signed-off-by: Roy Golan <rgo...@redhat.com>
---
M
backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/AddVmCommand.java
M
backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/AddVmFromTemplateCommand.java
M
backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/CommonVmPoolWithVmsCommand.java
M
backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/ImagesHandler.java
M
backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/MoveOrCopyTemplateCommand.java
M
backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/VmTemplateHandler.java
M
backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/GetTemplatesFromExportDomainQuery.java
M
backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/AddVmCommandTest.java
M
backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/CommonVmPoolWithVmsCommandTestAbstract.java
M
backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/OvfDataUpdaterTest.java
M
backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/VmTemplate.java
M
backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendStorageDomainTemplateResource.java
M
backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/BackendExportDomainDiskResourceTest.java
M
backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/BackendExportDomainDisksResourceTest.java
M
frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/tab/disk/SubTabDiskTemplateView.java
M
frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/widget/storage/TemplatesTree.java
16 files changed, 27 insertions(+), 27 deletions(-)
git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/80/18080/1
diff --git
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/AddVmCommand.java
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/AddVmCommand.java
index b91db2a..04bc098 100644
---
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/AddVmCommand.java
+++
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/AddVmCommand.java
@@ -437,7 +437,7 @@
}
protected Collection<DiskImage>
getImagesToCheckDestinationStorageDomains() {
- return getVmTemplate().getDiskMap().values();
+ return getVmTemplate().getDiskTemplateMap().values();
}
private boolean validateProvidedDestinations() {
@@ -702,7 +702,7 @@
}
protected boolean addVmImages() {
- if (getVmTemplate().getDiskMap().size() > 0) {
+ if (getVmTemplate().getDiskTemplateMap().size() > 0) {
if (getVm().getStatus() != VMStatus.Down) {
log.error("Cannot add images. VM is not Down");
throw new
VdcBLLException(VdcBllErrors.IRS_IMAGE_STATUS_ILLEGAL);
diff --git
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/AddVmFromTemplateCommand.java
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/AddVmFromTemplateCommand.java
index 70dc2ba..9c94292 100644
---
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/AddVmFromTemplateCommand.java
+++
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/AddVmFromTemplateCommand.java
@@ -71,13 +71,13 @@
@Override
protected boolean addVmImages() {
- if (getVmTemplate().getDiskMap().size() > 0) {
+ if (getVmTemplate().getDiskTemplateMap().size() > 0) {
if (getVm().getStatus() != VMStatus.Down) {
log.error("Cannot add images. VM is not Down");
throw new
VdcBLLException(VdcBllErrors.IRS_IMAGE_STATUS_ILLEGAL);
}
VmHandler.LockVm(getVm().getDynamicData(),
getCompensationContext());
- for (DiskImage disk : getVmTemplate().getDiskMap().values()) {
+ for (DiskImage disk :
getVmTemplate().getDiskTemplateMap().values()) {
VdcReturnValueBase result =
Backend.getInstance().runInternalAction(
VdcActionType.CreateCloneOfTemplate,
buildCreateCloneOfTemplateParameters(disk),
@@ -115,7 +115,7 @@
protected boolean canDoAction() {
boolean retValue = super.canDoAction();
if (retValue) {
- for (DiskImage dit : getVmTemplate().getDiskMap().values()) {
+ for (DiskImage dit :
getVmTemplate().getDiskTemplateMap().values()) {
retValue =
ImagesHandler.CheckImageConfiguration(destStorages.get(diskInfoDestinationMap.get(dit.getId()).getStorageIds().get(0))
.getStorageStaticData(),
diff --git
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/CommonVmPoolWithVmsCommand.java
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/CommonVmPoolWithVmsCommand.java
index e0efb8a..73c45b6 100644
---
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/CommonVmPoolWithVmsCommand.java
+++
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/CommonVmPoolWithVmsCommand.java
@@ -213,7 +213,7 @@
if (!ensureDestinationImageMap()) {
return false;
}
- storageToDisksMap =
ImagesHandler.buildStorageToDiskMap(getVmTemplate().getDiskMap().values(),
+ storageToDisksMap =
ImagesHandler.buildStorageToDiskMap(getVmTemplate().getDiskTemplateMap().values(),
diskInfoDestinationMap);
List<Guid> storageIds = new ArrayList<Guid>();
for (DiskImage diskImage : diskInfoDestinationMap.values()) {
@@ -277,7 +277,7 @@
Guid storageId = getParameters().getStorageDomainId();
ArrayList<Guid> storageIds = new ArrayList<Guid>();
storageIds.add(storageId);
- for (DiskImage image : getVmTemplate().getDiskMap().values()) {
+ for (DiskImage image :
getVmTemplate().getDiskTemplateMap().values()) {
image.setStorageIds(storageIds);
diskInfoDestinationMap.put(image.getId(), image);
}
@@ -287,7 +287,7 @@
destStorages, false);
}
}
- if (getVmTemplate().getDiskMap().values().size() !=
diskInfoDestinationMap.size()) {
+ if (getVmTemplate().getDiskTemplateMap().values().size() !=
diskInfoDestinationMap.size()) {
log.errorFormat("Can not found any default active domain for one
of the disks of template with id : {0}",
getVmTemplate().getId());
addCanDoActionMessage(VdcBllMessages.ACTION_TYPE_FAILED_MISSED_STORAGES_FOR_SOME_DISKS);
diff --git
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/ImagesHandler.java
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/ImagesHandler.java
index e473507..6695824 100644
---
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/ImagesHandler.java
+++
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/ImagesHandler.java
@@ -83,7 +83,7 @@
storageDomainsMap.put(storageDomain.getId(), storageDomain);
}
}
- for (DiskImage image : template.getDiskMap().values()) {
+ for (DiskImage image : template.getDiskTemplateMap().values()) {
for (Guid storageId : image.getStorageIds()) {
if (storageDomainsMap.containsKey(storageId)) {
ArrayList<Guid> storageIds = new ArrayList<Guid>();
diff --git
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/MoveOrCopyTemplateCommand.java
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/MoveOrCopyTemplateCommand.java
index cd75aeb..163fddc 100644
---
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/MoveOrCopyTemplateCommand.java
+++
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/MoveOrCopyTemplateCommand.java
@@ -113,7 +113,7 @@
ImagesHandler.fillImagesMapBasedOnTemplate(getVmTemplate(),
imageFromSourceDomainMap,
null, true);
- if (getVmTemplate().getDiskMap().values().size() !=
imageFromSourceDomainMap.size()) {
+ if (getVmTemplate().getDiskTemplateMap().values().size() !=
imageFromSourceDomainMap.size()) {
log.errorFormat("Can not found any default active domain for
one of the disks of template with id : {0}",
getVmTemplate().getId());
addCanDoActionMessage(VdcBllMessages.ACTION_TYPE_FAILED_MISSED_STORAGES_FOR_SOME_DISKS);
diff --git
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/VmTemplateHandler.java
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/VmTemplateHandler.java
index 9618fbf..7962930 100644
---
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/VmTemplateHandler.java
+++
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/VmTemplateHandler.java
@@ -45,13 +45,13 @@
}
public static void UpdateDisksFromDb(VmTemplate vmt) {
- vmt.getDiskMap().clear();
+ vmt.getDiskTemplateMap().clear();
vmt.getDiskImageMap().clear();
vmt.getDiskList().clear();
List<Disk> diskList =
DbFacade.getInstance().getDiskDao().getAllForVm(vmt.getId());
for (Disk dit : diskList) {
DiskImage diskImage = (DiskImage) dit;
- vmt.getDiskMap().put(dit.getId(), diskImage);
+ vmt.getDiskTemplateMap().put(dit.getId(), diskImage);
// Translation from number of sectors to GB.
vmt.setSizeGB(Double.valueOf(dit.getSize()) / Double.valueOf((1024
* 1024 * 1024)));
vmt.getDiskImageMap().put(dit.getId(), diskImage);
diff --git
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/GetTemplatesFromExportDomainQuery.java
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/GetTemplatesFromExportDomainQuery.java
index e61a496..65c66dc 100644
---
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/GetTemplatesFromExportDomainQuery.java
+++
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/GetTemplatesFromExportDomainQuery.java
@@ -37,7 +37,7 @@
template.setInterfaces(interfaces);
// add disk map
for (DiskImage disk : diskImages) {
- template.getDiskMap().put(disk.getId(), disk);
+ template.getDiskTemplateMap().put(disk.getId(), disk);
}
templates.put(template, diskImages);
}
diff --git
a/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/AddVmCommandTest.java
b/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/AddVmCommandTest.java
index 1295c6f..f754f15 100644
---
a/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/AddVmCommandTest.java
+++
b/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/AddVmCommandTest.java
@@ -151,7 +151,7 @@
AddVmCommand<VmManagementParametersBase> cmd =
setupCanAddVmTests(domainSizeGB, sizeRequired);
doReturn(Collections.emptyList()).when(cmd).validateCustomProperties(any(VmStatic.class));
// Adding 10 disks, which each one should consume the default sparse
size (which is 1GB).
- setNewDisksForTemplate(10, cmd.getVmTemplate().getDiskMap());
+ setNewDisksForTemplate(10, cmd.getVmTemplate().getDiskTemplateMap());
doReturn(createVmTemplate()).when(cmd).getVmTemplate();
assertFalse("Thin vm could not be added due to storage sufficient",
cmd.canAddVm(reasons,
Arrays.asList(createStorageDomain(domainSizeGB))));
@@ -384,7 +384,7 @@
vmTemplate = new VmTemplate();
vmTemplate.setStoragePoolId(STORAGE_POOL_ID);
DiskImage image = createDiskImageTemplate();
- vmTemplate.getDiskMap().put(image.getImageId(), image);
+ vmTemplate.getDiskTemplateMap().put(image.getImageId(), image);
HashMap<Guid, DiskImage> diskImageMap = new HashMap<Guid,
DiskImage>();
DiskImage diskImage = createDiskImage(REQUIRED_DISK_SIZE_GB);
diskImageMap.put(diskImage.getId(), diskImage);
@@ -480,7 +480,7 @@
@Override
protected int getNeededDiskSize(Guid domainId) {
- return getBlockSparseInitSizeInGb() *
getVmTemplate().getDiskMap().size();
+ return getBlockSparseInitSizeInGb() *
getVmTemplate().getDiskTemplateMap().size();
}
};
cmd = spy(cmd);
diff --git
a/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/CommonVmPoolWithVmsCommandTestAbstract.java
b/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/CommonVmPoolWithVmsCommandTestAbstract.java
index 575074c..0fd64ac 100644
---
a/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/CommonVmPoolWithVmsCommandTestAbstract.java
+++
b/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/CommonVmPoolWithVmsCommandTestAbstract.java
@@ -282,7 +282,7 @@
}
Map<Guid, DiskImage> diskImageTemplate = getDiskImageTempalteList();
for (Guid key : diskImageTemplate.keySet()) {
- vmTemplate.getDiskMap().put(key, diskImageTemplate.get(key));
+ vmTemplate.getDiskTemplateMap().put(key,
diskImageTemplate.get(key));
}
}
diff --git
a/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/OvfDataUpdaterTest.java
b/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/OvfDataUpdaterTest.java
index c431c12..a0bf377 100644
---
a/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/OvfDataUpdaterTest.java
+++
b/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/OvfDataUpdaterTest.java
@@ -310,7 +310,7 @@
VmTemplate template = createVmTemplate(id, templateStatus);
for (int i = 0; i < diskCount; i++) {
DiskImage image = createDiskImage(diskStatus);
- template.getDiskMap().put(image.getId(), image);
+ template.getDiskTemplateMap().put(image.getId(), image);
template.getDiskList().add(image);
}
toReturn.put(template.getId(), template);
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 2f81a0e..ab57834 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
@@ -36,7 +36,7 @@
private String storagePoolName;
- private HashMap<Guid, DiskImage> diskMap = new HashMap<Guid, DiskImage>();
+ private HashMap<Guid, DiskImage> diskImageMap = new HashMap<Guid,
DiskImage>();
private ArrayList<DiskImage> diskList = new ArrayList<DiskImage>();
@@ -172,7 +172,7 @@
}
@JsonIgnore
- public HashMap<Guid, DiskImage> getDiskMap() {
+ public HashMap<Guid, DiskImage> getDiskTemplateMap() {
return diskTemplateMap;
}
@@ -201,11 +201,11 @@
@JsonIgnore
public HashMap<Guid, DiskImage> getDiskImageMap() {
- return diskMap;
+ return diskImageMap;
}
public void setDiskImageMap(HashMap<Guid, DiskImage> value) {
- diskMap = value;
+ diskImageMap = value;
}
@Override
diff --git
a/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendStorageDomainTemplateResource.java
b/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendStorageDomainTemplateResource.java
index 2740c7c..201ce65 100644
---
a/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendStorageDomainTemplateResource.java
+++
b/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendStorageDomainTemplateResource.java
@@ -88,7 +88,7 @@
@Override
public java.util.Map<Guid, Disk> getDiskMap() {
java.util.Map<Guid, Disk> diskMap = new java.util.HashMap<Guid,
Disk>();
- for (java.util.Map.Entry<Guid, DiskImage> entry :
getEntity().getDiskMap().entrySet()) {
+ for (java.util.Map.Entry<Guid, DiskImage> entry :
getEntity().getDiskTemplateMap().entrySet()) {
diskMap.put(entry.getKey(), entry.getValue());
}
return diskMap;
diff --git
a/backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/BackendExportDomainDiskResourceTest.java
b/backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/BackendExportDomainDiskResourceTest.java
index c2ac0f7..843b45f 100644
---
a/backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/BackendExportDomainDiskResourceTest.java
+++
b/backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/BackendExportDomainDiskResourceTest.java
@@ -179,7 +179,7 @@
protected VmTemplate getVmTemplateEntity(int index) {
VmTemplate vm =
setUpEntityExpectations(control.createMock(VmTemplate.class), index);
-
org.easymock.EasyMock.expect(vm.getDiskMap()).andReturn(getDiskMap()).anyTimes();
+
org.easymock.EasyMock.expect(vm.getDiskTemplateMap()).andReturn(getDiskMap()).anyTimes();
return vm;
}
diff --git
a/backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/BackendExportDomainDisksResourceTest.java
b/backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/BackendExportDomainDisksResourceTest.java
index 9211c99..a923b88 100644
---
a/backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/BackendExportDomainDisksResourceTest.java
+++
b/backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/BackendExportDomainDisksResourceTest.java
@@ -255,7 +255,7 @@
protected VmTemplate getVmTemplateEntity(int index) {
VmTemplate vm =
setUpEntityExpectations(control.createMock(VmTemplate.class), index);
-
org.easymock.EasyMock.expect(vm.getDiskMap()).andReturn(getDiskMap()).anyTimes();
+
org.easymock.EasyMock.expect(vm.getDiskTemplateMap()).andReturn(getDiskMap()).anyTimes();
return vm;
}
diff --git
a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/tab/disk/SubTabDiskTemplateView.java
b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/tab/disk/SubTabDiskTemplateView.java
index 6369fc6..e19145f 100644
---
a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/tab/disk/SubTabDiskTemplateView.java
+++
b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/tab/disk/SubTabDiskTemplateView.java
@@ -48,7 +48,7 @@
TextColumnWithTooltip<VmTemplate> disksColumn = new
TextColumnWithTooltip<VmTemplate>() {
@Override
public String getValue(VmTemplate object) {
- return String.valueOf(object.getDiskMap().size());
+ return String.valueOf(object.getDiskTemplateMap().size());
}
};
getTable().addColumn(disksColumn, constants.disksTemplate(), "200px");
//$NON-NLS-1$
diff --git
a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/widget/storage/TemplatesTree.java
b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/widget/storage/TemplatesTree.java
index 3411ef6..a5e9933 100644
---
a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/widget/storage/TemplatesTree.java
+++
b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/widget/storage/TemplatesTree.java
@@ -41,7 +41,7 @@
addItemToPanel(panel, new Image(resources.vmImage()), "25px");
//$NON-NLS-1$
addTextBoxToPanel(panel, new TextBoxLabel(), template.getName(), "");
//$NON-NLS-1$
- addValueLabelToPanel(panel, new DiskSizeLabel<Integer>(),
template.getDiskMap().size(), "110px"); //$NON-NLS-1$
+ addValueLabelToPanel(panel, new DiskSizeLabel<Integer>(),
template.getDiskTemplateMap().size(), "110px"); //$NON-NLS-1$
addValueLabelToPanel(panel, new DiskSizeLabel<Double>(),
template.getActualDiskSize(), "110px"); //$NON-NLS-1$
addValueLabelToPanel(panel, new FullDateTimeLabel(),
template.getCreationDate(), "140px"); //$NON-NLS-1$
--
To view, visit http://gerrit.ovirt.org/18080
To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I7689acb65594994a553e79c2c18558f98824f285
Gerrit-PatchSet: 1
Gerrit-Project: ovirt-engine
Gerrit-Branch: master
Gerrit-Owner: Roy Golan <rgo...@redhat.com>
_______________________________________________
Engine-patches mailing list
Engine-patches@ovirt.org
http://lists.ovirt.org/mailman/listinfo/engine-patches
