Maor Lipchuk has uploaded a new change for review.
Change subject: core:StorageHelper Cleanup, method name standard(12).
......................................................................
core:StorageHelper Cleanup, method name standard(12).
Change method name isConnectSucceeded to be
compatible with the java standards.
Change-Id: Id380d2a0696310015d976662a82002e8e8ce04f0
Signed-off-by: Maor Lipchuk <mlipc...@redhat.com>
---
M
backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/BaseFsStorageHelper.java
M
backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/ConnectHostToStoragePoolServersCommand.java
M
backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/ConnectStorageToVdsCommand.java
M
backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/DisconnectHostFromStoragePoolServersCommand.java
M
backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/ISCSIStorageHelper.java
M
backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/IStorageHelper.java
M
backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/StorageHelperBase.java
7 files changed, 12 insertions(+), 12 deletions(-)
git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/37/10137/1
diff --git
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/BaseFsStorageHelper.java
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/BaseFsStorageHelper.java
index f288ed0..1fdaf68 100644
---
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/BaseFsStorageHelper.java
+++
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/BaseFsStorageHelper.java
@@ -50,11 +50,11 @@
VDSCommandType.ValidateStorageServerConnection,
new
ConnectStorageServerVDSCommandParameters(vds.getId(), storagePoolId, getType(),
connections)).getReturnValue();
- return IsConnectSucceeded(validateConnections, connections);
+ return isConnectSucceeded(validateConnections, connections);
}
@Override
- public boolean IsConnectSucceeded(Map<String, String> returnValue,
+ public boolean isConnectSucceeded(Map<String, String> returnValue,
List<storage_server_connections> connections) {
boolean result = true;
for (Map.Entry<String, String> entry : returnValue.entrySet()) {
diff --git
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/ConnectHostToStoragePoolServersCommand.java
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/ConnectHostToStoragePoolServersCommand.java
index 7644f7b..9b8d556 100644
---
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/ConnectHostToStoragePoolServersCommand.java
+++
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/ConnectHostToStoragePoolServersCommand.java
@@ -86,7 +86,7 @@
new
ConnectStorageServerVDSCommandParameters(getVds().getId(),
getStoragePool().getId(), type,
connections)).getReturnValue();
connectSucceeded =
-
StorageHelperDirector.getInstance().getItem(type).IsConnectSucceeded(retValues,
connections);
+
StorageHelperDirector.getInstance().getItem(type).isConnectSucceeded(retValues,
connections);
log.infoFormat("Host {0} storage connection was {1} ",
getVds().getvds_name(),
connectSucceeded ? "succeeded" : "failed");
}
diff --git
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/ConnectStorageToVdsCommand.java
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/ConnectStorageToVdsCommand.java
index f39c8d4..5087dfb 100644
---
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/ConnectStorageToVdsCommand.java
+++
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/ConnectStorageToVdsCommand.java
@@ -77,7 +77,7 @@
.getReturnValue();
return new Pair<Boolean, Integer>(StorageHelperDirector.getInstance()
.getItem(getParameters().getStorageServerConnection().getstorage_type())
- .IsConnectSucceeded(result, Arrays.asList(getConnection())),
+ .isConnectSucceeded(result, Arrays.asList(getConnection())),
Integer.parseInt(result.values().iterator().next()));
}
}
diff --git
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/DisconnectHostFromStoragePoolServersCommand.java
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/DisconnectHostFromStoragePoolServersCommand.java
index 3a52953..1c06368 100644
---
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/DisconnectHostFromStoragePoolServersCommand.java
+++
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/DisconnectHostFromStoragePoolServersCommand.java
@@ -33,7 +33,7 @@
setSucceeded(vdsReturnValue.getSucceeded());
if (!vdsReturnValue.getSucceeded()) {
StorageHelperDirector.getInstance().getItem(getStoragePool().getstorage_pool_type())
- .IsConnectSucceeded((HashMap<String, String>)
vdsReturnValue.getReturnValue(), getConnections());
+ .isConnectSucceeded((HashMap<String, String>)
vdsReturnValue.getReturnValue(), getConnections());
}
if (getIsoConnections() != null && getIsoConnections().size() != 0) {
vdsReturnValue = Backend
@@ -47,7 +47,7 @@
if (!vdsReturnValue.getSucceeded()) {
StorageHelperDirector.getInstance()
.getItem(getIsoType())
- .IsConnectSucceeded((HashMap<String, String>)
vdsReturnValue.getReturnValue(),
+ .isConnectSucceeded((HashMap<String, String>)
vdsReturnValue.getReturnValue(),
getIsoConnections());
}
}
@@ -63,7 +63,7 @@
if (!vdsReturnValue.getSucceeded()) {
StorageHelperDirector.getInstance()
.getItem(getExportType())
- .IsConnectSucceeded((HashMap<String, String>)
vdsReturnValue.getReturnValue(),
+ .isConnectSucceeded((HashMap<String, String>)
vdsReturnValue.getReturnValue(),
getExportConnections());
}
}
diff --git
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/ISCSIStorageHelper.java
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/ISCSIStorageHelper.java
index 71efcc7..ffdd14e 100644
---
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/ISCSIStorageHelper.java
+++
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/ISCSIStorageHelper.java
@@ -60,7 +60,7 @@
poolId, StorageType.ISCSI, list));
isSuccess = returnValue.getSucceeded();
if (isSuccess && VDSCommandType.forValue(type) ==
VDSCommandType.ConnectStorageServer) {
- isSuccess = IsConnectSucceeded((Map<String, String>)
returnValue.getReturnValue(), list);
+ isSuccess = isConnectSucceeded((Map<String, String>)
returnValue.getReturnValue(), list);
}
}
return isSuccess;
@@ -130,13 +130,13 @@
new
ConnectStorageServerVDSCommandParameters(vds.getId(), storagePoolId,
StorageType.ISCSI,
connections)).getReturnValue();
- return IsConnectSucceeded(validateConnections, connections);
+ return isConnectSucceeded(validateConnections, connections);
}
return true;
}
@Override
- public boolean IsConnectSucceeded(final Map<String, String> returnValue,
+ public boolean isConnectSucceeded(final Map<String, String> returnValue,
List<storage_server_connections> connections) {
boolean result = true;
List<String> failedConnectionsList =
LinqUtils.filter(returnValue.keySet(), new Predicate<String>() {
diff --git
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/IStorageHelper.java
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/IStorageHelper.java
index d1d2496..3a3f0d3 100644
---
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/IStorageHelper.java
+++
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/IStorageHelper.java
@@ -33,6 +33,6 @@
List<storage_server_connections> getStorageServerConnectionsByDomain(
storage_domain_static storageDomain);
- boolean IsConnectSucceeded(Map<String, String> returnValue,
+ boolean isConnectSucceeded(Map<String, String> returnValue,
List<storage_server_connections> connections);
}
diff --git
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/StorageHelperBase.java
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/StorageHelperBase.java
index 3f01f75..a1f5d23 100644
---
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/StorageHelperBase.java
+++
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/StorageHelperBase.java
@@ -107,7 +107,7 @@
}
@Override
- public boolean IsConnectSucceeded(Map<String, String> returnValue,
+ public boolean isConnectSucceeded(Map<String, String> returnValue,
List<storage_server_connections> connections) {
return true;
}
--
To view, visit http://gerrit.ovirt.org/10137
To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Id380d2a0696310015d976662a82002e8e8ce04f0
Gerrit-PatchSet: 1
Gerrit-Project: ovirt-engine
Gerrit-Branch: master
Gerrit-Owner: Maor Lipchuk <mlipc...@redhat.com>
_______________________________________________
Engine-patches mailing list
Engine-patches@ovirt.org
http://lists.ovirt.org/mailman/listinfo/engine-patches
