Maor Lipchuk has uploaded a new change for review.
Change subject: core:StorageHelper Cleanup, method name standard(6).
......................................................................
core:StorageHelper Cleanup, method name standard(6).
Change method name connectStorageToDomainByVdsId to be
compatible with the java standards.
Change-Id: I4f5de84c1d6377e7fc06031641d20363750d7128
Signed-off-by: Maor Lipchuk <mlipc...@redhat.com>
---
M
backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/AddStoragePoolWithStoragesCommand.java
M
backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/ConnectSingleAsyncOperation.java
M
backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/ConntectVDSToPoolAndDomains.java
M
backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/FCPStorageHelper.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/RecoveryStoragePoolCommand.java
M
backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/RemoveStorageDomainCommand.java
M
backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/StorageHelperBase.java
M
backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/storage/RemoveStorageDomainTest.java
10 files changed, 10 insertions(+), 10 deletions(-)
git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/30/10130/1
diff --git
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/AddStoragePoolWithStoragesCommand.java
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/AddStoragePoolWithStoragesCommand.java
index 6a7da6f..849756c 100644
---
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/AddStoragePoolWithStoragesCommand.java
+++
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/AddStoragePoolWithStoragesCommand.java
@@ -89,7 +89,7 @@
getStoragePool().getId());
StorageHelperDirector.getInstance()
.getItem(storageDomain.getstorage_type())
- .ConnectStorageToDomainByVdsId(storageDomain,
+ .connectStorageToDomainByVdsId(storageDomain,
getVds().getId());
}
retVal = addStoragePoolInIrs();
diff --git
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/ConnectSingleAsyncOperation.java
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/ConnectSingleAsyncOperation.java
index 864c50f..f20246b 100644
---
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/ConnectSingleAsyncOperation.java
+++
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/ConnectSingleAsyncOperation.java
@@ -16,7 +16,7 @@
public void execute(int iterationId) {
try {
StorageHelperDirector.getInstance().getItem(getStorageDomain().getstorage_type())
- .ConnectStorageToDomainByVdsId(getStorageDomain(),
getVdss().get(iterationId).getId());
+ .connectStorageToDomainByVdsId(getStorageDomain(),
getVdss().get(iterationId).getId());
} catch (RuntimeException e) {
log.errorFormat("Failed to connect host {0} to storage pool {1}.
Exception: {3}", getVdss()
.get(iterationId).getvds_name(),
getStoragePool().getname(), e);
diff --git
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/ConntectVDSToPoolAndDomains.java
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/ConntectVDSToPoolAndDomains.java
index 44585cf..c32a8c0 100644
---
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/ConntectVDSToPoolAndDomains.java
+++
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/ConntectVDSToPoolAndDomains.java
@@ -25,7 +25,7 @@
try {
boolean isConnectSuccessed =
StorageHelperDirector.getInstance().getItem(getStorageDomain().getstorage_type())
- .ConnectStorageToDomainByVdsId(getStorageDomain(),
vds.getId());
+ .connectStorageToDomainByVdsId(getStorageDomain(),
vds.getId());
if (isConnectSuccessed) {
ResourceManager.getInstance().runVdsCommand(
VDSCommandType.ConnectStoragePool,
diff --git
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/FCPStorageHelper.java
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/FCPStorageHelper.java
index 14d1180..0621ad0 100644
---
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/FCPStorageHelper.java
+++
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/FCPStorageHelper.java
@@ -21,7 +21,7 @@
}
@Override
- public boolean ConnectStorageToDomainByVdsId(storage_domains
storageDomain, Guid vdsId) {
+ public boolean connectStorageToDomainByVdsId(storage_domains
storageDomain, Guid vdsId) {
return true;
}
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 c6b843d..58a3931 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
@@ -212,7 +212,7 @@
}
@Override
- public boolean ConnectStorageToDomainByVdsId(storage_domains
storageDomain, Guid vdsId) {
+ public boolean connectStorageToDomainByVdsId(storage_domains
storageDomain, Guid vdsId) {
return runConnectionStorageToDomain(storageDomain, vdsId,
VDSCommandType.ConnectStorageServer.getValue());
}
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 8eddcc3..3a21aa4 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
@@ -15,7 +15,7 @@
boolean disconnectStorageFromDomainByStoragePoolId(storage_domains
storageDomain, Guid storagePoolId);
- boolean ConnectStorageToDomainByVdsId(storage_domains storageDomain, Guid
vdsId);
+ boolean connectStorageToDomainByVdsId(storage_domains storageDomain, Guid
vdsId);
boolean DisconnectStorageFromDomainByVdsId(storage_domains storageDomain,
Guid vdsId);
diff --git
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/RecoveryStoragePoolCommand.java
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/RecoveryStoragePoolCommand.java
index 1f3c6ac..270bc61 100644
---
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/RecoveryStoragePoolCommand.java
+++
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/RecoveryStoragePoolCommand.java
@@ -100,7 +100,7 @@
getStoragePool().setstatus(StoragePoolStatus.Problematic);
try {
if
(StorageHelperDirector.getInstance().getItem(getStorageDomain().getstorage_type())
- .ConnectStorageToDomainByVdsId(getNewMaster(false),
getVds().getId())) {
+ .connectStorageToDomainByVdsId(getNewMaster(false),
getVds().getId())) {
super.executeCommand();
} else {
getReturnValue().setFault(new VdcFault(new
VdcBLLException(VdcBllErrors.StorageServerConnectionError,
diff --git
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/RemoveStorageDomainCommand.java
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/RemoveStorageDomainCommand.java
index 63e5d8e..5463c45 100644
---
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/RemoveStorageDomainCommand.java
+++
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/RemoveStorageDomainCommand.java
@@ -124,7 +124,7 @@
}
private boolean ConnectStorage() {
- return
getStorageHelper(getStorageDomain()).ConnectStorageToDomainByVdsId(getStorageDomain(),
+ return
getStorageHelper(getStorageDomain()).connectStorageToDomainByVdsId(getStorageDomain(),
getVds().getId());
}
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 1db945c..25dc359 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
@@ -51,7 +51,7 @@
}
@Override
- public boolean ConnectStorageToDomainByVdsId(storage_domains
storageDomain, Guid vdsId) {
+ public boolean connectStorageToDomainByVdsId(storage_domains
storageDomain, Guid vdsId) {
return runConnectionStorageToDomain(storageDomain, vdsId,
VdcActionType.ConnectStorageToVds.getValue());
}
diff --git
a/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/storage/RemoveStorageDomainTest.java
b/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/storage/RemoveStorageDomainTest.java
index 2da031a..956507f 100644
---
a/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/storage/RemoveStorageDomainTest.java
+++
b/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/storage/RemoveStorageDomainTest.java
@@ -160,7 +160,7 @@
boolean failure) {
IStorageHelper helper = mock(IStorageHelper.class);
if (connect) {
- when(helper.ConnectStorageToDomainByVdsId(dom,
VDS_ID)).thenReturn(true);
+ when(helper.connectStorageToDomainByVdsId(dom,
VDS_ID)).thenReturn(true);
when(helper.DisconnectStorageFromDomainByVdsId(dom,
VDS_ID)).thenReturn(true);
}
if (!failure) {
--
To view, visit http://gerrit.ovirt.org/10130
To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I4f5de84c1d6377e7fc06031641d20363750d7128
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
