Sergey Gotliv has uploaded a new change for review.
Change subject: engine: [WIP] Use getFileList to retrieve iso and floppy files
......................................................................
engine: [WIP] Use getFileList to retrieve iso and floppy files
Change-Id: I735d2c9343fe791e0890b4a6cc9f12c74462b3f0
Signed-off-by: Sergey Gotliv <sgot...@redhat.com>
---
M
backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/IsoDomainListSyncronizer.java
A
backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/vdscommands/GetFileStatsParameters.java
M
backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/vdscommands/VDSCommandType.java
R
backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/irsbroker/FileListReturnForXmlRpc.java
M
backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/irsbroker/GetFloppyListVDSCommand.java
M
backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/irsbroker/IIrsServer.java
M
backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/irsbroker/IrsServerConnector.java
M
backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/irsbroker/IrsServerWrapper.java
A
backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/GetFileStatsVDSCommand.java
M
backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/HsmGetIsoListVDSCommand.java
M
backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/IVdsServer.java
M
backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/VdsProperties.java
M
backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/VdsServerWrapper.java
A build/python-check.sh
14 files changed, 189 insertions(+), 31 deletions(-)
git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/24/21524/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 2ced12e..bec49b5 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
@@ -22,6 +22,7 @@
import org.ovirt.engine.core.common.businessentities.StorageDomain;
import org.ovirt.engine.core.common.businessentities.StorageDomainStatus;
import org.ovirt.engine.core.common.businessentities.StorageDomainType;
+import org.ovirt.engine.core.common.businessentities.StoragePool;
import org.ovirt.engine.core.common.businessentities.StoragePoolIsoMap;
import org.ovirt.engine.core.common.businessentities.StoragePoolStatus;
import org.ovirt.engine.core.common.businessentities.StorageType;
@@ -30,16 +31,19 @@
import org.ovirt.engine.core.common.config.ConfigValues;
import org.ovirt.engine.core.common.constants.StorageConstants;
import org.ovirt.engine.core.common.utils.Pair;
+import org.ovirt.engine.core.common.vdscommands.GetFileStatsParameters;
import org.ovirt.engine.core.common.vdscommands.IrsBaseVDSCommandParameters;
import org.ovirt.engine.core.common.vdscommands.VDSCommandType;
import org.ovirt.engine.core.common.vdscommands.VDSReturnValue;
import org.ovirt.engine.core.compat.Guid;
import org.ovirt.engine.core.compat.TransactionScopeOption;
+import org.ovirt.engine.core.compat.Version;
import org.ovirt.engine.core.dal.dbbroker.DbFacade;
import org.ovirt.engine.core.dal.dbbroker.auditloghandling.AuditLogDirector;
import org.ovirt.engine.core.dal.dbbroker.auditloghandling.AuditLogableBase;
import org.ovirt.engine.core.dao.RepoFileMetaDataDAO;
import org.ovirt.engine.core.dao.StorageDomainDAO;
+import org.ovirt.engine.core.dao.StoragePoolDAO;
import org.ovirt.engine.core.dao.provider.ProviderDao;
import org.ovirt.engine.core.utils.log.Log;
import org.ovirt.engine.core.utils.log.LogFactory;
@@ -67,6 +71,7 @@
private int isoDomainRefreshRate;
RepoFileMetaDataDAO repoStorageDom;
ProviderDao providerDao;
+
public static final String TOOL_CLUSTER_LEVEL = "clusterLevel";
public static final String TOOL_VERSION = "toolVersion";
public static final String REGEX_TOOL_PATTERN =
@@ -74,6 +79,8 @@
getGuestToolsSetupIsoPrefix(),
TOOL_CLUSTER_LEVEL,
TOOL_VERSION);
+ public static final String ISO_FILE_PATTERN = "*.iso";
+ public static final String FLOPPY_FILE_PATTERN = "*.vfd";
// Not kept as static member to enable reloading the config value
public static String getGuestToolsSetupIsoPrefix() {
@@ -639,14 +646,26 @@
*/
private boolean updateIsoListFromVDSM(Guid repoStoragePoolId, Guid
repoStorageDomainId) {
boolean refreshIsoSucceeded = false;
+ VDSReturnValue returnValue;
+
if (repoStorageDomainId != null) {
try {
- // Get Iso domain file list from storage pool.
- VDSReturnValue returnValue = Backend
- .getInstance()
- .getResourceManager()
- .RunVdsCommand(VDSCommandType.GetIsoList,
- new
IrsBaseVDSCommandParameters(repoStoragePoolId));
+ StoragePool dc = getStoragePoolDAO().get(repoStoragePoolId);
+ if (dc.getcompatibility_version().compareTo(Version.v3_3) > 0)
{
+ returnValue = Backend
+ .getInstance()
+ .getResourceManager()
+ .RunVdsCommand(VDSCommandType.GetFileStats,
+ new
GetFileStatsParameters(repoStoragePoolId,
+ repoStorageDomainId,
ISO_FILE_PATTERN, false));
+ } else {
+ returnValue = Backend
+ .getInstance()
+ .getResourceManager()
+ .RunVdsCommand(VDSCommandType.GetIsoList,
+ new
IrsBaseVDSCommandParameters(repoStoragePoolId));
+ }
+
@SuppressWarnings("unchecked")
Map<String, Map<String, Object>> fileStats =
(Map<String, Map<String, Object>>)
returnValue.getReturnValue();
@@ -679,14 +698,26 @@
*/
private boolean updateFloppyListFromVDSM(Guid repoStoragePoolId, Guid
repoStorageDomainId) {
boolean refreshFloppySucceeded = false;
+ VDSReturnValue returnValue;
+
if (repoStorageDomainId != null) {
try {
- // Get Iso domain floppy file list from storage pool.
- VDSReturnValue returnValue = Backend
- .getInstance()
- .getResourceManager()
- .RunVdsCommand(VDSCommandType.GetFloppyList,
- new
IrsBaseVDSCommandParameters(repoStoragePoolId));
+ StoragePool dc = getStoragePoolDAO().get(repoStoragePoolId);
+ if (dc.getcompatibility_version().compareTo(Version.v3_3) > 0)
{
+ returnValue = Backend
+ .getInstance()
+ .getResourceManager()
+ .RunVdsCommand(VDSCommandType.GetFileStats,
+ new
GetFileStatsParameters(repoStoragePoolId,
+ repoStorageDomainId,
FLOPPY_FILE_PATTERN, false));
+ } else {
+ returnValue = Backend
+ .getInstance()
+ .getResourceManager()
+ .RunVdsCommand(VDSCommandType.GetFloppyList,
+ new
IrsBaseVDSCommandParameters(repoStoragePoolId));
+ }
+
@SuppressWarnings("unchecked")
Map<String, Map<String, Object>> fileStats =
(Map<String, Map<String, Object>>)
returnValue.getReturnValue();
@@ -783,4 +814,8 @@
private StorageDomainDAO getStorageDomainDAO() {
return DbFacade.getInstance().getStorageDomainDao();
}
+
+ private StoragePoolDAO getStoragePoolDAO() {
+ return DbFacade.getInstance().getStoragePoolDao();
+ }
}
diff --git
a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/vdscommands/GetFileStatsParameters.java
b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/vdscommands/GetFileStatsParameters.java
new file mode 100644
index 0000000..6b3144d
--- /dev/null
+++
b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/vdscommands/GetFileStatsParameters.java
@@ -0,0 +1,50 @@
+package org.ovirt.engine.core.common.vdscommands;
+
+import org.ovirt.engine.core.compat.Guid;
+
+public class GetFileStatsParameters extends IrsBaseVDSCommandParameters {
+
+ private Guid spUUID;
+ private Guid sdUUID;
+ private String pattern;
+ private boolean caseSensitive;
+
+ public GetFileStatsParameters(Guid spUUID, Guid sdUUID, String pattern,
boolean caseSensitive) {
+ super(spUUID);
+ this.sdUUID = sdUUID;
+ this.pattern = pattern;
+ this.caseSensitive = caseSensitive;
+ }
+
+ public Guid getSpUUID() {
+ return spUUID;
+ }
+
+ public void setSpUUID(Guid spUUID) {
+ this.spUUID = spUUID;
+ }
+
+ public Guid getSdUUID() {
+ return sdUUID;
+ }
+
+ public void setSdUUID(Guid sdUUID) {
+ this.sdUUID = sdUUID;
+ }
+
+ public String getPattern() {
+ return pattern;
+ }
+
+ public void setPattern(String pattern) {
+ this.pattern = pattern;
+ }
+
+ public boolean isCaseSensitive() {
+ return caseSensitive;
+ }
+
+ public void setCaseSensitive(boolean caseSensitive) {
+ this.caseSensitive = caseSensitive;
+ }
+}
diff --git
a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/vdscommands/VDSCommandType.java
b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/vdscommands/VDSCommandType.java
index 27b7ab0..611e416 100644
---
a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/vdscommands/VDSCommandType.java
+++
b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/vdscommands/VDSCommandType.java
@@ -70,6 +70,7 @@
ResetIrs("org.ovirt.engine.core.vdsbroker.irsbroker"),
GetIsoList("org.ovirt.engine.core.vdsbroker.irsbroker"),
HsmGetIsoList("org.ovirt.engine.core.vdsbroker.vdsbroker"),
+ GetFileStats("org.ovirt.engine.core.vdsbroker.vdsbroker"),
GetFloppyList("org.ovirt.engine.core.vdsbroker.irsbroker"),
CreateStorageDomain("org.ovirt.engine.core.vdsbroker.vdsbroker"),
ActivateStorageDomain("org.ovirt.engine.core.vdsbroker.irsbroker"),
diff --git
a/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/irsbroker/IsoListReturnForXmlRpc.java
b/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/irsbroker/FileListReturnForXmlRpc.java
similarity index 93%
rename from
backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/irsbroker/IsoListReturnForXmlRpc.java
rename to
backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/irsbroker/FileListReturnForXmlRpc.java
index c5b5cd7..d874589 100644
---
a/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/irsbroker/IsoListReturnForXmlRpc.java
+++
b/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/irsbroker/FileListReturnForXmlRpc.java
@@ -8,15 +8,15 @@
import java.util.List;
import java.util.Map;
-public final class IsoListReturnForXmlRpc extends StatusReturnForXmlRpc {
+public final class FileListReturnForXmlRpc extends StatusReturnForXmlRpc {
private Map<String, Map<String, Object>> fileStats;
- public IsoListReturnForXmlRpc(Map<String, Object> innerMap) {
+ public FileListReturnForXmlRpc(Map<String, Object> innerMap) {
super(innerMap);
// New VDSM returns a map with file names as key and file stats as
value.
// The map contains all files even those without proper permissions.
- fileStats = (Map<String, Map<String, Object>>)
innerMap.get(VdsProperties.file_stats);
+ fileStats = (Map<String, Map<String, Object>>)
innerMap.get(VdsProperties.files);
if (fileStats != null) {
removeFilesWithoutPermissions();
} else {
diff --git
a/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/irsbroker/GetFloppyListVDSCommand.java
b/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/irsbroker/GetFloppyListVDSCommand.java
index eef4bb9..44c1d91 100644
---
a/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/irsbroker/GetFloppyListVDSCommand.java
+++
b/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/irsbroker/GetFloppyListVDSCommand.java
@@ -5,7 +5,7 @@
import org.ovirt.engine.core.vdsbroker.vdsbroker.VDSExceptionBase;
public class GetFloppyListVDSCommand<P extends IrsBaseVDSCommandParameters>
extends GetIsoListVDSCommand<P> {
- protected IsoListReturnForXmlRpc floppyList;
+ protected FileListReturnForXmlRpc floppyList;
public GetFloppyListVDSCommand(P parameters) {
super(parameters);
diff --git
a/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/irsbroker/IIrsServer.java
b/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/irsbroker/IIrsServer.java
index 89a8f13..80f14f0 100644
---
a/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/irsbroker/IIrsServer.java
+++
b/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/irsbroker/IIrsServer.java
@@ -32,9 +32,11 @@
OneUuidReturnForXmlRpc importCandidate(String sdUUID, String vmGUID,
String templateGUID, String templateVolGUID,
String path, String type, String force);
- IsoListReturnForXmlRpc getIsoList(String spUUID);
+ FileListReturnForXmlRpc getIsoList(String spUUID);
- IsoListReturnForXmlRpc getFloppyList(String spUUID);
+ FileListReturnForXmlRpc getFloppyList(String spUUID);
+
+ FileListReturnForXmlRpc getFileStats(String sdUUID, String pattern, Map
options);
StorageStatusReturnForXmlRpc activateStorageDomain(String sdUUID, String
spUUID);
diff --git
a/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/irsbroker/IrsServerConnector.java
b/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/irsbroker/IrsServerConnector.java
index fe8b8b8..be5df4a 100644
---
a/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/irsbroker/IrsServerConnector.java
+++
b/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/irsbroker/IrsServerConnector.java
@@ -43,6 +43,8 @@
public Map<String, Object> getFloppyList(String spUUID);
+ public Map<String, Object> getFileStats(String sdUUID, String pattern, Map
options);
+
public Map<String, Object> activateStorageDomain(String sdUUID, String
spUUID);
public Map<String, Object> deactivateStorageDomain(String sdUUID, String
spUUID, String msdUUID, int masterVersion);
diff --git
a/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/irsbroker/IrsServerWrapper.java
b/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/irsbroker/IrsServerWrapper.java
index b58e35a..ac90fae 100644
---
a/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/irsbroker/IrsServerWrapper.java
+++
b/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/irsbroker/IrsServerWrapper.java
@@ -93,16 +93,23 @@
}
@Override
- public IsoListReturnForXmlRpc getIsoList(String spUUID) {
+ public FileListReturnForXmlRpc getIsoList(String spUUID) {
Map<String, Object> xmlRpcReturnValue = irsServer.getIsoList(spUUID);
- IsoListReturnForXmlRpc wrapper = new
IsoListReturnForXmlRpc(xmlRpcReturnValue);
+ FileListReturnForXmlRpc wrapper = new
FileListReturnForXmlRpc(xmlRpcReturnValue);
return wrapper;
}
@Override
- public IsoListReturnForXmlRpc getFloppyList(String spUUID) {
+ public FileListReturnForXmlRpc getFloppyList(String spUUID) {
Map<String, Object> xmlRpcReturnValue =
irsServer.getFloppyList(spUUID);
- IsoListReturnForXmlRpc wrapper = new
IsoListReturnForXmlRpc(xmlRpcReturnValue);
+ FileListReturnForXmlRpc wrapper = new
FileListReturnForXmlRpc(xmlRpcReturnValue);
+ return wrapper;
+ }
+
+ @Override
+ public FileListReturnForXmlRpc getFileStats(String sdUUID, String pattern,
Map options) {
+ Map<String, Object> xmlRpcReturnValue = irsServer.getFileStats(sdUUID,
pattern, options);
+ FileListReturnForXmlRpc wrapper = new
FileListReturnForXmlRpc(xmlRpcReturnValue);
return wrapper;
}
diff --git
a/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/GetFileStatsVDSCommand.java
b/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/GetFileStatsVDSCommand.java
new file mode 100644
index 0000000..8bfa1ad
--- /dev/null
+++
b/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/GetFileStatsVDSCommand.java
@@ -0,0 +1,39 @@
+package org.ovirt.engine.core.vdsbroker.vdsbroker;
+
+import java.util.HashMap;
+import java.util.Map;
+
+import org.ovirt.engine.core.common.vdscommands.GetFileStatsParameters;
+import org.ovirt.engine.core.vdsbroker.irsbroker.FileListReturnForXmlRpc;
+import org.ovirt.engine.core.vdsbroker.irsbroker.IrsBrokerCommand;
+
+public class GetFileStatsVDSCommand<P extends GetFileStatsParameters> extends
IrsBrokerCommand<P> {
+
+ private FileListReturnForXmlRpc fileStats;
+
+ public GetFileStatsVDSCommand(P parameters) {
+ super(parameters);
+ }
+
+ @Override
+ protected void executeIrsBrokerCommand() {
+ Map options = new HashMap();
+ options.put("caseSensitive", getParameters().isCaseSensitive());
+
+ fileStats =
getIrsProxy().getFileStats(getParameters().getSdUUID().toString(),
+ getParameters().getPattern(), options);
+
+ proceedProxyReturnValue();
+ setReturnValue(fileStats.getFileStats());
+ }
+
+ @Override
+ protected Object getReturnValueFromBroker() {
+ return fileStats;
+ }
+
+ @Override
+ protected StatusForXmlRpc getReturnStatus() {
+ return fileStats.mStatus;
+ }
+}
diff --git
a/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/HsmGetIsoListVDSCommand.java
b/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/HsmGetIsoListVDSCommand.java
index 3acd181..98debc0 100644
---
a/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/HsmGetIsoListVDSCommand.java
+++
b/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/HsmGetIsoListVDSCommand.java
@@ -1,10 +1,10 @@
package org.ovirt.engine.core.vdsbroker.vdsbroker;
import org.ovirt.engine.core.common.vdscommands.HSMGetIsoListParameters;
-import org.ovirt.engine.core.vdsbroker.irsbroker.IsoListReturnForXmlRpc;
+import org.ovirt.engine.core.vdsbroker.irsbroker.FileListReturnForXmlRpc;
public class HsmGetIsoListVDSCommand<P extends HSMGetIsoListParameters>
extends VdsBrokerCommand<P> {
- private IsoListReturnForXmlRpc isoList;
+ private FileListReturnForXmlRpc isoList;
public HsmGetIsoListVDSCommand(P parameters) {
super(parameters);
diff --git
a/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/IVdsServer.java
b/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/IVdsServer.java
index 0216628..343d7d0 100644
---
a/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/IVdsServer.java
+++
b/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/IVdsServer.java
@@ -16,7 +16,7 @@
import
org.ovirt.engine.core.vdsbroker.gluster.GlusterVolumeStatusReturnForXmlRpc;
import
org.ovirt.engine.core.vdsbroker.gluster.GlusterVolumeTaskReturnForXmlRpc;
import
org.ovirt.engine.core.vdsbroker.gluster.GlusterVolumesListReturnForXmlRpc;
-import org.ovirt.engine.core.vdsbroker.irsbroker.IsoListReturnForXmlRpc;
+import org.ovirt.engine.core.vdsbroker.irsbroker.FileListReturnForXmlRpc;
import org.ovirt.engine.core.vdsbroker.irsbroker.OneUuidReturnForXmlRpc;
import
org.ovirt.engine.core.vdsbroker.irsbroker.StoragePoolInfoReturnForXmlRpc;
@@ -123,7 +123,7 @@
StorageDomainListReturnForXmlRpc getStorageDomainsList(String spUUID, int
domainType, int poolType, String path);
- IsoListReturnForXmlRpc getIsoList(String spUUID);
+ FileListReturnForXmlRpc getIsoList(String spUUID);
OneUuidReturnForXmlRpc createVG(String sdUUID, String[] deviceList);
diff --git
a/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/VdsProperties.java
b/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/VdsProperties.java
index 354a2fc..75a22a0 100644
---
a/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/VdsProperties.java
+++
b/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/VdsProperties.java
@@ -167,7 +167,7 @@
// Iso/Floppy related properties
public static final String iso_list = "isolist";
- public static final String file_stats = "fileStats";
+ public static final String files = "files";
// vm configuration (i.e. VmStatic)
public static final String mem_size_mb = "memSize";
diff --git
a/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/VdsServerWrapper.java
b/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/VdsServerWrapper.java
index daff7ae..2bc3619 100644
---
a/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/VdsServerWrapper.java
+++
b/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/VdsServerWrapper.java
@@ -18,7 +18,7 @@
import
org.ovirt.engine.core.vdsbroker.gluster.GlusterVolumeStatusReturnForXmlRpc;
import
org.ovirt.engine.core.vdsbroker.gluster.GlusterVolumeTaskReturnForXmlRpc;
import
org.ovirt.engine.core.vdsbroker.gluster.GlusterVolumesListReturnForXmlRpc;
-import org.ovirt.engine.core.vdsbroker.irsbroker.IsoListReturnForXmlRpc;
+import org.ovirt.engine.core.vdsbroker.irsbroker.FileListReturnForXmlRpc;
import org.ovirt.engine.core.vdsbroker.irsbroker.OneUuidReturnForXmlRpc;
import
org.ovirt.engine.core.vdsbroker.irsbroker.StoragePoolInfoReturnForXmlRpc;
import org.ovirt.engine.core.vdsbroker.xmlrpc.XmlRpcRunTimeException;
@@ -563,15 +563,14 @@
}
@Override
- public IsoListReturnForXmlRpc getIsoList(String spUUID) {
+ public FileListReturnForXmlRpc getIsoList(String spUUID) {
try {
Map<String, Object> xmlRpcReturnValue =
vdsServer.getIsoList(spUUID);
- IsoListReturnForXmlRpc wrapper = new
IsoListReturnForXmlRpc(xmlRpcReturnValue);
+ FileListReturnForXmlRpc wrapper = new
FileListReturnForXmlRpc(xmlRpcReturnValue);
return wrapper;
} catch (UndeclaredThrowableException ute) {
throw new XmlRpcRunTimeException(ute);
}
-
}
@Override
diff --git a/build/python-check.sh b/build/python-check.sh
new file mode 100755
index 0000000..de58c4f
--- /dev/null
+++ b/build/python-check.sh
@@ -0,0 +1,23 @@
+#!/bin/sh
+
+PEP8="pep8"
+PYFLAKES="pyflakes"
+SRCDIR="$(dirname "$0")/.."
+
+cd "${SRCDIR}"
+
+ret=0
+FILES="$(
+ find build packaging -name '*.py' | while read f; do
+ [ -e "${f}.in" ] || echo "${f}"
+ done
+)"
+
+for exe in "${PYFLAKES}" "${PEP8}"; do
+ if ! which "${exe}" > /dev/null 2>&1; then
+ echo "WARNING: tool '${exe}' is missing" >&2
+ else
+ "${exe}" ${FILES} || ret=1
+ fi
+done
+exit ${ret}
--
To view, visit http://gerrit.ovirt.org/21524
To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I735d2c9343fe791e0890b4a6cc9f12c74462b3f0
Gerrit-PatchSet: 1
Gerrit-Project: ovirt-engine
Gerrit-Branch: master
Gerrit-Owner: Sergey Gotliv <sgot...@redhat.com>
_______________________________________________
Engine-patches mailing list
Engine-patches@ovirt.org
http://lists.ovirt.org/mailman/listinfo/engine-patches
