Federico Simoncelli has uploaded a new change for review. Change subject: core: rename FileTypeExtension to ImageType ......................................................................
core: rename FileTypeExtension to ImageType Moving into the direction of supporting image storage domain the enum FileTypeExtension has been renamed to ImageType. The concept of file extensions might not apply to some kind of image storage domain, on the other hand the idea of image types (iso, vfd, disk) is valid across all the possible implementations. Change-Id: I77e152cbab707c944f0505ccac87cfdea9bb8a2e Signed-off-by: Federico Simoncelli <[email protected]> --- M 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 M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/IsoDomainListSyncronizer.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/RunVmCommand.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 D backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/FileTypeExtension.java A backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/ImageType.java M backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/RepoFileMetaData.java M backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/queries/GetAllImagesListByStoragePoolIdParameters.java M 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 M backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/RepoFileMetaDataDAO.java M backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/RepoFileMetaDataDAODbFacadeImpl.java M backend/manager/modules/dal/src/test/java/org/ovirt/engine/core/dao/RepoFileMetaDataDAOTest.java M frontend/webadmin/modules/gwt-common/src/main/resources/org/ovirt/engine/core/Common.gwt.xml 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 19 files changed, 152 insertions(+), 151 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/67/13067/1 diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/GetAllImagesListByStoragePoolIdQuery.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/GetAllImagesListByStoragePoolIdQuery.java index bbe8e26..bfce724 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/GetAllImagesListByStoragePoolIdQuery.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/GetAllImagesListByStoragePoolIdQuery.java @@ -28,7 +28,7 @@ protected List<RepoFileMetaData> getUserRequestForStorageDomainRepoFileList() { return IsoDomainListSyncronizer.getInstance().getUserRequestForStoragePoolAndDomainRepoFileList (getStoragePoolId(), getStorageDomainId(), - getParameters().getFileTypeExtension(), + getParameters().getImageType(), 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 c84cbbd..6bac4cc 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 @@ -16,7 +16,7 @@ protected List<RepoFileMetaData> getUserRequestForStorageDomainRepoFileList() { return IsoDomainListSyncronizer.getInstance().getUserRequestForStorageDomainRepoFileList (getStorageDomainId(), - getParameters().getFileTypeExtension(), + getParameters().getImageType(), getParameters().getForceRefresh()); } diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/IsoDomainListSyncronizer.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/IsoDomainListSyncronizer.java index e1c84a1..55e652a 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/IsoDomainListSyncronizer.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/IsoDomainListSyncronizer.java @@ -13,7 +13,7 @@ import java.util.concurrent.locks.ReentrantLock; import org.ovirt.engine.core.common.AuditLogType; -import org.ovirt.engine.core.common.businessentities.FileTypeExtension; +import org.ovirt.engine.core.common.businessentities.ImageType; import org.ovirt.engine.core.common.businessentities.RepoFileMetaData; import org.ovirt.engine.core.common.businessentities.StorageDomainStatus; import org.ovirt.engine.core.common.businessentities.StorageDomainType; @@ -140,22 +140,22 @@ * * @param storageDomainId * - The storage domain Id, which we fetch the Iso list from. - * @param fileTypeExtension - * - The fileTypeExtension we want to fetch the files from the cache. + * @param imageType + * - The imageType we want to fetch the files from the cache. * @param forceRefresh * - Indicates if the domain should be refreshed from VDSM. * @return List of RepoFilesMetaData files or null (If fetch from VDSM failed). */ public List<RepoFileMetaData> getUserRequestForStorageDomainRepoFileList(Guid storageDomainId, - FileTypeExtension fileTypeExtension, + ImageType imageType, boolean forceRefresh) { // The result list we send back. List<RepoFileMetaData> repoList = null; - if (! isStorageDomainValid(storageDomainId, fileTypeExtension, forceRefresh)){ + if (! isStorageDomainValid(storageDomainId, imageType, forceRefresh)){ return null; } // At any case, if refreshed or not, get Iso list from the cache. - repoList = getCachedIsoListByDomainId(storageDomainId, fileTypeExtension); + repoList = getCachedIsoListByDomainId(storageDomainId, imageType); // Return list of repository files. return repoList; @@ -169,42 +169,42 @@ * - The storage pool Id * @param storageDomainId * - The storage domain Id, which we fetch the Iso list from. - * @param fileTypeExtension - * - The fileTypeExtension we want to fetch the files from the cache. + * @param imageType + * - The imageType we want to fetch the files from the cache. * @param forceRefresh * - Indicates if the domain should be refreshed from VDSM. * @return List of RepoFilesMetaData files or null (If fetch from VDSM failed). */ public List<RepoFileMetaData> getUserRequestForStoragePoolAndDomainRepoFileList(Guid storagePoolId, Guid storageDomainId, - FileTypeExtension fileTypeExtension, + ImageType imageType, boolean forceRefresh) { // The result list we send back. List<RepoFileMetaData> repoList = null; - if (! isStorageDomainValid(storageDomainId, fileTypeExtension, forceRefresh)){ + if (! isStorageDomainValid(storageDomainId, imageType, forceRefresh)){ return null; } // At any case, if refreshed or not, get Iso list from the cache. - repoList = getCachedIsoListByStoragePoolAndDomainId(storagePoolId, storageDomainId, fileTypeExtension); + repoList = getCachedIsoListByStoragePoolAndDomainId(storagePoolId, storageDomainId, imageType); // Return list of repository files. return repoList; } - private boolean refreshRepos(Guid storageDomainId, FileTypeExtension fileTypeExtension, boolean forceRefresh) { + private boolean refreshRepos(Guid storageDomainId, ImageType imageType, boolean forceRefresh) { boolean res = true; List<RepoFileMetaData> tempProblematicRepoFileList = new ArrayList<RepoFileMetaData>(); // If user choose to force refresh. if (forceRefresh) { // Add an audit log if refresh succeeded. - if (refreshIsoDomain(storageDomainId, tempProblematicRepoFileList, fileTypeExtension)) { + if (refreshIsoDomain(storageDomainId, tempProblematicRepoFileList, imageType)) { // Print log Indicating the problematic pools (If was any). handleErrorLog(tempProblematicRepoFileList); // If refresh succeeded print an audit log Indicating that. StorageDomain storageDomain = DbFacade.getInstance().getStorageDomainDao().get(storageDomainId); - addToAuditLogSuccessMessage(storageDomain.getStorageName(), fileTypeExtension.name()); + addToAuditLogSuccessMessage(storageDomain.getStorageName(), imageType.name()); } else { // Print log Indicating the problematic pools. handleErrorLog(tempProblematicRepoFileList); @@ -223,21 +223,21 @@ * - The Repository domain Id, we want to refresh. * @param storagePoolId * - The Storage pool Id, we use to fetch the Iso files from.. - * @param fileTypeExt - * - The fileTypeExtension we want to fetch the files from the cache. + * @param imageType + * - The imageType we want to fetch the files from the cache. * @return Boolean value indicating if the refresh succeeded or not. */ private boolean refreshIsoDomainFileForStoragePool(Guid storageDomainId, Guid storagePoolId, - FileTypeExtension fileTypeExt) { + ImageType imageType) { boolean refreshSucceeded = false; // Setting the indication to the indication whether the storage pool is valid. boolean updateFromVDSMSucceeded = true; // If the SPM and the storage pool are valid, try to refresh the Iso list by fetching it from the SPM. - if (fileTypeExt == FileTypeExtension.ISO) { + if (imageType == ImageType.ISO) { updateFromVDSMSucceeded = updateIsoListFromVDSM(storagePoolId, storageDomainId); - } else if (fileTypeExt == FileTypeExtension.Floppy) { + } else if (imageType == ImageType.Floppy) { updateFromVDSMSucceeded = updateFloppyListFromVDSM(storagePoolId, storageDomainId) && updateFromVDSMSucceeded; } @@ -246,7 +246,7 @@ if (updateFromVDSMSucceeded) { refreshSucceeded = true; log.debugFormat("Refresh succeeded for file type {0} at storage domain id {1} in storage pool id {2}.", - fileTypeExt.name(), + imageType.name(), storageDomainId, storagePoolId); } @@ -264,13 +264,13 @@ * - The Repository domain Id, we want to refresh. * @param problematicRepoFileList * - List of business entities, each one indicating the problematic entity. - * @param fileTypeExt - * - The fileTypeExtension we want to fetch the files from the cache. + * @param imageType + * - The imageType we want to fetch the files from the cache. * @return Boolean value indicating if the refresh succeeded or not. */ private boolean refreshIsoDomain(Guid storageDomainId, List<RepoFileMetaData> problematicRepoFileList, - FileTypeExtension fileTypeExt) { + ImageType imageType) { boolean refreshSucceeded = false; List<RepoFileMetaData> tempProblematicRepoFileList = new ArrayList<RepoFileMetaData>(); @@ -281,7 +281,7 @@ .getAllForStorage(storageDomainId); log.debugFormat("Fetched {0} storage pools for {1} file type, in Iso domain {2}.", isoMapList.size(), - fileTypeExt, + imageType, storageDomainId); Iterator<StoragePoolIsoMap> iter = isoMapList.iterator(); @@ -293,7 +293,7 @@ if (status != StorageDomainStatus.Active) { log.debugFormat("Storage domain id {0}, is not active, and therefore could not be refreshed for {1} file type (Iso domain status is {2}).", storageDomainId, - fileTypeExt, + imageType, status); } else { @@ -301,17 +301,17 @@ refreshSucceeded = refreshIsoDomainFileForStoragePool(storageDomainId, storagePoolId, - fileTypeExt); + imageType); if (!refreshSucceeded) { log.debugFormat("Failed refreshing Storage domain id {0}, for {1} file type in storage pool id {2}.", storageDomainId, - fileTypeExt, + imageType, storagePoolId); // set a mock repository file meta data with storage domain id and storage pool id. RepoFileMetaData repoFileMetaData = new RepoFileMetaData(); repoFileMetaData.setStoragePoolId(storagePoolId); repoFileMetaData.setRepoDomainId(storageDomainId); - repoFileMetaData.setFileType(fileTypeExt); + repoFileMetaData.setFileType(imageType); // Add the repository file to the list of problematic Iso domains. tempProblematicRepoFileList.add(repoFileMetaData); @@ -357,16 +357,16 @@ * - The storage domain Id we want to get the file list from. * @param isoStorageDomainId * - The storage pool Id we want to get the file list from. - * @param fileTypeExtension + * @param imageType * - The file type extension (ISO or Floppy). * @return List of Iso file fetched from DB, if parameter is invalid returns an empty list. */ - public List<RepoFileMetaData> getCachedIsoListByStoragePoolAndDomainId(Guid isoStoragePoolId, Guid isoStorageDomainId, FileTypeExtension fileTypeExtension) { + public List<RepoFileMetaData> getCachedIsoListByStoragePoolAndDomainId(Guid isoStoragePoolId, Guid isoStorageDomainId, ImageType imageType) { List<RepoFileMetaData> fileListMD = new ArrayList<RepoFileMetaData>(); // Check validation of parameters. if (isoStorageDomainId != null && isoStoragePoolId != null && VmRunHandler.getInstance().findActiveISODomain(isoStoragePoolId) != null) { // Get all the Iso files of storage and domain ID. - fileListMD = repoStorageDom.getRepoListForStorageDomainAndStoragePool(isoStoragePoolId, isoStorageDomainId, fileTypeExtension); + fileListMD = repoStorageDom.getRepoListForStorageDomainAndStoragePool(isoStoragePoolId, isoStorageDomainId, imageType); } return fileListMD; } @@ -379,11 +379,11 @@ * @return List of Iso files fetched from DB, if parameter is invalid returns an empty list. */ public List<RepoFileMetaData> getCachedIsoListByDomainId(Guid isoStorageDomainId, - FileTypeExtension fileTypeExtension) { + ImageType imageType) { List<RepoFileMetaData> fileListMD = new ArrayList<RepoFileMetaData>(); if (isoStorageDomainId != null) { fileListMD = - repoStorageDom.getRepoListForStorageDomain(isoStorageDomainId, fileTypeExtension); + repoStorageDom.getRepoListForStorageDomain(isoStorageDomainId, imageType); } return fileListMD; } @@ -414,18 +414,18 @@ * - The storage domain Id. * @param storagePoolId * - The storage pool Id. - * @param fileTypeExt + * @param imageType * - The file type extension (ISO or Floppy). * @see #handleErrorLog(List) */ - private static void handleErrorLog(Guid storagePoolId, Guid storageDomainId, FileTypeExtension fileTypeExt) { + private static void handleErrorLog(Guid storagePoolId, Guid storageDomainId, ImageType imageType) { List<RepoFileMetaData> tempProblematicRepoFileList = new ArrayList<RepoFileMetaData>(); // set mock repo file meta data with storage domain id and storage pool id. RepoFileMetaData repoFileMetaData = new RepoFileMetaData(); repoFileMetaData.setStoragePoolId(storagePoolId); repoFileMetaData.setRepoDomainId(storageDomainId); - repoFileMetaData.setFileType(fileTypeExt); + repoFileMetaData.setFileType(imageType); // Add the repository file to the list, and use handleError. tempProblematicRepoFileList.add(repoFileMetaData); @@ -548,8 +548,8 @@ */ private static boolean refreshIsoFileListMetaData(final Guid repoStorageDomainId, final RepoFileMetaDataDAO repoFileMetaDataDao, - final List<String> isoDomainList, final FileTypeExtension fileTypeExt) { - Lock syncObject = getSyncObject(repoStorageDomainId, fileTypeExt); + final List<String> isoDomainList, final ImageType imageType) { + Lock syncObject = getSyncObject(repoStorageDomainId, imageType); try { syncObject.lock(); return (Boolean) TransactionSupport.executeInScope(TransactionScopeOption.RequiresNew, @@ -557,7 +557,7 @@ @Override public Object runInTransaction() { long currentTime = System.currentTimeMillis(); - repoFileMetaDataDao.removeRepoDomainFileList(repoStorageDomainId, fileTypeExt); + repoFileMetaDataDao.removeRepoDomainFileList(repoStorageDomainId, imageType); RepoFileMetaData repo_md; for (String isoFile : isoDomainList) { repo_md = new RepoFileMetaData(); @@ -566,7 +566,7 @@ repo_md.setRepoDomainId(repoStorageDomainId); repo_md.setDateCreated(null); repo_md.setRepoFileName(isoFile); - repo_md.setFileType(fileTypeExt); + repo_md.setFileType(imageType); repoFileMetaDataDao.addRepoFileMap(repo_md); } return true; @@ -591,11 +591,11 @@ private synchronized void refreshActivatedStorageDomainFromVdsm(Guid storagePoolId, Guid storageDomainId) { if (!updateIsoListFromVDSM(storagePoolId, storageDomainId)) { // Add an audit log that refresh was failed for Iso files. - handleErrorLog(storagePoolId, storageDomainId, FileTypeExtension.ISO); + handleErrorLog(storagePoolId, storageDomainId, ImageType.ISO); } if (!updateFloppyListFromVDSM(storagePoolId, storageDomainId)) { // Add an audit log that refresh was failed for Floppy files. - handleErrorLog(storagePoolId, storageDomainId, FileTypeExtension.Floppy); + handleErrorLog(storagePoolId, storageDomainId, ImageType.Floppy); } } @@ -637,7 +637,7 @@ refreshIsoSucceeded = refreshIsoFileListMetaData(repoStorageDomainId, repoStorageDom, - isoDomainList, FileTypeExtension.ISO); + isoDomainList, ImageType.ISO); } } catch (Exception e) { refreshIsoSucceeded = false; @@ -674,7 +674,7 @@ refreshFloppySucceeded = refreshIsoFileListMetaData(repoStorageDomainId, repoStorageDom, - isoDomainFloppyList, FileTypeExtension.Floppy); + isoDomainFloppyList, ImageType.Floppy); } log.debugFormat("The refresh process from VDSM, for Floppy files succeeded."); } catch (Exception e) { @@ -693,12 +693,12 @@ * * @param domainId * - The domain Id that supposed to be refreshed. - * @param fileTypeExt + * @param imageType * - The file type supposed to be refreshed. * @return - The Lock object, which represent the domain and the file type, to lock. */ - private static Lock getSyncObject(Guid domainId, FileTypeExtension fileTypeExt) { - Pair<Guid, FileTypeExtension> domainPerFileType = new Pair<Guid, FileTypeExtension>(domainId, fileTypeExt); + private static Lock getSyncObject(Guid domainId, ImageType imageType) { + Pair<Guid, ImageType> domainPerFileType = new Pair<Guid, ImageType>(domainId, imageType); syncDomainForFileTypeMap.putIfAbsent(domainPerFileType, new ReentrantLock()); return syncDomainForFileTypeMap.get(domainPerFileType); } @@ -721,20 +721,20 @@ /** * Add audit log message when fetch encounter problems. */ - private static void addToAuditLogSuccessMessage(String IsoDomain, String fileTypeExt) { + private static void addToAuditLogSuccessMessage(String IsoDomain, String imageType) { AuditLogableBase logable = new AuditLogableBase(); - logable.addCustomValue("isoDomains", String.format("%s (%s file type)", IsoDomain, fileTypeExt)); + logable.addCustomValue("isoDomains", String.format("%s (%s file type)", IsoDomain, imageType)); AuditLogDirector.log(logable, AuditLogType.REFRESH_REPOSITORY_FILE_LIST_SUCCEEDED); } - private boolean isStorageDomainValid(Guid storageDomainId, FileTypeExtension fileTypeExtension, boolean forceRefresh) { + private boolean isStorageDomainValid(Guid storageDomainId, ImageType imageType, boolean forceRefresh) { // Check storage domain Id validity. if (storageDomainId == null) { log.error("Storage domain ID received from command query is null."); return false; } - if (!refreshRepos(storageDomainId, fileTypeExtension, forceRefresh)) { + if (!refreshRepos(storageDomainId, imageType, forceRefresh)) { return false; } return true; diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/RunVmCommand.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/RunVmCommand.java index 67cf737..f15fd78 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/RunVmCommand.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/RunVmCommand.java @@ -33,7 +33,7 @@ import org.ovirt.engine.core.common.businessentities.Disk; import org.ovirt.engine.core.common.businessentities.DisplayType; import org.ovirt.engine.core.common.businessentities.Entities; -import org.ovirt.engine.core.common.businessentities.FileTypeExtension; +import org.ovirt.engine.core.common.businessentities.ImageType; import org.ovirt.engine.core.common.businessentities.RepoFileMetaData; import org.ovirt.engine.core.common.businessentities.Snapshot.SnapshotType; import org.ovirt.engine.core.common.businessentities.StorageDomain; @@ -598,7 +598,7 @@ // Fetch cached Iso files from active Iso domain. List<RepoFileMetaData> repoFilesMap = IsoDomainListSyncronizer.getInstance().getCachedIsoListByDomainId(isoDomain.getId(), - FileTypeExtension.ISO); + ImageType.ISO); Version bestClusterVer = null; int bestToolVer = 0; for (RepoFileMetaData map : repoFilesMap) { 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 8c3e1ec..952f797 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,7 +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.ImageType; import org.ovirt.engine.core.common.businessentities.RepoFileMetaData; import org.ovirt.engine.core.common.businessentities.StorageDomain; import org.ovirt.engine.core.common.businessentities.StorageDomainStatus; @@ -328,7 +328,7 @@ boolean retValForIso = false; VdcQueryReturnValue ret = getBackend().runInternalQuery(VdcQueryType.GetAllImagesList, - new GetAllImagesListParameters(storageDomainId, FileTypeExtension.ISO)); + new GetAllImagesListParameters(storageDomainId, ImageType.ISO)); if (ret != null && ret.getReturnValue() != null && ret.getSucceeded()) { List<RepoFileMetaData> repoFileNameList = (List<RepoFileMetaData>) ret.getReturnValue(); if (repoFileNameList != null) { @@ -350,7 +350,7 @@ boolean retValForFloppy = false; VdcQueryReturnValue ret = getBackend().runInternalQuery(VdcQueryType.GetAllImagesList, - new GetAllImagesListParameters(storageDomainId, FileTypeExtension.Floppy)); + new GetAllImagesListParameters(storageDomainId, ImageType.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 5bccdab..f889d62 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 @@ -15,7 +15,7 @@ import org.junit.runner.RunWith; import org.junit.runners.Parameterized; import org.junit.runners.Parameterized.Parameters; -import org.ovirt.engine.core.common.businessentities.FileTypeExtension; +import org.ovirt.engine.core.common.businessentities.ImageType; import org.ovirt.engine.core.common.businessentities.RepoFileMetaData; import org.ovirt.engine.core.common.businessentities.storage_pool; import org.ovirt.engine.core.common.queries.GetAllImagesListByStoragePoolIdParameters; @@ -28,18 +28,18 @@ extends AbstractUserQueryTest<GetAllImagesListByStoragePoolIdParameters, GetAllImagesListByStoragePoolIdQuery<? extends GetAllImagesListByStoragePoolIdParameters>> { private Class<? extends GetAllImagesListByStoragePoolIdQuery<GetAllImagesListByStoragePoolIdParameters>> queryClass; - private FileTypeExtension expectedType; + private ImageType expectedType; private Guid storageDomainId; @Parameters public static Collection<Object[]> data() { return Arrays.asList(new Object[][] - { { GetAllImagesListByStoragePoolIdQuery.class, FileTypeExtension.ISO }, - { GetAllImagesListByStoragePoolIdQuery.class, FileTypeExtension.Floppy } }); + { { GetAllImagesListByStoragePoolIdQuery.class, ImageType.ISO }, + { GetAllImagesListByStoragePoolIdQuery.class, ImageType.Floppy } }); } public GetAllImagesListByStoragePoolIdQueryTest(Class<? extends GetAllImagesListByStoragePoolIdQuery<GetAllImagesListByStoragePoolIdParameters>> queryClass, - FileTypeExtension expectedType) { + ImageType expectedType) { this.queryClass = queryClass; this.expectedType = expectedType; } @@ -54,7 +54,7 @@ protected void setUpMockQueryParameters() { super.setUpMockQueryParameters(); when(getQueryParameters().getStoragePoolId()).thenReturn(Guid.NewGuid()); - when(getQueryParameters().getFileTypeExtension()).thenReturn(expectedType); + when(getQueryParameters().getImageType()).thenReturn(expectedType); } @Override diff --git a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/FileTypeExtension.java b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/FileTypeExtension.java deleted file mode 100644 index afa3eee..0000000 --- a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/FileTypeExtension.java +++ /dev/null @@ -1,33 +0,0 @@ -package org.ovirt.engine.core.common.businessentities; - -import java.util.HashMap; -import java.util.Map; - -public enum FileTypeExtension { - Unknown(0), - ISO(1), - Floppy(2), - All(3); - - private int intValue; - private static Map<Integer, FileTypeExtension> mappings; - - static { - mappings = new HashMap<Integer, FileTypeExtension>(); - for (FileTypeExtension error : values()) { - mappings.put(error.getValue(), error); - } - } - - private FileTypeExtension(int value) { - intValue = value; - } - - public int getValue() { - return intValue; - } - - public static FileTypeExtension forValue(int value) { - return mappings.get(value); - } -} diff --git a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/ImageType.java b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/ImageType.java new file mode 100644 index 0000000..d5610fa --- /dev/null +++ b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/ImageType.java @@ -0,0 +1,34 @@ +package org.ovirt.engine.core.common.businessentities; + +import java.util.HashMap; +import java.util.Map; + +public enum ImageType { + Unknown(0), + ISO(1), + Floppy(2), + Disk(3), + All(4); + + private int intValue; + private static Map<Integer, ImageType> mappings; + + static { + mappings = new HashMap<Integer, ImageType>(); + for (ImageType error : values()) { + mappings.put(error.getValue(), error); + } + } + + private ImageType(int value) { + intValue = value; + } + + public int getValue() { + return intValue; + } + + public static ImageType forValue(int value) { + return mappings.get(value); + } +} diff --git a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/RepoFileMetaData.java b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/RepoFileMetaData.java index 7a96daf..4ecabd8 100644 --- a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/RepoFileMetaData.java +++ b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/RepoFileMetaData.java @@ -19,7 +19,7 @@ private long size = 0; private Date dateCreated = new Date(); private long lastRefreshed; - private FileTypeExtension fileType; + private ImageType fileType; /** * Empty constructor for retrieving new clean entity @@ -166,14 +166,14 @@ * @param fileType * - The file type extension. */ - public void setFileType(FileTypeExtension fileType) { + public void setFileType(ImageType fileType) { this.fileType = fileType; } /** * @return the file type. */ - public FileTypeExtension getFileType() { + public ImageType getFileType() { return fileType; } } 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 8bd9db5..9817f3d 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,6 @@ package org.ovirt.engine.core.common.queries; -import org.ovirt.engine.core.common.businessentities.FileTypeExtension; +import org.ovirt.engine.core.common.businessentities.ImageType; import org.ovirt.engine.core.compat.Guid; @@ -14,8 +14,8 @@ setStoragePoolId(storagePoolId); } - public GetAllImagesListByStoragePoolIdParameters(Guid storagePoolId, FileTypeExtension fileTypeExt) { - super(fileTypeExt); + public GetAllImagesListByStoragePoolIdParameters(Guid storagePoolId, ImageType imageType) { + super(imageType); setStoragePoolId(storagePoolId); } 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 index 940011c..6306ef4 100644 --- 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 @@ -1,6 +1,6 @@ package org.ovirt.engine.core.common.queries; -import org.ovirt.engine.core.common.businessentities.FileTypeExtension; +import org.ovirt.engine.core.common.businessentities.ImageType; import org.ovirt.engine.core.compat.Guid; @@ -14,8 +14,8 @@ setStorageDomainId(storageDomainId); } - public GetAllImagesListParameters(Guid storageDomainId, FileTypeExtension fileTypeExt) { - super(fileTypeExt); + public GetAllImagesListParameters(Guid storageDomainId, ImageType imageType) { + super(imageType); setStorageDomainId(storageDomainId); } 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 648bcfd..4eb8b0f 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,18 +1,18 @@ package org.ovirt.engine.core.common.queries; -import org.ovirt.engine.core.common.businessentities.FileTypeExtension; +import org.ovirt.engine.core.common.businessentities.ImageType; /** 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; + private ImageType imageType = ImageType.All; public GetAllImagesListParametersBase() { } - public GetAllImagesListParametersBase(FileTypeExtension fileTypeExt) { - setFileTypeExtension(fileTypeExt); + public GetAllImagesListParametersBase(ImageType imageType) { + setImageType(imageType); } public boolean getForceRefresh() { @@ -23,11 +23,11 @@ this.forceRefresh = forceRefresh; } - public FileTypeExtension getFileTypeExtension() { - return fileTypeExt; + public ImageType getImageType() { + return imageType; } - public void setFileTypeExtension(FileTypeExtension value) { - fileTypeExt = value; + public void setImageType(ImageType value) { + imageType = value; } } diff --git a/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/RepoFileMetaDataDAO.java b/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/RepoFileMetaDataDAO.java index 7d7feac..ef71640 100644 --- a/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/RepoFileMetaDataDAO.java +++ b/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/RepoFileMetaDataDAO.java @@ -1,7 +1,7 @@ package org.ovirt.engine.core.dao; import java.util.List; -import org.ovirt.engine.core.common.businessentities.FileTypeExtension; +import org.ovirt.engine.core.common.businessentities.ImageType; import org.ovirt.engine.core.common.businessentities.RepoFileMetaData; import org.ovirt.engine.core.common.businessentities.StorageDomainStatus; import org.ovirt.engine.core.common.businessentities.StorageDomainType; @@ -21,7 +21,7 @@ * @param id - The domain id. * @param filetype - The file Extension, which should be removed. */ - void removeRepoDomainFileList(Guid id, FileTypeExtension filetype); + void removeRepoDomainFileList(Guid id, ImageType filetype); /** * Add repository file to cache table. @@ -35,14 +35,14 @@ * no repository found, will return an empty list. */ public List<RepoFileMetaData> getRepoListForStorageDomainAndStoragePool(Guid storagePoolId, Guid storageDomainId, - FileTypeExtension fileType); + ImageType fileType); /** * Returns a list of repository files with specific file extension from storage domain id.<BR/> * If no repository found, will return an empty list. */ public List<RepoFileMetaData> getRepoListForStorageDomain(Guid storageDomainId, - FileTypeExtension fileType); + ImageType fileType); /** * Returns list of the oldest last refreshed repository files, diff --git a/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/RepoFileMetaDataDAODbFacadeImpl.java b/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/RepoFileMetaDataDAODbFacadeImpl.java index 4db2017..bc04c59 100644 --- a/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/RepoFileMetaDataDAODbFacadeImpl.java +++ b/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/RepoFileMetaDataDAODbFacadeImpl.java @@ -5,7 +5,7 @@ import java.util.Date; import java.util.List; -import org.ovirt.engine.core.common.businessentities.FileTypeExtension; +import org.ovirt.engine.core.common.businessentities.ImageType; import org.ovirt.engine.core.common.businessentities.RepoFileMetaData; import org.ovirt.engine.core.common.businessentities.StorageDomainStatus; import org.ovirt.engine.core.common.businessentities.StorageDomainType; @@ -23,7 +23,7 @@ public class RepoFileMetaDataDAODbFacadeImpl extends BaseDAODbFacade implements RepoFileMetaDataDAO { @Override - public void removeRepoDomainFileList(Guid id, FileTypeExtension filetype) { + public void removeRepoDomainFileList(Guid id, ImageType filetype) { MapSqlParameterSource parameterSource = getCustomMapSqlParameterSource() .addValue("repo_domain_id", id).addValue("file_type", filetype.getValue()); @@ -48,7 +48,7 @@ */ @Override public List<RepoFileMetaData> getRepoListForStorageDomainAndStoragePool(Guid storagePoolId, Guid storageDomainId, - FileTypeExtension fileType) { + ImageType fileType) { MapSqlParameterSource parameterSource = getCustomMapSqlParameterSource().addValue("storage_pool_id", storagePoolId); parameterSource.addValue("storage_domain_id", storageDomainId); @@ -65,7 +65,7 @@ */ @Override public List<RepoFileMetaData> getRepoListForStorageDomain(Guid storageDomainId, - FileTypeExtension fileType) { + ImageType fileType) { MapSqlParameterSource parameterSource = getCustomMapSqlParameterSource().addValue("storage_domain_id", storageDomainId); parameterSource.addValue("file_type", fileType.getValue()); @@ -101,7 +101,7 @@ RepoFileMetaData entity = new RepoFileMetaData(); entity.setRepoDomainId(Guid.createGuidFromString(rs.getString("storage_domain_id"))); entity.setLastRefreshed(rs.getLong("last_refreshed")); - entity.setFileType(FileTypeExtension.forValue(rs.getInt("file_type"))); + entity.setFileType(ImageType.forValue(rs.getInt("file_type"))); return entity; } } diff --git a/backend/manager/modules/dal/src/test/java/org/ovirt/engine/core/dao/RepoFileMetaDataDAOTest.java b/backend/manager/modules/dal/src/test/java/org/ovirt/engine/core/dao/RepoFileMetaDataDAOTest.java index 2266657..3e20a58 100644 --- a/backend/manager/modules/dal/src/test/java/org/ovirt/engine/core/dao/RepoFileMetaDataDAOTest.java +++ b/backend/manager/modules/dal/src/test/java/org/ovirt/engine/core/dao/RepoFileMetaDataDAOTest.java @@ -10,7 +10,7 @@ import java.util.List; import org.junit.Test; -import org.ovirt.engine.core.common.businessentities.FileTypeExtension; +import org.ovirt.engine.core.common.businessentities.ImageType; import org.ovirt.engine.core.common.businessentities.RepoFileMetaData; import org.ovirt.engine.core.common.businessentities.StorageDomainStatus; import org.ovirt.engine.core.common.businessentities.StorageDomainType; @@ -36,7 +36,7 @@ // Fetch the file from cache table List<RepoFileMetaData> listOfRepoFiles = repoFileMetaDataDao .getRepoListForStorageDomain(FixturesTool.STORAGE_DOAMIN_NFS_ISO, - FileTypeExtension.ISO); + ImageType.ISO); assertNotNull(listOfRepoFiles); assertSame(listOfRepoFiles.isEmpty(), true); @@ -45,7 +45,7 @@ listOfRepoFiles = repoFileMetaDataDao .getRepoListForStorageDomain(FixturesTool.STORAGE_DOAMIN_NFS_ISO, - FileTypeExtension.ISO); + ImageType.ISO); assertSame(listOfRepoFiles.isEmpty(), false); } @@ -57,14 +57,14 @@ // Should get one iso file List<RepoFileMetaData> listOfRepoFiles = repoFileMetaDataDao .getRepoListForStorageDomain(FixturesTool.SHARED_ISO_STORAGE_DOAMIN_FOR_SP2_AND_SP3, - FileTypeExtension.ISO); + ImageType.ISO); assertNotNull(listOfRepoFiles); assertNotSame(true, listOfRepoFiles.isEmpty()); // Remove the file from cache table repoFileMetaDataDao.removeRepoDomainFileList(FixturesTool.SHARED_ISO_STORAGE_DOAMIN_FOR_SP2_AND_SP3, - FileTypeExtension.ISO); + ImageType.ISO); listOfRepoFiles = getActiveIsoDomain(); assertNotNull(listOfRepoFiles); @@ -79,7 +79,7 @@ // Should get one iso file List<RepoFileMetaData> listOfRepoFiles = repoFileMetaDataDao .getRepoListForStorageDomain(FixturesTool.SHARED_ISO_STORAGE_DOAMIN_FOR_SP2_AND_SP3, - FileTypeExtension.ISO); + ImageType.ISO); assertNotNull(listOfRepoFiles); assertNotSame(true, listOfRepoFiles.isEmpty()); @@ -129,8 +129,8 @@ StorageDomainStatus.Active, VDSStatus.Up); - List<FileTypeExtension> SharedStorageDomainFileType = new ArrayList<FileTypeExtension>(); - List<FileTypeExtension> EmptyStorageDomainFileType = new ArrayList<FileTypeExtension>(); + List<ImageType> SharedStorageDomainFileType = new ArrayList<ImageType>(); + List<ImageType> EmptyStorageDomainFileType = new ArrayList<ImageType>(); for (RepoFileMetaData fileMD : listOfAllIsoFiles) { Guid repoDomainId = fileMD.getRepoDomainId(); if (repoDomainId.equals(FixturesTool.SHARED_ISO_STORAGE_DOAMIN_FOR_SP2_AND_SP3)) { @@ -145,13 +145,13 @@ // Start the check // the shared storage domain, should have three types of files. assertEquals(SharedStorageDomainFileType.size(), 3); - assertEquals(SharedStorageDomainFileType.contains(FileTypeExtension.Unknown), true); - assertEquals(SharedStorageDomainFileType.contains(FileTypeExtension.ISO), true); - assertEquals(SharedStorageDomainFileType.contains(FileTypeExtension.Floppy), true); + assertEquals(SharedStorageDomainFileType.contains(ImageType.Unknown), true); + assertEquals(SharedStorageDomainFileType.contains(ImageType.ISO), true); + assertEquals(SharedStorageDomainFileType.contains(ImageType.Floppy), true); // The empty storage domain, should not have files, but should be fetched, since we want to refresh it. assertEquals(EmptyStorageDomainFileType.size(), 1); - assertEquals(EmptyStorageDomainFileType.contains(FileTypeExtension.Unknown), true); + assertEquals(EmptyStorageDomainFileType.contains(ImageType.Unknown), true); } /** @@ -169,7 +169,7 @@ List<RepoFileMetaData> listOfFloppyFiles = repoFileMetaDataDao .getRepoListForStorageDomain(FixturesTool.SHARED_ISO_STORAGE_DOAMIN_FOR_SP2_AND_SP3, - FileTypeExtension.Floppy); + ImageType.Floppy); long minLastRefreshed = new Long("9999999999999").longValue(); for (RepoFileMetaData fileMD : listOfFloppyFiles) { @@ -182,7 +182,7 @@ // Check if fetched the oldest file when fetching all repository files. boolean isValid = true; for (RepoFileMetaData fileMetaData : listOfIsoFiles) { - if (fileMetaData.getFileType() == FileTypeExtension.Floppy) { + if (fileMetaData.getFileType() == ImageType.Floppy) { if (fileMetaData.getLastRefreshed() > minLastRefreshed) { isValid = false; } @@ -201,7 +201,7 @@ List<RepoFileMetaData> listOfRepoFiles = repoFileMetaDataDao .getRepoListForStorageDomain(FixturesTool.STORAGE_DOAMIN_NFS_ISO, - FileTypeExtension.ISO); + ImageType.ISO); assertNotNull(listOfRepoFiles); assertSame(true, !listOfRepoFiles.isEmpty()); @@ -242,7 +242,7 @@ + newRepoFileMap.getRepoFileName()); // Remove the file from cache table - repoFileMetaDataDao.removeRepoDomainFileList(FixturesTool.STORAGE_DOAMIN_NFS_ISO, FileTypeExtension.ISO); + repoFileMetaDataDao.removeRepoDomainFileList(FixturesTool.STORAGE_DOAMIN_NFS_ISO, ImageType.ISO); // Add the new updated file into the cache table. repoFileMetaDataDao.addRepoFileMap(newRepoFileMap); @@ -292,7 +292,7 @@ Guid falseGuid = new Guid("11111111-1111-1111-1111-111111111111"); List<RepoFileMetaData> listOfRepoFiles = repoFileMetaDataDao .getRepoListForStorageDomain(falseGuid, - FileTypeExtension.ISO); + ImageType.ISO); assertNotNull(listOfRepoFiles); assertSame(true, listOfRepoFiles.isEmpty()); @@ -300,7 +300,7 @@ private static RepoFileMetaData getNewIsoRepoFile() { RepoFileMetaData newRepoFileMap = new RepoFileMetaData(); - newRepoFileMap.setFileType(FileTypeExtension.ISO); + newRepoFileMap.setFileType(ImageType.ISO); newRepoFileMap.setRepoFileName("isoDomain.iso"); newRepoFileMap.setLastRefreshed(System.currentTimeMillis()); newRepoFileMap.setSize(0); @@ -312,7 +312,7 @@ private List<RepoFileMetaData> getActiveIsoDomain() { return repoFileMetaDataDao .getRepoListForStorageDomain(FixturesTool.SHARED_ISO_STORAGE_DOAMIN_FOR_SP2_AND_SP3, - FileTypeExtension.ISO); + ImageType.ISO); } } diff --git a/frontend/webadmin/modules/gwt-common/src/main/resources/org/ovirt/engine/core/Common.gwt.xml b/frontend/webadmin/modules/gwt-common/src/main/resources/org/ovirt/engine/core/Common.gwt.xml index 5ea4b72..4ff9396 100644 --- a/frontend/webadmin/modules/gwt-common/src/main/resources/org/ovirt/engine/core/Common.gwt.xml +++ b/frontend/webadmin/modules/gwt-common/src/main/resources/org/ovirt/engine/core/Common.gwt.xml @@ -151,7 +151,7 @@ <include name="common/businessentities/TagsVmMapId.java" /> <include name="common/businessentities/FileRepoMetaData.java" /> <include name="common/businessentities/RepoFileMetaData.java" /> - <include name="common/businessentities/FileTypeExtension.java" /> + <include name="common/businessentities/ImageType.java" /> <include name="common/businessentities/BusinessEntityGuidComparator.java" /> <include name="common/businessentities/BusinessEntityComparator.java" /> <include name="common/businessentities/Identifiable.java" /> 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 f28bed0..fb997f0 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,7 +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.ImageType; import org.ovirt.engine.core.common.businessentities.IVdcQueryable; import org.ovirt.engine.core.common.businessentities.LUNs; import org.ovirt.engine.core.common.businessentities.Quota; @@ -260,7 +260,7 @@ }; GetAllImagesListByStoragePoolIdParameters parameters = - new GetAllImagesListByStoragePoolIdParameters(storagePoolId, FileTypeExtension.ISO); + new GetAllImagesListByStoragePoolIdParameters(storagePoolId, ImageType.ISO); Frontend.RunQuery(VdcQueryType.GetAllImagesListByStoragePoolId, parameters, aQuery); } @@ -286,7 +286,7 @@ }; Frontend.RunQuery(VdcQueryType.GetAllImagesListByStoragePoolId, - new GetAllImagesListByStoragePoolIdParameters(storagePoolId, FileTypeExtension.Floppy), + new GetAllImagesListByStoragePoolIdParameters(storagePoolId, ImageType.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 a3cc910..86f3d16 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,7 +4,7 @@ import java.util.Arrays; import java.util.Collections; -import org.ovirt.engine.core.common.businessentities.FileTypeExtension; +import org.ovirt.engine.core.common.businessentities.ImageType; import org.ovirt.engine.core.common.businessentities.RepoFileMetaData; import org.ovirt.engine.core.common.businessentities.StorageDomain; import org.ovirt.engine.core.common.queries.GetAllImagesListParameters; @@ -146,12 +146,12 @@ StorageDomain storageDomain = (StorageDomain) getEntity(); GetAllImagesListParameters isoListParams = new GetAllImagesListParameters( - storageDomain.getId(), FileTypeExtension.ISO); + storageDomain.getId(), ImageType.ISO); isoListParams.setForceRefresh(true); isoListParams.setRefresh(getIsQueryFirstTime()); GetAllImagesListParameters floppyListParams = new GetAllImagesListParameters( - storageDomain.getId(), FileTypeExtension.Floppy); + storageDomain.getId(), ImageType.Floppy); floppyListParams.setForceRefresh(true); floppyListParams.setRefresh(getIsQueryFirstTime()); 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 b17262c..e3f6d19 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,7 +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.ImageType; import org.ovirt.engine.core.common.businessentities.RepoFileMetaData; import org.ovirt.engine.core.common.businessentities.StorageDomain; import org.ovirt.engine.core.common.businessentities.UsbPolicy; @@ -302,7 +302,7 @@ queryTypeList.add(VdcQueryType.GetAllImagesListByStoragePoolId); GetAllImagesListByStoragePoolIdParameters getIsoParams = - new GetAllImagesListByStoragePoolIdParameters(vm.getStoragePoolId(), FileTypeExtension.ISO); + new GetAllImagesListByStoragePoolIdParameters(vm.getStoragePoolId(), ImageType.ISO); parametersList.add(getIsoParams); } -- To view, visit http://gerrit.ovirt.org/13067 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I77e152cbab707c944f0505ccac87cfdea9bb8a2e Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Federico Simoncelli <[email protected]> _______________________________________________ Engine-patches mailing list [email protected] http://lists.ovirt.org/mailman/listinfo/engine-patches
