Allon Mureinik has uploaded a new change for review.
Change subject: core: Remove DiskImageList
......................................................................
core: Remove DiskImageList
Removed DiskImageList - it is nothing more than a container to an array
of DiskImageList, and there is no reason not to replace it with
List<DiskImage>.
Change-Id: Ic34a8038b00a4a8a05387ccb207e649adbaaed3e
Signed-off-by: Allon Mureinik <amure...@redhat.com>
---
M
backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/ExportVmCommand.java
M
backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/ImportVmTemplateCommand.java
M
backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/RemoveVmTemplateFromImportExportCommand.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/ImportVmTemplateCommandTest.java
D
backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/queries/DiskImageList.java
M
backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendStorageDomainTemplatesResource.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
backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/BackendStorageDomainTemplateResourceTest.java
M
backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/BackendStorageDomainTemplatesResourceTest.java
M
frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/storage/TemplateBackupModel.java
M
frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/templates/TemplateImportDiskListModel.java
M
frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/ImportVmModel.java
14 files changed, 57 insertions(+), 90 deletions(-)
git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/51/15151/1
diff --git
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/ExportVmCommand.java
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/ExportVmCommand.java
index 92f09dd..5ec23d2 100644
---
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/ExportVmCommand.java
+++
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/ExportVmCommand.java
@@ -37,7 +37,6 @@
import
org.ovirt.engine.core.common.businessentities.network.VmNetworkInterface;
import org.ovirt.engine.core.common.errors.VdcBLLException;
import org.ovirt.engine.core.common.locks.LockingGroup;
-import org.ovirt.engine.core.common.queries.DiskImageList;
import
org.ovirt.engine.core.common.queries.GetAllFromExportDomainQueryParameters;
import org.ovirt.engine.core.common.queries.VdcQueryReturnValue;
import org.ovirt.engine.core.common.queries.VdcQueryType;
@@ -366,7 +365,7 @@
if (qretVal.getSucceeded()) {
if (!VmTemplateHandler.BlankVmTemplateId.equals(tmplId)) {
- Map<VmTemplate, DiskImageList> templates = (Map)
qretVal.getReturnValue();
+ Map<VmTemplate, List<DiskImage>> templates = (Map)
qretVal.getReturnValue();
VmTemplate tmpl = LinqUtils.firstOrNull(templates.keySet(),
new Predicate<VmTemplate>() {
@Override
public boolean eval(VmTemplate vmTemplate) {
diff --git
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/ImportVmTemplateCommand.java
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/ImportVmTemplateCommand.java
index a33698f..d1a12a8 100644
---
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/ImportVmTemplateCommand.java
+++
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/ImportVmTemplateCommand.java
@@ -39,7 +39,6 @@
import
org.ovirt.engine.core.common.businessentities.network.VmNetworkStatistics;
import org.ovirt.engine.core.common.errors.VdcBLLException;
import org.ovirt.engine.core.common.errors.VdcBllErrors;
-import org.ovirt.engine.core.common.queries.DiskImageList;
import
org.ovirt.engine.core.common.queries.GetAllFromExportDomainQueryParameters;
import org.ovirt.engine.core.common.queries.VdcQueryReturnValue;
import org.ovirt.engine.core.common.queries.VdcQueryType;
@@ -104,16 +103,15 @@
VdcQueryType.GetTemplatesFromExportDomain, tempVar);
retVal = qretVal.getSucceeded();
if (retVal) {
- Map<VmTemplate, DiskImageList> templates = (Map)
qretVal.getReturnValue();
- DiskImageList images = new DiskImageList();
+ Map<VmTemplate, List<DiskImage>> templates = (Map)
qretVal.getReturnValue();
+ ArrayList<DiskImage> list = new ArrayList<DiskImage>();
for (VmTemplate t : templates.keySet()) {
if (t.getId().equals(getVmTemplate().getId())) {
- images = templates.get(t);
+ list = new ArrayList<DiskImage>(templates.get(t));
getVmTemplate().setInterfaces(t.getInterfaces());
break;
}
}
- ArrayList<DiskImage> list = new
ArrayList<DiskImage>(Arrays.asList(images.getDiskImages()));
getParameters().setImages(list);
getVmTemplate().setImages(list);
ensureDomainMap(getParameters().getImages(),
getParameters().getDestDomainId());
diff --git
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/RemoveVmTemplateFromImportExportCommand.java
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/RemoveVmTemplateFromImportExportCommand.java
index 9d953bd..210e407 100644
---
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/RemoveVmTemplateFromImportExportCommand.java
+++
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/RemoveVmTemplateFromImportExportCommand.java
@@ -1,7 +1,6 @@
package org.ovirt.engine.core.bll;
import java.util.ArrayList;
-import java.util.Arrays;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
@@ -18,7 +17,6 @@
import org.ovirt.engine.core.common.businessentities.StorageDomainType;
import org.ovirt.engine.core.common.businessentities.VmTemplate;
import org.ovirt.engine.core.common.businessentities.VmTemplateStatus;
-import org.ovirt.engine.core.common.queries.DiskImageList;
import
org.ovirt.engine.core.common.queries.GetAllFromExportDomainQueryParameters;
import org.ovirt.engine.core.common.queries.VdcQueryReturnValue;
import org.ovirt.engine.core.common.queries.VdcQueryType;
@@ -34,7 +32,7 @@
public class RemoveVmTemplateFromImportExportCommand<T extends
VmTemplateImportExportParameters> extends
RemoveVmTemplateCommand<T> {
- private Map<VmTemplate, DiskImageList> templatesFromExport;
+ private Map<VmTemplate, List<DiskImage>> templatesFromExport;
// this is needed since overriding getVmTemplate()
private VmTemplate exportTemplate;
@@ -47,7 +45,7 @@
protected boolean canDoAction() {
boolean retVal = validate(templateExists());
if (retVal) {
- DiskImageList images =
templatesFromExport.get(LinqUtils.firstOrNull(templatesFromExport.keySet(),
+ List<DiskImage> images =
templatesFromExport.get(LinqUtils.firstOrNull(templatesFromExport.keySet(),
new Predicate<VmTemplate>() {
@Override
public boolean eval(VmTemplate t) {
@@ -56,7 +54,7 @@
}));
if (images != null) {
-
getParameters().setImages(Arrays.asList(images.getDiskImages()));
+ getParameters().setImages(images);
} else {
retVal = false;
addCanDoActionMessage(VdcBllMessages.ACTION_TYPE_FAILED_TEMPLATE_DOES_NOT_EXIST);
@@ -161,7 +159,7 @@
VdcQueryType.GetTemplatesFromExportDomain, tempVar);
if (qretVal.getSucceeded()) {
- templatesFromExport = (Map<VmTemplate, DiskImageList>)
qretVal.getReturnValue();
+ templatesFromExport = (Map<VmTemplate, List<DiskImage>>)
qretVal.getReturnValue();
exportTemplate =
LinqUtils.firstOrNull(templatesFromExport.keySet(), new Predicate<VmTemplate>()
{
@Override
public boolean eval(VmTemplate t) {
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 45d31a0..e61a496 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
@@ -9,7 +9,6 @@
import org.ovirt.engine.core.common.businessentities.DiskImage;
import org.ovirt.engine.core.common.businessentities.VmTemplate;
import
org.ovirt.engine.core.common.businessentities.network.VmNetworkInterface;
-import org.ovirt.engine.core.common.queries.DiskImageList;
import
org.ovirt.engine.core.common.queries.GetAllFromExportDomainQueryParameters;
import org.ovirt.engine.core.dal.dbbroker.auditloghandling.AuditLogDirector;
import org.ovirt.engine.core.dal.dbbroker.auditloghandling.AuditLogableBase;
@@ -17,16 +16,16 @@
import org.ovirt.engine.core.utils.ovf.OvfReaderException;
public class GetTemplatesFromExportDomainQuery<P extends
GetAllFromExportDomainQueryParameters>
- extends GetAllFromExportDomainQuery<Map<VmTemplate, DiskImageList>, P>
{
+ extends GetAllFromExportDomainQuery<Map<VmTemplate, List<DiskImage>>,
P> {
public GetTemplatesFromExportDomainQuery(P parameters) {
super(parameters);
}
@Override
- protected Map<VmTemplate, DiskImageList> buildFromOVFs(List<String>
ovfList) {
+ protected Map<VmTemplate, List<DiskImage>> buildFromOVFs(List<String>
ovfList) {
OvfManager ovfManager = new OvfManager();
- Map<VmTemplate, DiskImageList> templates = new HashMap<VmTemplate,
DiskImageList>();
+ Map<VmTemplate, List<DiskImage>> templates = new HashMap<VmTemplate,
List<DiskImage>>();
for (String ovf : ovfList) {
try {
@@ -40,7 +39,7 @@
for (DiskImage disk : diskImages) {
template.getDiskMap().put(disk.getId(), disk);
}
- templates.put(template, new DiskImageList(diskImages));
+ templates.put(template, diskImages);
}
} catch (OvfReaderException ex) {
AuditLogableBase logable = new AuditLogableBase();
diff --git
a/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/ImportVmTemplateCommandTest.java
b/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/ImportVmTemplateCommandTest.java
index b0b8bad..a46edc6 100644
---
a/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/ImportVmTemplateCommandTest.java
+++
b/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/ImportVmTemplateCommandTest.java
@@ -11,6 +11,7 @@
import java.util.Arrays;
import java.util.HashMap;
+import java.util.List;
import java.util.Map;
import java.util.Set;
@@ -31,7 +32,6 @@
import org.ovirt.engine.core.common.businessentities.VolumeFormat;
import org.ovirt.engine.core.common.businessentities.VolumeType;
import org.ovirt.engine.core.common.config.ConfigValues;
-import org.ovirt.engine.core.common.queries.DiskImageList;
import org.ovirt.engine.core.common.queries.VdcQueryParametersBase;
import org.ovirt.engine.core.common.queries.VdcQueryReturnValue;
import org.ovirt.engine.core.common.queries.VdcQueryType;
@@ -189,14 +189,14 @@
VolumeType volumeType,
ImportVmTemplateCommand command) {
final VdcQueryReturnValue result = new VdcQueryReturnValue();
- Map<VmTemplate, DiskImageList> resultMap = new HashMap<VmTemplate,
DiskImageList>();
+ Map<VmTemplate, List<DiskImage>> resultMap = new HashMap<VmTemplate,
List<DiskImage>>();
DiskImage image = new DiskImage();
image.setActualSizeInBytes(2);
image.setvolumeFormat(volumeFormat);
image.setVolumeType(volumeType);
- resultMap.put(new VmTemplate(), new
DiskImageList(Arrays.asList(image)));
+ resultMap.put(new VmTemplate(), Arrays.asList(image));
result.setReturnValue(resultMap);
result.setSucceeded(true);
diff --git
a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/queries/DiskImageList.java
b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/queries/DiskImageList.java
deleted file mode 100644
index dbaadac..0000000
---
a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/queries/DiskImageList.java
+++ /dev/null
@@ -1,24 +0,0 @@
-package org.ovirt.engine.core.common.queries;
-
-import java.io.Serializable;
-import java.util.List;
-
-import org.codehaus.jackson.annotate.JsonIgnore;
-import org.ovirt.engine.core.common.businessentities.DiskImage;
-
-public class DiskImageList implements Serializable {
- private DiskImage[] diskImages;
-
- public DiskImageList() {
- }
-
- public DiskImageList(List<DiskImage> diskImanages) {
- this.diskImages = diskImanages.toArray(new
DiskImage[diskImanages.size()]);
- }
-
- @JsonIgnore
- public DiskImage[] getDiskImages() {
- return diskImages;
- }
-
-}
diff --git
a/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendStorageDomainTemplatesResource.java
b/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendStorageDomainTemplatesResource.java
index 34e296a..c944e20 100644
---
a/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendStorageDomainTemplatesResource.java
+++
b/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendStorageDomainTemplatesResource.java
@@ -2,6 +2,7 @@
import java.util.Collection;
import java.util.HashMap;
+import java.util.List;
import java.util.Map;
import javax.ws.rs.core.Response;
@@ -12,8 +13,8 @@
import org.ovirt.engine.api.resource.StorageDomainContentResource;
import org.ovirt.engine.core.common.action.VdcActionType;
import org.ovirt.engine.core.common.action.VmTemplateImportExportParameters;
+import org.ovirt.engine.core.common.businessentities.DiskImage;
import org.ovirt.engine.core.common.businessentities.VmTemplate;
-import org.ovirt.engine.core.common.queries.DiskImageList;
import
org.ovirt.engine.core.common.queries.GetAllFromExportDomainQueryParameters;
import org.ovirt.engine.core.common.queries.StorageDomainQueryParametersBase;
import org.ovirt.engine.core.common.queries.VdcQueryType;
@@ -52,10 +53,10 @@
GetAllFromExportDomainQueryParameters params =
new
GetAllFromExportDomainQueryParameters(getDataCenterId(storageDomainId),
storageDomainId);
- Map<VmTemplate, DiskImageList> ret = getEntity(HashMap.class,
-
VdcQueryType.GetTemplatesFromExportDomain,
- params,
- "Templates under
storage domain id : " + storageDomainId.toString());
+ Map<VmTemplate, List<DiskImage>> ret = getEntity(HashMap.class,
+
VdcQueryType.GetTemplatesFromExportDomain,
+ params,
+ "Templates under
storage domain id : " + storageDomainId.toString());
return ret.keySet();
}
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 2fe084c..5f63fa8 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
@@ -7,7 +7,9 @@
import static
org.ovirt.engine.api.restapi.resource.BackendTemplatesResourceTest.setUpEntityExpectations;
import static org.ovirt.engine.api.restapi.test.util.TestHelper.eqQueryParams;
+import java.util.ArrayList;
import java.util.HashMap;
+import java.util.List;
import javax.ws.rs.core.UriInfo;
@@ -18,7 +20,6 @@
import org.ovirt.engine.core.common.businessentities.StorageDomainType;
import org.ovirt.engine.core.common.businessentities.VDSGroup;
import org.ovirt.engine.core.common.businessentities.VmTemplate;
-import org.ovirt.engine.core.common.queries.DiskImageList;
import
org.ovirt.engine.core.common.queries.GetAllFromExportDomainQueryParameters;
import org.ovirt.engine.core.common.queries.GetPermissionsForObjectParameters;
import org.ovirt.engine.core.common.queries.GetVmTemplateParameters;
@@ -165,13 +166,13 @@
}
}
- protected HashMap<VmTemplate, DiskImageList> setUpTemplates(boolean
notFound) {
- HashMap<VmTemplate, DiskImageList> ret = new HashMap<VmTemplate,
DiskImageList>();
+ protected HashMap<VmTemplate, List<DiskImage>> setUpTemplates(boolean
notFound) {
+ HashMap<VmTemplate, List<DiskImage>> ret = new HashMap<VmTemplate,
List<DiskImage>>();
if (notFound) {
return ret;
}
for (int i = 0; i < NAMES.length; i++) {
- ret.put(getVmTemplateEntity(i), new DiskImageList());
+ ret.put(getVmTemplateEntity(i), new ArrayList<DiskImage>());
}
return ret;
}
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 974dbf9..5bbc45d 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
@@ -7,6 +7,7 @@
import static
org.ovirt.engine.api.restapi.resource.BackendTemplatesResourceTest.setUpEntityExpectations;
import static org.ovirt.engine.api.restapi.test.util.TestHelper.eqQueryParams;
+import java.util.ArrayList;
import java.util.HashMap;
import java.util.LinkedList;
import java.util.List;
@@ -27,7 +28,6 @@
import org.ovirt.engine.core.common.businessentities.VolumeFormat;
import org.ovirt.engine.core.common.businessentities.VolumeType;
import org.ovirt.engine.core.common.interfaces.SearchType;
-import org.ovirt.engine.core.common.queries.DiskImageList;
import
org.ovirt.engine.core.common.queries.GetAllFromExportDomainQueryParameters;
import org.ovirt.engine.core.common.queries.GetPermissionsForObjectParameters;
import org.ovirt.engine.core.common.queries.GetVmTemplateParameters;
@@ -242,13 +242,13 @@
}
}
- protected HashMap<VmTemplate, DiskImageList> setUpTemplates(boolean
notFound) {
- HashMap<VmTemplate, DiskImageList> ret = new HashMap<VmTemplate,
DiskImageList>();
+ protected HashMap<VmTemplate, List<DiskImage>> setUpTemplates(boolean
notFound) {
+ HashMap<VmTemplate, List<DiskImage>> ret = new HashMap<VmTemplate,
List<DiskImage>>();
if (notFound) {
return ret;
}
for (int i = 0; i < NAMES.length; i++) {
- ret.put(getVmTemplateEntity(i), new DiskImageList());
+ ret.put(getVmTemplateEntity(i), new ArrayList<DiskImage>());
}
return ret;
}
diff --git
a/backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/BackendStorageDomainTemplateResourceTest.java
b/backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/BackendStorageDomainTemplateResourceTest.java
index f043ba3..3332540 100644
---
a/backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/BackendStorageDomainTemplateResourceTest.java
+++
b/backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/BackendStorageDomainTemplateResourceTest.java
@@ -2,6 +2,7 @@
import java.util.ArrayList;
import java.util.HashMap;
+import java.util.List;
import javax.ws.rs.WebApplicationException;
import javax.ws.rs.core.Response;
@@ -20,11 +21,11 @@
import org.ovirt.engine.core.common.businessentities.AsyncTaskStatus;
import org.ovirt.engine.core.common.businessentities.AsyncTaskStatusEnum;
+import org.ovirt.engine.core.common.businessentities.DiskImage;
import org.ovirt.engine.core.common.businessentities.StorageDomainType;
import org.ovirt.engine.core.common.businessentities.VDSGroup;
import org.ovirt.engine.core.common.businessentities.VmTemplate;
import org.ovirt.engine.core.common.interfaces.SearchType;
-import org.ovirt.engine.core.common.queries.DiskImageList;
import
org.ovirt.engine.core.common.queries.GetAllFromExportDomainQueryParameters;
import org.ovirt.engine.core.common.queries.GetVmTemplateParameters;
import org.ovirt.engine.core.common.queries.StorageDomainQueryParametersBase;
@@ -315,13 +316,13 @@
return setUpEntityExpectations(control.createMock(VmTemplate.class),
index);
}
- protected HashMap<VmTemplate, DiskImageList> setUpTemplates(boolean
notFound) {
- HashMap<VmTemplate, DiskImageList> ret = new HashMap<VmTemplate,
DiskImageList>();
+ protected HashMap<VmTemplate, List<DiskImage>> setUpTemplates(boolean
notFound) {
+ HashMap<VmTemplate, List<DiskImage>> ret = new HashMap<VmTemplate,
List<DiskImage>>();
if (notFound) {
return ret;
}
for (int i = 0; i < NAMES.length; i++) {
- ret.put(getEntity(i), new DiskImageList());
+ ret.put(getEntity(i), new ArrayList<DiskImage>());
}
return ret;
}
diff --git
a/backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/BackendStorageDomainTemplatesResourceTest.java
b/backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/BackendStorageDomainTemplatesResourceTest.java
index 23536ff..d3daa5e 100644
---
a/backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/BackendStorageDomainTemplatesResourceTest.java
+++
b/backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/BackendStorageDomainTemplatesResourceTest.java
@@ -16,9 +16,9 @@
import org.ovirt.engine.core.common.action.VmTemplateImportExportParameters;
import org.ovirt.engine.core.common.businessentities.StorageDomainType;
+import org.ovirt.engine.core.common.businessentities.DiskImage;
import org.ovirt.engine.core.common.businessentities.VmTemplate;
import org.ovirt.engine.core.common.businessentities.StoragePool;
-import org.ovirt.engine.core.common.queries.DiskImageList;
import
org.ovirt.engine.core.common.queries.GetAllFromExportDomainQueryParameters;
import org.ovirt.engine.core.common.queries.StorageDomainQueryParametersBase;
import org.ovirt.engine.core.common.queries.VdcQueryType;
@@ -131,10 +131,10 @@
return ret;
}
- protected HashMap<VmTemplate, DiskImageList> setUpExportTemplates() {
- HashMap<VmTemplate, DiskImageList> ret = new LinkedHashMap<VmTemplate,
DiskImageList>();
+ protected HashMap<VmTemplate, List<DiskImage>> setUpExportTemplates() {
+ HashMap<VmTemplate, List<DiskImage>> ret = new
LinkedHashMap<VmTemplate, List<DiskImage>>();
for (int i = 0; i < NAMES.length; i++) {
- ret.put(getEntity(i), new DiskImageList());
+ ret.put(getEntity(i), new ArrayList<DiskImage>());
}
return ret;
}
diff --git
a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/storage/TemplateBackupModel.java
b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/storage/TemplateBackupModel.java
index 196ce53..d9ca20a 100644
---
a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/storage/TemplateBackupModel.java
+++
b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/storage/TemplateBackupModel.java
@@ -3,6 +3,7 @@
import java.util.ArrayList;
import java.util.Collections;
import java.util.HashMap;
+import java.util.List;
import java.util.Map;
import org.ovirt.engine.core.common.action.ImportVmTemplateParameters;
@@ -14,10 +15,9 @@
import org.ovirt.engine.core.common.businessentities.Quota;
import org.ovirt.engine.core.common.businessentities.StorageDomainSharedStatus;
import org.ovirt.engine.core.common.businessentities.StorageDomainType;
+import org.ovirt.engine.core.common.businessentities.StoragePool;
import org.ovirt.engine.core.common.businessentities.VDSGroup;
import org.ovirt.engine.core.common.businessentities.VmTemplate;
-import org.ovirt.engine.core.common.businessentities.StoragePool;
-import org.ovirt.engine.core.common.queries.DiskImageList;
import
org.ovirt.engine.core.common.queries.GetAllFromExportDomainQueryParameters;
import org.ovirt.engine.core.common.queries.VdcQueryReturnValue;
import org.ovirt.engine.core.common.queries.VdcQueryType;
@@ -43,7 +43,7 @@
public class TemplateBackupModel extends VmBackupModel
{
- private ArrayList<Map.Entry<VmTemplate, DiskImageList>> extendedItems;
+ private ArrayList<Map.Entry<VmTemplate, List<DiskImage>>> extendedItems;
public TemplateBackupModel()
{
@@ -305,20 +305,18 @@
public void onSuccess(Object model1, Object
ReturnValue1)
{
TemplateBackupModel backupModel1 =
(TemplateBackupModel) model1;
- ArrayList<Map.Entry<VmTemplate,
DiskImageList>> items =
- new ArrayList<Map.Entry<VmTemplate,
DiskImageList>>();
- HashMap<VmTemplate, DiskImageList> dictionary =
- (HashMap<VmTemplate, DiskImageList>)
((VdcQueryReturnValue) ReturnValue1).getReturnValue();
+ ArrayList<Map.Entry<VmTemplate,
List<DiskImage>>> items =
+ new ArrayList<Map.Entry<VmTemplate,
List<DiskImage>>>();
+ HashMap<VmTemplate, List<DiskImage>>
dictionary =
+ (HashMap<VmTemplate, List<DiskImage>>)
((VdcQueryReturnValue) ReturnValue1).getReturnValue();
ArrayList<VmTemplate> list = new
ArrayList<VmTemplate>();
- for (Map.Entry<VmTemplate, DiskImageList> item
: dictionary.entrySet())
+ for (Map.Entry<VmTemplate, List<DiskImage>>
item : dictionary.entrySet())
{
items.add(item);
VmTemplate template = item.getKey();
template.setDiskList(new
ArrayList<DiskImage>());
- for (DiskImage diskImage :
item.getValue().getDiskImages()) {
- template.getDiskList().add(diskImage);
- }
+
template.getDiskList().addAll(item.getValue());
list.add(template);
}
backupModel1.setItems(list);
diff --git
a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/templates/TemplateImportDiskListModel.java
b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/templates/TemplateImportDiskListModel.java
index eaab833..c48d137 100644
---
a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/templates/TemplateImportDiskListModel.java
+++
b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/templates/TemplateImportDiskListModel.java
@@ -1,11 +1,11 @@
package org.ovirt.engine.ui.uicommonweb.models.templates;
import java.util.ArrayList;
+import java.util.List;
import java.util.Map;
import org.ovirt.engine.core.common.businessentities.DiskImage;
import org.ovirt.engine.core.common.businessentities.VmTemplate;
-import org.ovirt.engine.core.common.queries.DiskImageList;
import org.ovirt.engine.ui.uicommonweb.Linq;
import org.ovirt.engine.ui.uicommonweb.Linq.DiskByAliasComparer;
import org.ovirt.engine.ui.uicommonweb.models.SearchableListModel;
@@ -14,7 +14,7 @@
@SuppressWarnings("unused")
public class TemplateImportDiskListModel extends SearchableListModel
{
- private ArrayList<Map.Entry<VmTemplate, DiskImageList>> extendedItems;
+ private ArrayList<Map.Entry<VmTemplate, List<DiskImage>>> extendedItems;
public TemplateImportDiskListModel() {
setIsTimerDisabled(true);
@@ -29,12 +29,9 @@
{
ArrayList<DiskImage> list = new ArrayList<DiskImage>();
VmTemplate template = ((ImportTemplateData)
getEntity()).getTemplate();
- for (Map.Entry<VmTemplate, DiskImageList> item : extendedItems) {
+ for (Map.Entry<VmTemplate, List<DiskImage>> item : extendedItems) {
if
(item.getKey().getQueryableId().equals(template.getQueryableId())) {
- DiskImageList diskImageList = item.getValue();
- for (DiskImage diskImage : diskImageList.getDiskImages()) {
- list.add(diskImage);
- }
+ list.addAll(item.getValue());
Linq.sort(list, new DiskByAliasComparer());
setItems(list);
return;
@@ -47,7 +44,7 @@
}
}
- public void setExtendedItems(ArrayList<Map.Entry<VmTemplate,
DiskImageList>> arrayList) {
+ public void setExtendedItems(ArrayList<Map.Entry<VmTemplate,
List<DiskImage>>> arrayList) {
this.extendedItems = arrayList;
}
diff --git
a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/ImportVmModel.java
b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/ImportVmModel.java
index c54109a..a2a3a54 100644
---
a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/ImportVmModel.java
+++
b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/ImportVmModel.java
@@ -11,14 +11,13 @@
import org.ovirt.engine.core.common.businessentities.Quota;
import org.ovirt.engine.core.common.businessentities.QuotaEnforcementTypeEnum;
import org.ovirt.engine.core.common.businessentities.StorageDomain;
+import org.ovirt.engine.core.common.businessentities.StoragePool;
import org.ovirt.engine.core.common.businessentities.VDSGroup;
import org.ovirt.engine.core.common.businessentities.VM;
import org.ovirt.engine.core.common.businessentities.VmTemplate;
import org.ovirt.engine.core.common.businessentities.VolumeFormat;
import org.ovirt.engine.core.common.businessentities.VolumeType;
-import org.ovirt.engine.core.common.businessentities.StoragePool;
import org.ovirt.engine.core.common.interfaces.SearchType;
-import org.ovirt.engine.core.common.queries.DiskImageList;
import
org.ovirt.engine.core.common.queries.GetAllFromExportDomainQueryParameters;
import
org.ovirt.engine.core.common.queries.GetAllRelevantQuotasForStorageParameters;
import
org.ovirt.engine.core.common.queries.GetAllRelevantQuotasForVdsGroupParameters;
@@ -382,10 +381,10 @@
@Override
public void onSuccess(Object model, Object returnValue) {
- Map<VmTemplate, DiskImageList> dictionary =
- (HashMap<VmTemplate, DiskImageList>)
((VdcQueryReturnValue) returnValue).getReturnValue();
+ Map<VmTemplate, List<DiskImage>> dictionary =
+ (HashMap<VmTemplate, List<DiskImage>>)
((VdcQueryReturnValue) returnValue).getReturnValue();
Map<Guid, Guid> tempMap = new HashMap<Guid, Guid>();
- for (Entry<VmTemplate, DiskImageList> entry :
dictionary.entrySet()) {
+ for (Entry<VmTemplate, List<DiskImage>> entry :
dictionary.entrySet()) {
tempMap.put(entry.getKey().getId(), null);
}
for (Guid templateId :
missingTemplateDiskMap.keySet()) {
--
To view, visit http://gerrit.ovirt.org/15151
To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ic34a8038b00a4a8a05387ccb207e649adbaaed3e
Gerrit-PatchSet: 1
Gerrit-Project: ovirt-engine
Gerrit-Branch: master
Gerrit-Owner: Allon Mureinik <amure...@redhat.com>
_______________________________________________
Engine-patches mailing list
Engine-patches@ovirt.org
http://lists.ovirt.org/mailman/listinfo/engine-patches
