Ravi Nori has uploaded a new change for review. Change subject: restapi : call to show files on iso domain no longer shows all files ......................................................................
restapi : call to show files on iso domain no longer shows all files /api/storagedomain/xxx/files does not show all files, only shows iso files. Change-Id: I31d305baaa28e5c0f0b918e497197dbd7b0e496e Bug-Url: https://bugzilla.redhat.com/949261 Signed-off-by: Ravi Nori <rn...@redhat.com> --- M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/GetImagesListQuery.java M backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendFilesResource.java 2 files changed, 14 insertions(+), 2 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/30/13730/1 diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/GetImagesListQuery.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/GetImagesListQuery.java index 311f3a8..f27fd32 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/GetImagesListQuery.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/GetImagesListQuery.java @@ -1,6 +1,8 @@ package org.ovirt.engine.core.bll; +import java.util.ArrayList; import java.util.List; +import org.ovirt.engine.core.common.businessentities.ImageType; import org.ovirt.engine.core.common.businessentities.RepoFileMetaData; import org.ovirt.engine.core.common.queries.GetImagesListParameters; @@ -14,9 +16,19 @@ } protected List<RepoFileMetaData> getUserRequestForStorageDomainRepoFileList() { + if (getParameters().getImageType().equals(ImageType.All)) { + List<RepoFileMetaData> fileList = new ArrayList<RepoFileMetaData>(); + fileList.addAll(getFileListForExtension(ImageType.ISO)); + fileList.addAll(getFileListForExtension(ImageType.Floppy)); + return fileList; + } + return getFileListForExtension(getParameters().getImageType()); + } + + private List<RepoFileMetaData> getFileListForExtension(ImageType imageType) { return IsoDomainListSyncronizer.getInstance().getUserRequestForStorageDomainRepoFileList (getStorageDomainId(), - getParameters().getImageType(), + imageType, getParameters().getForceRefresh()); } 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 14d01b0..32a51d2 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 @@ -72,7 +72,7 @@ } protected List<String> listFiles() { - GetImagesListParameters queryParams = new GetImagesListParameters(asGuid(storageDomainId), ImageType.ISO); + GetImagesListParameters queryParams = new GetImagesListParameters(asGuid(storageDomainId), ImageType.All); queryParams.setForceRefresh(true); List<RepoFileMetaData> files = getBackendCollection(RepoFileMetaData.class, VdcQueryType.GetImagesList, -- To view, visit http://gerrit.ovirt.org/13730 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I31d305baaa28e5c0f0b918e497197dbd7b0e496e Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Ravi Nori <rn...@redhat.com> _______________________________________________ Engine-patches mailing list Engine-patches@ovirt.org http://lists.ovirt.org/mailman/listinfo/engine-patches
