Tomas Jelinek has uploaded a new change for review.
Change subject: engine: renamed ImageType to ImageFileType
......................................................................
engine: renamed ImageType to ImageFileType
Renamed, because the ImageType conflicts with the upcomning
Instance Type feature, where there will be this entities:
ImageType
InstanceType
TemplateType
Change-Id: I5e72e98776631755e5c0296fa5c255118fb39a54
Signed-off-by: Tomas Jelinek <tjeli...@redhat.com>
---
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/GetImagesListByStoragePoolIdQueryTest.java
A
backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/ImageFileType.java
D
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/GetImagesListByStoragePoolIdParameters.java
M
backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/queries/GetImagesListParameters.java
M
backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/queries/GetImagesListParametersBase.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
backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendFilesResource.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
18 files changed, 114 insertions(+), 114 deletions(-)
git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/25/13725/1
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 55e652a..1e2784a 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.ImageType;
+import org.ovirt.engine.core.common.businessentities.ImageFileType;
import org.ovirt.engine.core.common.businessentities.RepoFileMetaData;
import org.ovirt.engine.core.common.businessentities.StorageDomainStatus;
import org.ovirt.engine.core.common.businessentities.StorageDomainType;
@@ -147,7 +147,7 @@
* @return List of RepoFilesMetaData files or null (If fetch from VDSM
failed).
*/
public List<RepoFileMetaData>
getUserRequestForStorageDomainRepoFileList(Guid storageDomainId,
- ImageType imageType,
+ ImageFileType imageType,
boolean forceRefresh) {
// The result list we send back.
List<RepoFileMetaData> repoList = null;
@@ -177,7 +177,7 @@
*/
public List<RepoFileMetaData>
getUserRequestForStoragePoolAndDomainRepoFileList(Guid storagePoolId,
Guid storageDomainId,
- ImageType imageType,
+ ImageFileType imageType,
boolean forceRefresh) {
// The result list we send back.
List<RepoFileMetaData> repoList = null;
@@ -192,7 +192,7 @@
return repoList;
}
- private boolean refreshRepos(Guid storageDomainId, ImageType imageType,
boolean forceRefresh) {
+ private boolean refreshRepos(Guid storageDomainId, ImageFileType
imageType, boolean forceRefresh) {
boolean res = true;
List<RepoFileMetaData> tempProblematicRepoFileList = new
ArrayList<RepoFileMetaData>();
// If user choose to force refresh.
@@ -229,15 +229,15 @@
*/
private boolean refreshIsoDomainFileForStoragePool(Guid storageDomainId,
Guid storagePoolId,
- ImageType imageType) {
+ ImageFileType 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 (imageType == ImageType.ISO) {
+ if (imageType == ImageFileType.ISO) {
updateFromVDSMSucceeded = updateIsoListFromVDSM(storagePoolId,
storageDomainId);
- } else if (imageType == ImageType.Floppy) {
+ } else if (imageType == ImageFileType.Floppy) {
updateFromVDSMSucceeded =
updateFloppyListFromVDSM(storagePoolId, storageDomainId)
&& updateFromVDSMSucceeded;
}
@@ -270,7 +270,7 @@
*/
private boolean refreshIsoDomain(Guid storageDomainId,
List<RepoFileMetaData> problematicRepoFileList,
- ImageType imageType) {
+ ImageFileType imageType) {
boolean refreshSucceeded = false;
List<RepoFileMetaData> tempProblematicRepoFileList = new
ArrayList<RepoFileMetaData>();
@@ -361,7 +361,7 @@
* - 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, ImageType imageType) {
+ public List<RepoFileMetaData>
getCachedIsoListByStoragePoolAndDomainId(Guid isoStoragePoolId, Guid
isoStorageDomainId, ImageFileType imageType) {
List<RepoFileMetaData> fileListMD = new ArrayList<RepoFileMetaData>();
// Check validation of parameters.
if (isoStorageDomainId != null && isoStoragePoolId != null &&
VmRunHandler.getInstance().findActiveISODomain(isoStoragePoolId) != null) {
@@ -379,7 +379,7 @@
* @return List of Iso files fetched from DB, if parameter is invalid
returns an empty list.
*/
public List<RepoFileMetaData> getCachedIsoListByDomainId(Guid
isoStorageDomainId,
- ImageType imageType) {
+ ImageFileType imageType) {
List<RepoFileMetaData> fileListMD = new ArrayList<RepoFileMetaData>();
if (isoStorageDomainId != null) {
fileListMD =
@@ -418,7 +418,7 @@
* - The file type extension (ISO or Floppy).
* @see #handleErrorLog(List)
*/
- private static void handleErrorLog(Guid storagePoolId, Guid
storageDomainId, ImageType imageType) {
+ private static void handleErrorLog(Guid storagePoolId, Guid
storageDomainId, ImageFileType imageType) {
List<RepoFileMetaData> tempProblematicRepoFileList = new
ArrayList<RepoFileMetaData>();
// set mock repo file meta data with storage domain id and storage
pool id.
@@ -548,7 +548,7 @@
*/
private static boolean refreshIsoFileListMetaData(final Guid
repoStorageDomainId,
final RepoFileMetaDataDAO repoFileMetaDataDao,
- final List<String> isoDomainList, final ImageType imageType) {
+ final List<String> isoDomainList, final ImageFileType imageType) {
Lock syncObject = getSyncObject(repoStorageDomainId, imageType);
try {
syncObject.lock();
@@ -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, ImageType.ISO);
+ handleErrorLog(storagePoolId, storageDomainId, ImageFileType.ISO);
}
if (!updateFloppyListFromVDSM(storagePoolId, storageDomainId)) {
// Add an audit log that refresh was failed for Floppy files.
- handleErrorLog(storagePoolId, storageDomainId, ImageType.Floppy);
+ handleErrorLog(storagePoolId, storageDomainId,
ImageFileType.Floppy);
}
}
@@ -637,7 +637,7 @@
refreshIsoSucceeded =
refreshIsoFileListMetaData(repoStorageDomainId,
repoStorageDom,
- isoDomainList, ImageType.ISO);
+ isoDomainList, ImageFileType.ISO);
}
} catch (Exception e) {
refreshIsoSucceeded = false;
@@ -674,7 +674,7 @@
refreshFloppySucceeded =
refreshIsoFileListMetaData(repoStorageDomainId,
repoStorageDom,
- isoDomainFloppyList, ImageType.Floppy);
+ isoDomainFloppyList, ImageFileType.Floppy);
}
log.debugFormat("The refresh process from VDSM, for Floppy
files succeeded.");
} catch (Exception e) {
@@ -697,8 +697,8 @@
* - 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, ImageType imageType) {
- Pair<Guid, ImageType> domainPerFileType = new Pair<Guid,
ImageType>(domainId, imageType);
+ private static Lock getSyncObject(Guid domainId, ImageFileType imageType) {
+ Pair<Guid, ImageFileType> domainPerFileType = new Pair<Guid,
ImageFileType>(domainId, imageType);
syncDomainForFileTypeMap.putIfAbsent(domainPerFileType, new
ReentrantLock());
return syncDomainForFileTypeMap.get(domainPerFileType);
}
@@ -728,7 +728,7 @@
}
- private boolean isStorageDomainValid(Guid storageDomainId, ImageType
imageType, boolean forceRefresh) {
+ private boolean isStorageDomainValid(Guid storageDomainId, ImageFileType
imageType, boolean forceRefresh) {
// Check storage domain Id validity.
if (storageDomainId == null) {
log.error("Storage domain ID received from command query is
null.");
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 1fa06b0..bed660b 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.ImageType;
+import org.ovirt.engine.core.common.businessentities.ImageFileType;
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;
@@ -603,7 +603,7 @@
// Fetch cached Iso files from active Iso domain.
List<RepoFileMetaData> repoFilesMap =
IsoDomainListSyncronizer.getInstance().getCachedIsoListByDomainId(isoDomain.getId(),
- ImageType.ISO);
+ ImageFileType.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 5462cdc..7bba146 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.ImageType;
+import org.ovirt.engine.core.common.businessentities.ImageFileType;
import org.ovirt.engine.core.common.businessentities.RepoFileMetaData;
import org.ovirt.engine.core.common.businessentities.StorageDomain;
import org.ovirt.engine.core.common.businessentities.StorageDomainStatus;
@@ -297,7 +297,7 @@
boolean retValForIso = false;
VdcQueryReturnValue ret =
getBackend().runInternalQuery(VdcQueryType.GetImagesList,
- new GetImagesListParameters(storageDomainId,
ImageType.ISO));
+ new GetImagesListParameters(storageDomainId,
ImageFileType.ISO));
if (ret != null && ret.getReturnValue() != null &&
ret.getSucceeded()) {
List<RepoFileMetaData> repoFileNameList =
(List<RepoFileMetaData>) ret.getReturnValue();
if (repoFileNameList != null) {
@@ -319,7 +319,7 @@
boolean retValForFloppy = false;
VdcQueryReturnValue ret =
getBackend().runInternalQuery(VdcQueryType.GetImagesList,
- new GetImagesListParameters(storageDomainId,
ImageType.Floppy));
+ new GetImagesListParameters(storageDomainId,
ImageFileType.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/GetImagesListByStoragePoolIdQueryTest.java
b/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/GetImagesListByStoragePoolIdQueryTest.java
index 54ae523..295e435 100644
---
a/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/GetImagesListByStoragePoolIdQueryTest.java
+++
b/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/GetImagesListByStoragePoolIdQueryTest.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.ImageType;
+import org.ovirt.engine.core.common.businessentities.ImageFileType;
import org.ovirt.engine.core.common.businessentities.RepoFileMetaData;
import org.ovirt.engine.core.common.businessentities.storage_pool;
import
org.ovirt.engine.core.common.queries.GetImagesListByStoragePoolIdParameters;
@@ -28,18 +28,18 @@
extends AbstractUserQueryTest<GetImagesListByStoragePoolIdParameters,
GetImagesListByStoragePoolIdQuery<? extends
GetImagesListByStoragePoolIdParameters>> {
private Class<? extends
GetImagesListByStoragePoolIdQuery<GetImagesListByStoragePoolIdParameters>>
queryClass;
- private ImageType expectedType;
+ private ImageFileType expectedType;
private Guid storageDomainId;
@Parameters
public static Collection<Object[]> data() {
return Arrays.asList(new Object[][]
- { { GetImagesListByStoragePoolIdQuery.class, ImageType.ISO },
- { GetImagesListByStoragePoolIdQuery.class, ImageType.Floppy }
});
+ { { GetImagesListByStoragePoolIdQuery.class, ImageFileType.ISO },
+ { GetImagesListByStoragePoolIdQuery.class,
ImageFileType.Floppy } });
}
public GetImagesListByStoragePoolIdQueryTest(Class<? extends
GetImagesListByStoragePoolIdQuery<GetImagesListByStoragePoolIdParameters>>
queryClass,
- ImageType expectedType) {
+ ImageFileType expectedType) {
this.queryClass = queryClass;
this.expectedType = expectedType;
}
diff --git
a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/ImageFileType.java
b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/ImageFileType.java
new file mode 100644
index 0000000..3f68168
--- /dev/null
+++
b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/ImageFileType.java
@@ -0,0 +1,34 @@
+package org.ovirt.engine.core.common.businessentities;
+
+import java.util.HashMap;
+import java.util.Map;
+
+public enum ImageFileType {
+ Unknown(0),
+ ISO(1),
+ Floppy(2),
+ Disk(3),
+ All(4);
+
+ private int intValue;
+ private static Map<Integer, ImageFileType> mappings;
+
+ static {
+ mappings = new HashMap<Integer, ImageFileType>();
+ for (ImageFileType error : values()) {
+ mappings.put(error.getValue(), error);
+ }
+ }
+
+ private ImageFileType(int value) {
+ intValue = value;
+ }
+
+ public int getValue() {
+ return intValue;
+ }
+
+ public static ImageFileType 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
deleted file mode 100644
index d5610fa..0000000
---
a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/ImageType.java
+++ /dev/null
@@ -1,34 +0,0 @@
-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 4ecabd8..b05cbe2 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 ImageType fileType;
+ private ImageFileType fileType;
/**
* Empty constructor for retrieving new clean entity
@@ -166,14 +166,14 @@
* @param fileType
* - The file type extension.
*/
- public void setFileType(ImageType fileType) {
+ public void setFileType(ImageFileType fileType) {
this.fileType = fileType;
}
/**
* @return the file type.
*/
- public ImageType getFileType() {
+ public ImageFileType getFileType() {
return fileType;
}
}
diff --git
a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/queries/GetImagesListByStoragePoolIdParameters.java
b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/queries/GetImagesListByStoragePoolIdParameters.java
index faef023..4edd4e7 100644
---
a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/queries/GetImagesListByStoragePoolIdParameters.java
+++
b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/queries/GetImagesListByStoragePoolIdParameters.java
@@ -1,6 +1,6 @@
package org.ovirt.engine.core.common.queries;
-import org.ovirt.engine.core.common.businessentities.ImageType;
+import org.ovirt.engine.core.common.businessentities.ImageFileType;
import org.ovirt.engine.core.compat.Guid;
@@ -14,7 +14,7 @@
setStoragePoolId(storagePoolId);
}
- public GetImagesListByStoragePoolIdParameters(Guid storagePoolId,
ImageType imageType) {
+ public GetImagesListByStoragePoolIdParameters(Guid storagePoolId,
ImageFileType imageType) {
super(imageType);
setStoragePoolId(storagePoolId);
}
diff --git
a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/queries/GetImagesListParameters.java
b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/queries/GetImagesListParameters.java
index 3e1d878..ffece9c 100644
---
a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/queries/GetImagesListParameters.java
+++
b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/queries/GetImagesListParameters.java
@@ -1,6 +1,6 @@
package org.ovirt.engine.core.common.queries;
-import org.ovirt.engine.core.common.businessentities.ImageType;
+import org.ovirt.engine.core.common.businessentities.ImageFileType;
import org.ovirt.engine.core.compat.Guid;
@@ -14,7 +14,7 @@
setStorageDomainId(storageDomainId);
}
- public GetImagesListParameters(Guid storageDomainId, ImageType imageType) {
+ public GetImagesListParameters(Guid storageDomainId, ImageFileType
imageType) {
super(imageType);
setStorageDomainId(storageDomainId);
}
diff --git
a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/queries/GetImagesListParametersBase.java
b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/queries/GetImagesListParametersBase.java
index a235fe5..962a2ba 100644
---
a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/queries/GetImagesListParametersBase.java
+++
b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/queries/GetImagesListParametersBase.java
@@ -1,17 +1,17 @@
package org.ovirt.engine.core.common.queries;
-import org.ovirt.engine.core.common.businessentities.ImageType;
+import org.ovirt.engine.core.common.businessentities.ImageFileType;
/** A base class for parameters of queries that retrieve images lists */
public abstract class GetImagesListParametersBase extends
VdcQueryParametersBase {
private static final long serialVersionUID = 2562476365144558247L;
private boolean forceRefresh;
- private ImageType imageType = ImageType.All;
+ private ImageFileType imageType = ImageFileType.All;
public GetImagesListParametersBase() {
}
- public GetImagesListParametersBase(ImageType imageType) {
+ public GetImagesListParametersBase(ImageFileType imageType) {
setImageType(imageType);
}
@@ -23,11 +23,11 @@
this.forceRefresh = forceRefresh;
}
- public ImageType getImageType() {
+ public ImageFileType getImageType() {
return imageType;
}
- public void setImageType(ImageType value) {
+ public void setImageType(ImageFileType 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 ef71640..415950d 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.ImageType;
+import org.ovirt.engine.core.common.businessentities.ImageFileType;
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, ImageType filetype);
+ void removeRepoDomainFileList(Guid id, ImageFileType 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,
- ImageType fileType);
+ ImageFileType 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,
- ImageType fileType);
+ ImageFileType 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 489f3ce..3335a0e 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.ImageType;
+import org.ovirt.engine.core.common.businessentities.ImageFileType;
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, ImageType filetype) {
+ public void removeRepoDomainFileList(Guid id, ImageFileType 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,
- ImageType fileType) {
+ ImageFileType 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,
- ImageType fileType) {
+ ImageFileType 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(ImageType.forValue(rs.getInt("file_type")));
+ entity.setFileType(ImageFileType.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 3e20a58..94ea821 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.ImageType;
+import org.ovirt.engine.core.common.businessentities.ImageFileType;
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,
- ImageType.ISO);
+ ImageFileType.ISO);
assertNotNull(listOfRepoFiles);
assertSame(listOfRepoFiles.isEmpty(), true);
@@ -45,7 +45,7 @@
listOfRepoFiles = repoFileMetaDataDao
.getRepoListForStorageDomain(FixturesTool.STORAGE_DOAMIN_NFS_ISO,
- ImageType.ISO);
+ ImageFileType.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,
- ImageType.ISO);
+ ImageFileType.ISO);
assertNotNull(listOfRepoFiles);
assertNotSame(true, listOfRepoFiles.isEmpty());
// Remove the file from cache table
repoFileMetaDataDao.removeRepoDomainFileList(FixturesTool.SHARED_ISO_STORAGE_DOAMIN_FOR_SP2_AND_SP3,
- ImageType.ISO);
+ ImageFileType.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,
- ImageType.ISO);
+ ImageFileType.ISO);
assertNotNull(listOfRepoFiles);
assertNotSame(true, listOfRepoFiles.isEmpty());
@@ -129,8 +129,8 @@
StorageDomainStatus.Active,
VDSStatus.Up);
- List<ImageType> SharedStorageDomainFileType = new
ArrayList<ImageType>();
- List<ImageType> EmptyStorageDomainFileType = new
ArrayList<ImageType>();
+ List<ImageFileType> SharedStorageDomainFileType = new
ArrayList<ImageFileType>();
+ List<ImageFileType> EmptyStorageDomainFileType = new
ArrayList<ImageFileType>();
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(ImageType.Unknown),
true);
- assertEquals(SharedStorageDomainFileType.contains(ImageType.ISO),
true);
- assertEquals(SharedStorageDomainFileType.contains(ImageType.Floppy),
true);
+
assertEquals(SharedStorageDomainFileType.contains(ImageFileType.Unknown), true);
+ assertEquals(SharedStorageDomainFileType.contains(ImageFileType.ISO),
true);
+
assertEquals(SharedStorageDomainFileType.contains(ImageFileType.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(ImageType.Unknown),
true);
+
assertEquals(EmptyStorageDomainFileType.contains(ImageFileType.Unknown), true);
}
/**
@@ -169,7 +169,7 @@
List<RepoFileMetaData> listOfFloppyFiles =
repoFileMetaDataDao
.getRepoListForStorageDomain(FixturesTool.SHARED_ISO_STORAGE_DOAMIN_FOR_SP2_AND_SP3,
- ImageType.Floppy);
+ ImageFileType.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() == ImageType.Floppy) {
+ if (fileMetaData.getFileType() == ImageFileType.Floppy) {
if (fileMetaData.getLastRefreshed() > minLastRefreshed) {
isValid = false;
}
@@ -201,7 +201,7 @@
List<RepoFileMetaData> listOfRepoFiles = repoFileMetaDataDao
.getRepoListForStorageDomain(FixturesTool.STORAGE_DOAMIN_NFS_ISO,
- ImageType.ISO);
+ ImageFileType.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,
ImageType.ISO);
+
repoFileMetaDataDao.removeRepoDomainFileList(FixturesTool.STORAGE_DOAMIN_NFS_ISO,
ImageFileType.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,
- ImageType.ISO);
+ ImageFileType.ISO);
assertNotNull(listOfRepoFiles);
assertSame(true, listOfRepoFiles.isEmpty());
@@ -300,7 +300,7 @@
private static RepoFileMetaData getNewIsoRepoFile() {
RepoFileMetaData newRepoFileMap = new RepoFileMetaData();
- newRepoFileMap.setFileType(ImageType.ISO);
+ newRepoFileMap.setFileType(ImageFileType.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,
- ImageType.ISO);
+ ImageFileType.ISO);
}
}
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..575449a 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
@@ -11,7 +11,7 @@
import org.ovirt.engine.api.resource.FileResource;
import org.ovirt.engine.api.resource.FilesResource;
import org.ovirt.engine.core.common.businessentities.RepoFileMetaData;
-import org.ovirt.engine.core.common.businessentities.ImageType;
+import org.ovirt.engine.core.common.businessentities.ImageFileType;
import org.ovirt.engine.core.common.queries.GetImagesListParameters;
import org.ovirt.engine.core.common.queries.StorageDomainQueryParametersBase;
@@ -72,7 +72,7 @@
}
protected List<String> listFiles() {
- GetImagesListParameters queryParams = new
GetImagesListParameters(asGuid(storageDomainId), ImageType.ISO);
+ GetImagesListParameters queryParams = new
GetImagesListParameters(asGuid(storageDomainId), ImageFileType.ISO);
queryParams.setForceRefresh(true);
List<RepoFileMetaData> files =
getBackendCollection(RepoFileMetaData.class, VdcQueryType.GetImagesList,
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 4ff9396..ae829de 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/ImageType.java" />
+ <include name="common/businessentities/ImageFileType.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 101fdc4..51347b3 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.ImageType;
+import org.ovirt.engine.core.common.businessentities.ImageFileType;
import org.ovirt.engine.core.common.businessentities.IVdcQueryable;
import org.ovirt.engine.core.common.businessentities.LUNs;
import org.ovirt.engine.core.common.businessentities.Quota;
@@ -262,7 +262,7 @@
};
GetImagesListByStoragePoolIdParameters parameters =
- new GetImagesListByStoragePoolIdParameters(storagePoolId,
ImageType.ISO);
+ new GetImagesListByStoragePoolIdParameters(storagePoolId,
ImageFileType.ISO);
Frontend.RunQuery(VdcQueryType.GetImagesListByStoragePoolId,
parameters, aQuery);
}
@@ -288,7 +288,7 @@
};
Frontend.RunQuery(VdcQueryType.GetImagesListByStoragePoolId,
- new GetImagesListByStoragePoolIdParameters(storagePoolId,
ImageType.Floppy),
+ new GetImagesListByStoragePoolIdParameters(storagePoolId,
ImageFileType.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 1832106..e7222a5 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.ImageType;
+import org.ovirt.engine.core.common.businessentities.ImageFileType;
import org.ovirt.engine.core.common.businessentities.RepoFileMetaData;
import org.ovirt.engine.core.common.businessentities.StorageDomain;
import org.ovirt.engine.core.common.queries.GetImagesListParameters;
@@ -146,12 +146,12 @@
StorageDomain storageDomain = (StorageDomain) getEntity();
GetImagesListParameters isoListParams = new GetImagesListParameters(
- storageDomain.getId(), ImageType.ISO);
+ storageDomain.getId(), ImageFileType.ISO);
isoListParams.setForceRefresh(true);
isoListParams.setRefresh(getIsQueryFirstTime());
GetImagesListParameters floppyListParams = new GetImagesListParameters(
- storageDomain.getId(), ImageType.Floppy);
+ storageDomain.getId(), ImageFileType.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 bdc626a..710f072 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
@@ -15,7 +15,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.ImageType;
+import org.ovirt.engine.core.common.businessentities.ImageFileType;
import org.ovirt.engine.core.common.businessentities.RepoFileMetaData;
import org.ovirt.engine.core.common.businessentities.StorageDomain;
import org.ovirt.engine.core.common.businessentities.UsbPolicy;
@@ -305,7 +305,7 @@
queryTypeList.add(VdcQueryType.GetImagesListByStoragePoolId);
GetImagesListByStoragePoolIdParameters getIsoParams =
- new
GetImagesListByStoragePoolIdParameters(vm.getStoragePoolId(), ImageType.ISO);
+ new
GetImagesListByStoragePoolIdParameters(vm.getStoragePoolId(),
ImageFileType.ISO);
parametersList.add(getIsoParams);
}
--
To view, visit http://gerrit.ovirt.org/13725
To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I5e72e98776631755e5c0296fa5c255118fb39a54
Gerrit-PatchSet: 1
Gerrit-Project: ovirt-engine
Gerrit-Branch: master
Gerrit-Owner: Tomas Jelinek <tjeli...@redhat.com>
_______________________________________________
Engine-patches mailing list
Engine-patches@ovirt.org
http://lists.ovirt.org/mailman/listinfo/engine-patches
