Federico Simoncelli has uploaded a new change for review.
Change subject: core: unify the GetAllImagesList queries
......................................................................
core: unify the GetAllImagesList queries
This patch unifies and consolidates the queries to retrieve the list of
images from a storage domain. The previous separate queries were:
GetAllImagesList
GetAllIsoImagesList
GetAllIsoImagesListByStoragePoolId
GetAllFloppyImagesList
GetAllFloppyImagesListByStoragePoolId
which have been consolidated in:
GetAllImagesList (pre-existing)
GetAllImagesListByStoragePoolId
The type of image to list (iso, vfd) is now a parameter that can allow
also additional types (e.g.: disk) and a generic "All" to retrieve the
entire list.
This is one of the first steps toward image storage domains that are
capable of storing any kind of images (iso, vfd, disk, etc...).
Change-Id: I079e3f1c5bfbcfd1dc09ebce41a327c253eb53ac
Signed-off-by: Federico Simoncelli <fsimo...@redhat.com>
---
D
backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/AbstractGetAllImagesListByStorageDomainIdQuery.java
D
backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/AbstractGetAllImagesListQuery.java
D
backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/GetAllFloppyImagesListByStoragePoolIdQuery.java
D
backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/GetAllFloppyImagesListQuery.java
R
backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/GetAllImagesListByStoragePoolIdQuery.java
M
backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/GetAllImagesListQuery.java
A
backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/GetAllImagesListQueryBase.java
D
backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/GetAllIsoImagesListByStoragePoolIdQuery.java
D
backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/GetAllIsoImagesListQuery.java
M
backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/VmRunHandler.java
M
backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/GetAllImagesListByStoragePoolIdQueryTest.java
M
backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/queries/GetAllImagesListByStoragePoolIdParameters.java
A
backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/queries/GetAllImagesListParameters.java
M
backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/queries/GetAllImagesListParametersBase.java
D
backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/queries/GetAllIsoImagesListParameters.java
M
backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/queries/VdcQueryType.java
M
backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendFilesResource.java
M
backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/BackendFilesResourceTest.java
M
frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/dataprovider/AsyncDataProvider.java
M
frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/storage/StorageIsoListModel.java
M
frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/SpiceConsoleModel.java
M
frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/UnitVmModel.java
22 files changed, 146 insertions(+), 218 deletions(-)
git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/66/13066/1
diff --git
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/AbstractGetAllImagesListByStorageDomainIdQuery.java
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/AbstractGetAllImagesListByStorageDomainIdQuery.java
deleted file mode 100644
index 7616b62..0000000
---
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/AbstractGetAllImagesListByStorageDomainIdQuery.java
+++ /dev/null
@@ -1,23 +0,0 @@
-package org.ovirt.engine.core.bll;
-
-import org.ovirt.engine.core.common.queries.GetAllIsoImagesListParameters;
-import org.ovirt.engine.core.compat.Guid;
-
-/**
- * An extension of the {@link AbstractGetAllImagesListQuery} class that
handles getting images by Storage Domain ID
- */
-public abstract class AbstractGetAllImagesListByStorageDomainIdQuery<P extends
GetAllIsoImagesListParameters> extends AbstractGetAllImagesListQuery<P> {
-
- public AbstractGetAllImagesListByStorageDomainIdQuery(P parameters) {
- super(parameters);
- }
-
- /**
- * @return The storage domain to get the ISO for
- */
- @Override
- protected Guid getStorageDomainId() {
- return getParameters().getStorageDomainId();
- }
-}
-
diff --git
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/AbstractGetAllImagesListQuery.java
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/AbstractGetAllImagesListQuery.java
deleted file mode 100644
index 5715721..0000000
---
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/AbstractGetAllImagesListQuery.java
+++ /dev/null
@@ -1,37 +0,0 @@
-package org.ovirt.engine.core.bll;
-
-import java.util.List;
-
-import org.ovirt.engine.core.common.businessentities.FileTypeExtension;
-import org.ovirt.engine.core.common.businessentities.RepoFileMetaData;
-import org.ovirt.engine.core.common.errors.VdcBllErrors;
-import org.ovirt.engine.core.common.queries.GetAllImagesListParametersBase;
-import org.ovirt.engine.core.compat.Guid;
-
-public abstract class AbstractGetAllImagesListQuery<P extends
GetAllImagesListParametersBase> extends QueriesCommandBase<P> {
-
- public AbstractGetAllImagesListQuery(P parameters) {
- super(parameters);
- }
-
- protected abstract FileTypeExtension getFileTypeExtension();
-
- protected abstract Guid getStorageDomainId();
-
- @Override
- protected void executeQueryCommand() {
- // Fetch all the Iso files of a given type for storage pool with
active storage domain of this domain Id.
-
getQueryReturnValue().setReturnValue(getUserRequestForStorageDomainRepoFileList());
- if (getQueryReturnValue().getReturnValue() == null) {
- getQueryReturnValue().setSucceeded(false);
-
getQueryReturnValue().setExceptionString(VdcBllErrors.IRS_REPOSITORY_NOT_FOUND.toString());
- }
- }
-
- protected List<RepoFileMetaData>
getUserRequestForStorageDomainRepoFileList() {
- return
IsoDomainListSyncronizer.getInstance().getUserRequestForStorageDomainRepoFileList
- (getStorageDomainId(),
- getFileTypeExtension(),
- getParameters().getForceRefresh());
- }
-}
diff --git
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/GetAllFloppyImagesListByStoragePoolIdQuery.java
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/GetAllFloppyImagesListByStoragePoolIdQuery.java
deleted file mode 100644
index 1d18e6a..0000000
---
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/GetAllFloppyImagesListByStoragePoolIdQuery.java
+++ /dev/null
@@ -1,17 +0,0 @@
-package org.ovirt.engine.core.bll;
-
-import org.ovirt.engine.core.common.businessentities.FileTypeExtension;
-import
org.ovirt.engine.core.common.queries.GetAllImagesListByStoragePoolIdParameters;
-
-public class GetAllFloppyImagesListByStoragePoolIdQuery<P extends
GetAllImagesListByStoragePoolIdParameters> extends
AbstractGetAllImagesListByStoragePoolIdQuery<P> {
-
- public GetAllFloppyImagesListByStoragePoolIdQuery(P parameters) {
- super(parameters);
- }
-
- @Override
- protected FileTypeExtension getFileTypeExtension() {
- return FileTypeExtension.Floppy;
- }
-
-}
diff --git
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/GetAllFloppyImagesListQuery.java
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/GetAllFloppyImagesListQuery.java
deleted file mode 100644
index 3200286..0000000
---
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/GetAllFloppyImagesListQuery.java
+++ /dev/null
@@ -1,15 +0,0 @@
-package org.ovirt.engine.core.bll;
-
-import org.ovirt.engine.core.common.businessentities.FileTypeExtension;
-import org.ovirt.engine.core.common.queries.GetAllIsoImagesListParameters;
-
-public class GetAllFloppyImagesListQuery<P extends
GetAllIsoImagesListParameters> extends
AbstractGetAllImagesListByStorageDomainIdQuery<P> {
- public GetAllFloppyImagesListQuery(P parameters) {
- super(parameters);
- }
-
- @Override
- protected FileTypeExtension getFileTypeExtension() {
- return FileTypeExtension.Floppy;
- }
-}
diff --git
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/AbstractGetAllImagesListByStoragePoolIdQuery.java
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/GetAllImagesListByStoragePoolIdQuery.java
similarity index 85%
rename from
backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/AbstractGetAllImagesListByStoragePoolIdQuery.java
rename to
backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/GetAllImagesListByStoragePoolIdQuery.java
index 10de1e1..bbe8e26 100644
---
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/AbstractGetAllImagesListByStoragePoolIdQuery.java
+++
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/GetAllImagesListByStoragePoolIdQuery.java
@@ -11,13 +11,12 @@
* This query retrieves repo files for a storage pool.
* Note that there are no permissions on non-data storage domains, so this
query is filtered according to the permissions of the storage pool
*/
-public abstract class AbstractGetAllImagesListByStoragePoolIdQuery<P extends
GetAllImagesListByStoragePoolIdParameters> extends
AbstractGetAllImagesListQuery<P> {
+public class GetAllImagesListByStoragePoolIdQuery<P extends
GetAllImagesListByStoragePoolIdParameters> extends GetAllImagesListQueryBase<P>
{
- public AbstractGetAllImagesListByStoragePoolIdQuery(P parameters) {
+ public GetAllImagesListByStoragePoolIdQuery(P parameters) {
super(parameters);
}
- @Override
protected Guid getStorageDomainId() {
if (doesUserHavePermissionsOnStoragePool()) {
return
getDbFacade().getStorageDomainDao().getIsoStorageDomainIdForPool(getStoragePoolId());
@@ -29,7 +28,7 @@
protected List<RepoFileMetaData>
getUserRequestForStorageDomainRepoFileList() {
return
IsoDomainListSyncronizer.getInstance().getUserRequestForStoragePoolAndDomainRepoFileList
(getStoragePoolId(), getStorageDomainId(),
- getFileTypeExtension(),
+ getParameters().getFileTypeExtension(),
getParameters().getForceRefresh());
}
diff --git
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/GetAllImagesListQuery.java
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/GetAllImagesListQuery.java
index f90a6e3..c84cbbd 100644
---
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/GetAllImagesListQuery.java
+++
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/GetAllImagesListQuery.java
@@ -1,33 +1,29 @@
package org.ovirt.engine.core.bll;
-import java.util.ArrayList;
import java.util.List;
-import org.ovirt.engine.core.common.businessentities.FileTypeExtension;
-import org.ovirt.engine.core.common.businessentities.RepoFileMetaData;
-import org.ovirt.engine.core.common.queries.GetAllIsoImagesListParameters;
-public class GetAllImagesListQuery<P extends GetAllIsoImagesListParameters>
extends AbstractGetAllImagesListByStorageDomainIdQuery<P> {
+import org.ovirt.engine.core.common.businessentities.RepoFileMetaData;
+import org.ovirt.engine.core.common.queries.GetAllImagesListParameters;
+import org.ovirt.engine.core.compat.Guid;
+
+
+public class GetAllImagesListQuery<P extends GetAllImagesListParameters>
extends GetAllImagesListQueryBase<P> {
+
public GetAllImagesListQuery(P parameters) {
super(parameters);
}
- @Override
- protected FileTypeExtension getFileTypeExtension() {
- return FileTypeExtension.All;
- }
-
- private List<RepoFileMetaData> getFileListForExtension(FileTypeExtension
extension) {
- return
IsoDomainListSyncronizer.getInstance().getUserRequestForStorageDomainRepoFileList
+ protected List<RepoFileMetaData>
getUserRequestForStorageDomainRepoFileList() {
+ return
IsoDomainListSyncronizer.getInstance().getUserRequestForStorageDomainRepoFileList
(getStorageDomainId(),
- extension,
+ getParameters().getFileTypeExtension(),
getParameters().getForceRefresh());
}
- @Override
- protected List<RepoFileMetaData>
getUserRequestForStorageDomainRepoFileList() {
- List<RepoFileMetaData> fileList = new ArrayList<RepoFileMetaData>();
- fileList.addAll(getFileListForExtension(FileTypeExtension.ISO));
- fileList.addAll(getFileListForExtension(FileTypeExtension.Floppy));
- return fileList;
+ /**
+ * @return The storage domain to get the images from
+ */
+ protected Guid getStorageDomainId() {
+ return getParameters().getStorageDomainId();
}
}
diff --git
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/GetAllImagesListQueryBase.java
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/GetAllImagesListQueryBase.java
new file mode 100644
index 0000000..05af2df
--- /dev/null
+++
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/GetAllImagesListQueryBase.java
@@ -0,0 +1,28 @@
+package org.ovirt.engine.core.bll;
+
+import java.util.List;
+
+import org.ovirt.engine.core.common.businessentities.RepoFileMetaData;
+import org.ovirt.engine.core.common.errors.VdcBllErrors;
+import org.ovirt.engine.core.common.queries.GetAllImagesListParametersBase;
+
+
+public abstract class GetAllImagesListQueryBase<P extends
GetAllImagesListParametersBase> extends QueriesCommandBase<P> {
+
+ public GetAllImagesListQueryBase(P parameters) {
+ super(parameters);
+ }
+
+ @Override
+ protected void executeQueryCommand() {
+ // Fetch all the Iso files of a given type for storage pool with
active storage domain of this domain Id.
+
getQueryReturnValue().setReturnValue(getUserRequestForStorageDomainRepoFileList());
+ if (getQueryReturnValue().getReturnValue() == null) {
+ getQueryReturnValue().setSucceeded(false);
+
getQueryReturnValue().setExceptionString(VdcBllErrors.IRS_REPOSITORY_NOT_FOUND.toString());
+ }
+ }
+
+ protected abstract List<RepoFileMetaData>
getUserRequestForStorageDomainRepoFileList();
+
+}
diff --git
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/GetAllIsoImagesListByStoragePoolIdQuery.java
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/GetAllIsoImagesListByStoragePoolIdQuery.java
deleted file mode 100644
index 34cf619..0000000
---
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/GetAllIsoImagesListByStoragePoolIdQuery.java
+++ /dev/null
@@ -1,17 +0,0 @@
-package org.ovirt.engine.core.bll;
-
-import org.ovirt.engine.core.common.businessentities.FileTypeExtension;
-import
org.ovirt.engine.core.common.queries.GetAllImagesListByStoragePoolIdParameters;
-
-public class GetAllIsoImagesListByStoragePoolIdQuery<P extends
GetAllImagesListByStoragePoolIdParameters> extends
AbstractGetAllImagesListByStoragePoolIdQuery<P> {
-
- public GetAllIsoImagesListByStoragePoolIdQuery(P parameters) {
- super(parameters);
- }
-
- @Override
- protected FileTypeExtension getFileTypeExtension() {
- return FileTypeExtension.ISO;
- }
-
-}
diff --git
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/GetAllIsoImagesListQuery.java
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/GetAllIsoImagesListQuery.java
deleted file mode 100644
index b2c56b5..0000000
---
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/GetAllIsoImagesListQuery.java
+++ /dev/null
@@ -1,15 +0,0 @@
-package org.ovirt.engine.core.bll;
-
-import org.ovirt.engine.core.common.businessentities.FileTypeExtension;
-import org.ovirt.engine.core.common.queries.GetAllIsoImagesListParameters;
-
-public class GetAllIsoImagesListQuery<P extends GetAllIsoImagesListParameters>
extends AbstractGetAllImagesListByStorageDomainIdQuery<P> {
- public GetAllIsoImagesListQuery(P parameters) {
- super(parameters);
- }
-
- @Override
- protected FileTypeExtension getFileTypeExtension() {
- return FileTypeExtension.ISO;
- }
-}
diff --git
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/VmRunHandler.java
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/VmRunHandler.java
index 273ad02..8c3e1ec 100644
---
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/VmRunHandler.java
+++
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/VmRunHandler.java
@@ -19,6 +19,7 @@
import org.ovirt.engine.core.common.businessentities.BootSequence;
import org.ovirt.engine.core.common.businessentities.Disk;
import org.ovirt.engine.core.common.businessentities.DiskImage;
+import org.ovirt.engine.core.common.businessentities.FileTypeExtension;
import org.ovirt.engine.core.common.businessentities.RepoFileMetaData;
import org.ovirt.engine.core.common.businessentities.StorageDomain;
import org.ovirt.engine.core.common.businessentities.StorageDomainStatus;
@@ -31,7 +32,7 @@
import org.ovirt.engine.core.common.businessentities.storage_pool;
import org.ovirt.engine.core.common.config.Config;
import org.ovirt.engine.core.common.config.ConfigValues;
-import org.ovirt.engine.core.common.queries.GetAllIsoImagesListParameters;
+import org.ovirt.engine.core.common.queries.GetAllImagesListParameters;
import org.ovirt.engine.core.common.queries.VdcQueryReturnValue;
import org.ovirt.engine.core.common.queries.VdcQueryType;
import org.ovirt.engine.core.common.utils.VmDeviceType;
@@ -326,8 +327,8 @@
}
boolean retValForIso = false;
VdcQueryReturnValue ret =
-
getBackend().runInternalQuery(VdcQueryType.GetAllIsoImagesList,
- new
GetAllIsoImagesListParameters(storageDomainId));
+
getBackend().runInternalQuery(VdcQueryType.GetAllImagesList,
+ new GetAllImagesListParameters(storageDomainId,
FileTypeExtension.ISO));
if (ret != null && ret.getReturnValue() != null &&
ret.getSucceeded()) {
List<RepoFileMetaData> repoFileNameList =
(List<RepoFileMetaData>) ret.getReturnValue();
if (repoFileNameList != null) {
@@ -348,8 +349,8 @@
if (!StringUtils.isEmpty(runParams.getFloppyPath())) {
boolean retValForFloppy = false;
VdcQueryReturnValue ret =
-
getBackend().runInternalQuery(VdcQueryType.GetAllFloppyImagesList,
- new
GetAllIsoImagesListParameters(storageDomainId));
+
getBackend().runInternalQuery(VdcQueryType.GetAllImagesList,
+ new GetAllImagesListParameters(storageDomainId,
FileTypeExtension.Floppy));
if (ret != null && ret.getReturnValue() != null &&
ret.getSucceeded()) {
List<RepoFileMetaData> repoFileNameList =
(List<RepoFileMetaData>) ret.getReturnValue();
if (repoFileNameList != null) {
diff --git
a/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/GetAllImagesListByStoragePoolIdQueryTest.java
b/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/GetAllImagesListByStoragePoolIdQueryTest.java
index 2d799df..5bccdab 100644
---
a/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/GetAllImagesListByStoragePoolIdQueryTest.java
+++
b/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/GetAllImagesListByStoragePoolIdQueryTest.java
@@ -25,20 +25,20 @@
@RunWith(Parameterized.class)
public class GetAllImagesListByStoragePoolIdQueryTest
- extends
AbstractUserQueryTest<GetAllImagesListByStoragePoolIdParameters,
AbstractGetAllImagesListByStoragePoolIdQuery<? extends
GetAllImagesListByStoragePoolIdParameters>> {
+ extends
AbstractUserQueryTest<GetAllImagesListByStoragePoolIdParameters,
GetAllImagesListByStoragePoolIdQuery<? extends
GetAllImagesListByStoragePoolIdParameters>> {
- private Class<? extends
AbstractGetAllImagesListByStoragePoolIdQuery<GetAllImagesListByStoragePoolIdParameters>>
queryClass;
+ private Class<? extends
GetAllImagesListByStoragePoolIdQuery<GetAllImagesListByStoragePoolIdParameters>>
queryClass;
private FileTypeExtension expectedType;
private Guid storageDomainId;
@Parameters
public static Collection<Object[]> data() {
return Arrays.asList(new Object[][]
- { { GetAllIsoImagesListByStoragePoolIdQuery.class,
FileTypeExtension.ISO },
- { GetAllFloppyImagesListByStoragePoolIdQuery.class,
FileTypeExtension.Floppy } });
+ { { GetAllImagesListByStoragePoolIdQuery.class, FileTypeExtension.ISO
},
+ { GetAllImagesListByStoragePoolIdQuery.class,
FileTypeExtension.Floppy } });
}
- public GetAllImagesListByStoragePoolIdQueryTest(Class<? extends
AbstractGetAllImagesListByStoragePoolIdQuery<GetAllImagesListByStoragePoolIdParameters>>
queryClass,
+ public GetAllImagesListByStoragePoolIdQueryTest(Class<? extends
GetAllImagesListByStoragePoolIdQuery<GetAllImagesListByStoragePoolIdParameters>>
queryClass,
FileTypeExtension expectedType) {
this.queryClass = queryClass;
this.expectedType = expectedType;
@@ -54,6 +54,7 @@
protected void setUpMockQueryParameters() {
super.setUpMockQueryParameters();
when(getQueryParameters().getStoragePoolId()).thenReturn(Guid.NewGuid());
+
when(getQueryParameters().getFileTypeExtension()).thenReturn(expectedType);
}
@Override
@@ -65,13 +66,8 @@
}
@Override
- protected Class<? extends AbstractGetAllImagesListByStoragePoolIdQuery<?
extends GetAllImagesListByStoragePoolIdParameters>> getQueryType() {
+ protected Class<? extends GetAllImagesListByStoragePoolIdQuery<? extends
GetAllImagesListByStoragePoolIdParameters>> getQueryType() {
return queryClass;
- }
-
- @Test
- public void testFileTypeExtension() {
- assertEquals("Query fetch wrong type of extension", expectedType,
getQuery().getFileTypeExtension());
}
@Test
diff --git
a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/queries/GetAllImagesListByStoragePoolIdParameters.java
b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/queries/GetAllImagesListByStoragePoolIdParameters.java
index b13e837..8bd9db5 100644
---
a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/queries/GetAllImagesListByStoragePoolIdParameters.java
+++
b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/queries/GetAllImagesListByStoragePoolIdParameters.java
@@ -1,6 +1,8 @@
package org.ovirt.engine.core.common.queries;
+import org.ovirt.engine.core.common.businessentities.FileTypeExtension;
import org.ovirt.engine.core.compat.Guid;
+
public class GetAllImagesListByStoragePoolIdParameters extends
GetAllImagesListParametersBase {
private static final long serialVersionUID = 6098440434536241071L;
@@ -9,7 +11,12 @@
}
public GetAllImagesListByStoragePoolIdParameters(Guid storagePoolId) {
- this.storagePoolId = storagePoolId;
+ setStoragePoolId(storagePoolId);
+ }
+
+ public GetAllImagesListByStoragePoolIdParameters(Guid storagePoolId,
FileTypeExtension fileTypeExt) {
+ super(fileTypeExt);
+ setStoragePoolId(storagePoolId);
}
private Guid storagePoolId = new Guid();
diff --git
a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/queries/GetAllImagesListParameters.java
b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/queries/GetAllImagesListParameters.java
new file mode 100644
index 0000000..940011c
--- /dev/null
+++
b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/queries/GetAllImagesListParameters.java
@@ -0,0 +1,31 @@
+package org.ovirt.engine.core.common.queries;
+
+import org.ovirt.engine.core.common.businessentities.FileTypeExtension;
+import org.ovirt.engine.core.compat.Guid;
+
+
+public class GetAllImagesListParameters extends GetAllImagesListParametersBase
{
+ private static final long serialVersionUID = 6098440434536241071L;
+
+ public GetAllImagesListParameters() {
+ }
+
+ public GetAllImagesListParameters(Guid storageDomainId) {
+ setStorageDomainId(storageDomainId);
+ }
+
+ public GetAllImagesListParameters(Guid storageDomainId, FileTypeExtension
fileTypeExt) {
+ super(fileTypeExt);
+ setStorageDomainId(storageDomainId);
+ }
+
+ private Guid storageDomainId = new Guid();
+
+ public Guid getStorageDomainId() {
+ return storageDomainId;
+ }
+
+ public void setStorageDomainId(Guid value) {
+ storageDomainId = value;
+ }
+}
diff --git
a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/queries/GetAllImagesListParametersBase.java
b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/queries/GetAllImagesListParametersBase.java
index 0869a30..648bcfd 100644
---
a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/queries/GetAllImagesListParametersBase.java
+++
b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/queries/GetAllImagesListParametersBase.java
@@ -1,12 +1,18 @@
package org.ovirt.engine.core.common.queries;
-/** A base class for parameters of queries that retrieve ISO lists */
-public abstract class GetAllImagesListParametersBase extends
VdcQueryParametersBase {
+import org.ovirt.engine.core.common.businessentities.FileTypeExtension;
+/** A base class for parameters of queries that retrieve images lists */
+public abstract class GetAllImagesListParametersBase extends
VdcQueryParametersBase {
private static final long serialVersionUID = 2562476365144558247L;
private boolean forceRefresh;
+ private FileTypeExtension fileTypeExt = FileTypeExtension.All;
public GetAllImagesListParametersBase() {
+ }
+
+ public GetAllImagesListParametersBase(FileTypeExtension fileTypeExt) {
+ setFileTypeExtension(fileTypeExt);
}
public boolean getForceRefresh() {
@@ -16,4 +22,12 @@
public void setForceRefresh(boolean forceRefresh) {
this.forceRefresh = forceRefresh;
}
+
+ public FileTypeExtension getFileTypeExtension() {
+ return fileTypeExt;
+ }
+
+ public void setFileTypeExtension(FileTypeExtension value) {
+ fileTypeExt = value;
+ }
}
diff --git
a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/queries/GetAllIsoImagesListParameters.java
b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/queries/GetAllIsoImagesListParameters.java
deleted file mode 100644
index fcde90b..0000000
---
a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/queries/GetAllIsoImagesListParameters.java
+++ /dev/null
@@ -1,24 +0,0 @@
-package org.ovirt.engine.core.common.queries;
-
-import org.ovirt.engine.core.compat.Guid;
-
-public class GetAllIsoImagesListParameters extends
GetAllImagesListParametersBase {
- private static final long serialVersionUID = 6098440434536241071L;
-
- public GetAllIsoImagesListParameters() {
- }
-
- public GetAllIsoImagesListParameters(Guid storageDomainId) {
- sdId = storageDomainId;
- }
-
- private Guid sdId = new Guid();
-
- public Guid getStorageDomainId() {
- return sdId;
- }
-
- public void setStorageDomainId(Guid value) {
- sdId = value;
- }
-}
diff --git
a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/queries/VdcQueryType.java
b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/queries/VdcQueryType.java
index 1a8f1d1..4cfea42 100644
---
a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/queries/VdcQueryType.java
+++
b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/queries/VdcQueryType.java
@@ -87,11 +87,8 @@
GetAllVmSnapshotsByVmId(VdcQueryAuthType.User),
// Images queries
- GetAllIsoImagesList(VdcQueryAuthType.User),
- GetAllFloppyImagesList(VdcQueryAuthType.User),
- GetAllIsoImagesListByStoragePoolId(VdcQueryAuthType.User),
- GetAllFloppyImagesListByStoragePoolId(VdcQueryAuthType.User),
GetAllImagesList(VdcQueryAuthType.User),
+ GetAllImagesListByStoragePoolId(VdcQueryAuthType.User),
GetAllDisksByVmId(VdcQueryAuthType.User),
GetAllAttachableDisks(VdcQueryAuthType.User),
GetAllDisksByStorageDomainId,
diff --git
a/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendFilesResource.java
b/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendFilesResource.java
index b4db6a8..e02a0d0 100644
---
a/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendFilesResource.java
+++
b/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendFilesResource.java
@@ -12,7 +12,7 @@
import org.ovirt.engine.api.resource.FilesResource;
import org.ovirt.engine.core.common.businessentities.RepoFileMetaData;
-import org.ovirt.engine.core.common.queries.GetAllIsoImagesListParameters;
+import org.ovirt.engine.core.common.queries.GetAllImagesListParameters;
import org.ovirt.engine.core.common.queries.StorageDomainQueryParametersBase;
import org.ovirt.engine.core.common.queries.VdcQueryType;
@@ -71,7 +71,7 @@
}
protected List<String> listFiles() {
- GetAllIsoImagesListParameters queryParams = new
GetAllIsoImagesListParameters(asGuid(storageDomainId));
+ GetAllImagesListParameters queryParams = new
GetAllImagesListParameters(asGuid(storageDomainId));
queryParams.setForceRefresh(true);
List<RepoFileMetaData> files =
getBackendCollection(RepoFileMetaData.class, VdcQueryType.GetAllImagesList,
diff --git
a/backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/BackendFilesResourceTest.java
b/backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/BackendFilesResourceTest.java
index 5ce307b..213d3f7 100644
---
a/backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/BackendFilesResourceTest.java
+++
b/backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/BackendFilesResourceTest.java
@@ -15,7 +15,7 @@
import org.ovirt.engine.core.common.businessentities.RepoFileMetaData;
import org.ovirt.engine.core.common.businessentities.StorageDomainType;
-import org.ovirt.engine.core.common.queries.GetAllIsoImagesListParameters;
+import org.ovirt.engine.core.common.queries.GetAllImagesListParameters;
import org.ovirt.engine.core.common.queries.StorageDomainQueryParametersBase;
import org.ovirt.engine.core.common.queries.VdcQueryType;
import org.ovirt.engine.core.compat.Guid;
@@ -91,7 +91,7 @@
Throwable t = new RuntimeException(FAILURE);
setUpEntityQueryExpectations(VdcQueryType.GetAllImagesList,
- GetAllIsoImagesListParameters.class,
+ GetAllImagesListParameters.class,
new String[] { "StorageDomainId" },
new Object[] { GUIDS[0] },
setUpFiles(),
@@ -116,7 +116,7 @@
Throwable t = new RuntimeException(FAILURE);
setUpEntityQueryExpectations(VdcQueryType.GetAllImagesList,
- GetAllIsoImagesListParameters.class,
+ GetAllImagesListParameters.class,
new String[] { "StorageDomainId" },
new Object[] { GUIDS[0] },
setUpFiles(),
@@ -148,7 +148,7 @@
public void testListFailure() throws Exception {
UriInfo uriInfo = setUpUriExpectations(null);
setUpEntityQueryExpectations(VdcQueryType.GetAllImagesList,
- GetAllIsoImagesListParameters.class,
+ GetAllImagesListParameters.class,
new String[] { "StorageDomainId" },
new Object[] { GUIDS[0] },
setUpFiles(),
@@ -185,7 +185,7 @@
assert(query.equals(""));
setUpEntityQueryExpectations(VdcQueryType.GetAllImagesList,
- GetAllIsoImagesListParameters.class,
+ GetAllImagesListParameters.class,
new String[] { "StorageDomainId" },
new Object[] { GUIDS[0] },
setUpFiles(),
diff --git
a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/dataprovider/AsyncDataProvider.java
b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/dataprovider/AsyncDataProvider.java
index 0ad85c2..f28bed0 100644
---
a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/dataprovider/AsyncDataProvider.java
+++
b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/dataprovider/AsyncDataProvider.java
@@ -18,6 +18,7 @@
import org.ovirt.engine.core.common.businessentities.Disk;
import org.ovirt.engine.core.common.businessentities.DiskImage;
import org.ovirt.engine.core.common.businessentities.DiskInterface;
+import org.ovirt.engine.core.common.businessentities.FileTypeExtension;
import org.ovirt.engine.core.common.businessentities.IVdcQueryable;
import org.ovirt.engine.core.common.businessentities.LUNs;
import org.ovirt.engine.core.common.businessentities.Quota;
@@ -259,8 +260,8 @@
};
GetAllImagesListByStoragePoolIdParameters parameters =
- new GetAllImagesListByStoragePoolIdParameters(storagePoolId);
- Frontend.RunQuery(VdcQueryType.GetAllIsoImagesListByStoragePoolId,
parameters, aQuery);
+ new GetAllImagesListByStoragePoolIdParameters(storagePoolId,
FileTypeExtension.ISO);
+ Frontend.RunQuery(VdcQueryType.GetAllImagesListByStoragePoolId,
parameters, aQuery);
}
public static void GetFloppyImageList(AsyncQuery aQuery, Guid
storagePoolId) {
@@ -284,8 +285,8 @@
}
};
- Frontend.RunQuery(VdcQueryType.GetAllFloppyImagesListByStoragePoolId,
- new GetAllImagesListByStoragePoolIdParameters(storagePoolId),
+ Frontend.RunQuery(VdcQueryType.GetAllImagesListByStoragePoolId,
+ new GetAllImagesListByStoragePoolIdParameters(storagePoolId,
FileTypeExtension.Floppy),
aQuery);
}
diff --git
a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/storage/StorageIsoListModel.java
b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/storage/StorageIsoListModel.java
index 7a40ffd..a3cc910 100644
---
a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/storage/StorageIsoListModel.java
+++
b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/storage/StorageIsoListModel.java
@@ -4,9 +4,10 @@
import java.util.Arrays;
import java.util.Collections;
+import org.ovirt.engine.core.common.businessentities.FileTypeExtension;
import org.ovirt.engine.core.common.businessentities.RepoFileMetaData;
import org.ovirt.engine.core.common.businessentities.StorageDomain;
-import org.ovirt.engine.core.common.queries.GetAllIsoImagesListParameters;
+import org.ovirt.engine.core.common.queries.GetAllImagesListParameters;
import org.ovirt.engine.core.common.queries.VdcQueryParametersBase;
import org.ovirt.engine.core.common.queries.VdcQueryReturnValue;
import org.ovirt.engine.core.common.queries.VdcQueryType;
@@ -144,18 +145,22 @@
StorageDomain storageDomain = (StorageDomain) getEntity();
- GetAllIsoImagesListParameters tempVar = new
GetAllIsoImagesListParameters();
- tempVar.setStorageDomainId(storageDomain.getId());
- tempVar.setForceRefresh(true);
- tempVar.setRefresh(getIsQueryFirstTime());
- GetAllIsoImagesListParameters parameters = tempVar;
+ GetAllImagesListParameters isoListParams = new
GetAllImagesListParameters(
+ storageDomain.getId(), FileTypeExtension.ISO);
+ isoListParams.setForceRefresh(true);
+ isoListParams.setRefresh(getIsQueryFirstTime());
+
+ GetAllImagesListParameters floppyListParams = new
GetAllImagesListParameters(
+ storageDomain.getId(), FileTypeExtension.Floppy);
+ floppyListParams.setForceRefresh(true);
+ floppyListParams.setRefresh(getIsQueryFirstTime());
StartProgress(null);
Frontend.RunMultipleQueries(new
ArrayList<VdcQueryType>(Arrays.asList(new VdcQueryType[] {
- VdcQueryType.GetAllIsoImagesList,
VdcQueryType.GetAllFloppyImagesList })),
+ VdcQueryType.GetAllImagesList, VdcQueryType.GetAllImagesList
})),
new ArrayList<VdcQueryParametersBase>(Arrays.asList(new
VdcQueryParametersBase[] {
- parameters, parameters })),
+ isoListParams, floppyListParams })),
this);
}
diff --git
a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/SpiceConsoleModel.java
b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/SpiceConsoleModel.java
index 556c6c8..b17262c 100644
---
a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/SpiceConsoleModel.java
+++
b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/SpiceConsoleModel.java
@@ -16,6 +16,7 @@
import org.ovirt.engine.core.common.action.VdcReturnValueBase;
import org.ovirt.engine.core.common.action.VmOperationParameterBase;
import org.ovirt.engine.core.common.businessentities.DisplayType;
+import org.ovirt.engine.core.common.businessentities.FileTypeExtension;
import org.ovirt.engine.core.common.businessentities.RepoFileMetaData;
import org.ovirt.engine.core.common.businessentities.StorageDomain;
import org.ovirt.engine.core.common.businessentities.UsbPolicy;
@@ -298,11 +299,11 @@
AsyncDataProvider.getDefaultConfigurationVersion()));
if (isoDomain != null) {
-
queryTypeList.add(VdcQueryType.GetAllIsoImagesListByStoragePoolId);
+
queryTypeList.add(VdcQueryType.GetAllImagesListByStoragePoolId);
- GetAllImagesListByStoragePoolIdParameters getIsoPamams =
- new
GetAllImagesListByStoragePoolIdParameters(vm.getStoragePoolId());
- parametersList.add(getIsoPamams);
+ GetAllImagesListByStoragePoolIdParameters getIsoParams =
+ new
GetAllImagesListByStoragePoolIdParameters(vm.getStoragePoolId(),
FileTypeExtension.ISO);
+ parametersList.add(getIsoParams);
}
Frontend.RunMultipleQueries(queryTypeList, parametersList,
thisSpiceConsoleModel);
diff --git
a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/UnitVmModel.java
b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/UnitVmModel.java
index 0a383e5..438bb81 100644
---
a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/UnitVmModel.java
+++
b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/UnitVmModel.java
@@ -1029,7 +1029,7 @@
Frontend.getQueryCompleteEvent().addListener(this);
Frontend.Subscribe(new VdcQueryType[] {
VdcQueryType.GetStorageDomainsByStoragePoolId,
- VdcQueryType.GetAllIsoImagesListByStoragePoolId,
VdcQueryType.GetTimeZones,
+ VdcQueryType.GetAllImagesListByStoragePoolId,
VdcQueryType.GetTimeZones,
VdcQueryType.GetDefualtTimeZone,
VdcQueryType.GetStoragePoolsByClusterService,
VdcQueryType.GetDomainList, VdcQueryType.GetConfigurationValue,
VdcQueryType.GetVdsGroupsByStoragePoolId,
VdcQueryType.GetVmTemplatesByStoragePoolId,
--
To view, visit http://gerrit.ovirt.org/13066
To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I079e3f1c5bfbcfd1dc09ebce41a327c253eb53ac
Gerrit-PatchSet: 1
Gerrit-Project: ovirt-engine
Gerrit-Branch: master
Gerrit-Owner: Federico Simoncelli <fsimo...@redhat.com>
_______________________________________________
Engine-patches mailing list
Engine-patches@ovirt.org
http://lists.ovirt.org/mailman/listinfo/engine-patches
