Maor Lipchuk has uploaded a new change for review.
Change subject: core:StorageHelper Cleanup, method name standard(7).
......................................................................
core:StorageHelper Cleanup, method name standard(7).
Change method name disconnectStorageFromDomainByVdsId to be
compatible with the java standards.
Change-Id: Id4d13d3f4fe2d035395dd015cf27693590cab56d
Signed-off-by: Maor Lipchuk <mlipc...@redhat.com>
---
M
backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/AfterDeactivateSingleAsyncOperation.java
M
backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/DeactivateStorageDomainCommand.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/ReconstructMasterDomainCommand.java
M
backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/RefreshStoragePoolAndDisconnectAsyncOperation.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/RemoveStoragePoolCommand.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
11 files changed, 12 insertions(+), 12 deletions(-)
git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/31/10131/1
diff --git
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/AfterDeactivateSingleAsyncOperation.java
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/AfterDeactivateSingleAsyncOperation.java
index c6b5c2f..b7a803b 100644
---
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/AfterDeactivateSingleAsyncOperation.java
+++
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/AfterDeactivateSingleAsyncOperation.java
@@ -45,7 +45,7 @@
if (getVdss().get(iterationId).getspm_status() ==
VdsSpmStatus.None) {
StorageHelperDirector.getInstance().getItem(getStorageDomain().getstorage_type())
-
.DisconnectStorageFromDomainByVdsId(getStorageDomain(),
getVdss().get(iterationId).getId());
+
.disconnectStorageFromDomainByVdsId(getStorageDomain(),
getVdss().get(iterationId).getId());
}
} catch (RuntimeException e) {
log.errorFormat("Failed to refresh storagePool. Host {0} to
storage pool {1}. Exception: {3}", getVdss()
diff --git
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/DeactivateStorageDomainCommand.java
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/DeactivateStorageDomainCommand.java
index f7d1d41..e306c3b 100644
---
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/DeactivateStorageDomainCommand.java
+++
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/DeactivateStorageDomainCommand.java
@@ -210,7 +210,7 @@
}
if (!getParameters().isInactive() && spm != null) {
-
getStorageHelper(getStorageDomain()).DisconnectStorageFromDomainByVdsId(getStorageDomain(),
spm.getId());
+
getStorageHelper(getStorageDomain()).disconnectStorageFromDomainByVdsId(getStorageDomain(),
spm.getId());
}
executeInNewTransaction(new TransactionMethod<Object>() {
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 0621ad0..64cbf96 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
@@ -26,7 +26,7 @@
}
@Override
- public boolean DisconnectStorageFromDomainByVdsId(storage_domains
storageDomain, Guid vdsId) {
+ public boolean disconnectStorageFromDomainByVdsId(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 58a3931..96ef1c1 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
@@ -217,7 +217,7 @@
}
@Override
- public boolean DisconnectStorageFromDomainByVdsId(storage_domains
storageDomain, Guid vdsId) {
+ public boolean disconnectStorageFromDomainByVdsId(storage_domains
storageDomain, Guid vdsId) {
return runConnectionStorageToDomain(storageDomain, vdsId,
VDSCommandType.DisconnectStorageServer.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 3a21aa4..eb7aa3d 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
@@ -17,7 +17,7 @@
boolean connectStorageToDomainByVdsId(storage_domains storageDomain, Guid
vdsId);
- boolean DisconnectStorageFromDomainByVdsId(storage_domains storageDomain,
Guid vdsId);
+ boolean disconnectStorageFromDomainByVdsId(storage_domains storageDomain,
Guid vdsId);
boolean ConnectStorageToLunByVdsId(storage_domains storageDomain, Guid
vdsId, LUNs lun, Guid storagePoolId);
diff --git
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/ReconstructMasterDomainCommand.java
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/ReconstructMasterDomainCommand.java
index 81f04c0..21a130b 100644
---
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/ReconstructMasterDomainCommand.java
+++
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/ReconstructMasterDomainCommand.java
@@ -232,7 +232,7 @@
if (!getParameters().isInactive()) {
StorageHelperDirector.getInstance()
.getItem(getStorageDomain().getstorage_type())
-
.DisconnectStorageFromDomainByVdsId(getStorageDomain(), vds.getId());
+
.disconnectStorageFromDomainByVdsId(getStorageDomain(), vds.getId());
}
} catch (Exception e) {
diff --git
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/RefreshStoragePoolAndDisconnectAsyncOperation.java
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/RefreshStoragePoolAndDisconnectAsyncOperation.java
index 952eccb..0fef687 100644
---
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/RefreshStoragePoolAndDisconnectAsyncOperation.java
+++
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/RefreshStoragePoolAndDisconnectAsyncOperation.java
@@ -32,7 +32,7 @@
getStoragePool().getId(),
masterDomainIdFromDb, getStoragePool()
.getmaster_domain_version()));
StorageHelperDirector.getInstance().getItem(getStorageDomain().getstorage_type())
- .DisconnectStorageFromDomainByVdsId(getStorageDomain(),
getVdss().get(iterationId).getId());
+ .disconnectStorageFromDomainByVdsId(getStorageDomain(),
getVdss().get(iterationId).getId());
} catch (RuntimeException e) {
log.errorFormat("Failed to connect/refresh storagePool. 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/RemoveStorageDomainCommand.java
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/RemoveStorageDomainCommand.java
index 5463c45..044410f 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
@@ -129,7 +129,7 @@
}
private void DisconnectStorage() {
-
getStorageHelper(getStorageDomain()).DisconnectStorageFromDomainByVdsId(getStorageDomain(),
+
getStorageHelper(getStorageDomain()).disconnectStorageFromDomainByVdsId(getStorageDomain(),
getVds().getId());
}
diff --git
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/RemoveStoragePoolCommand.java
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/RemoveStoragePoolCommand.java
index 1e14b01..5f72bc3 100644
---
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/RemoveStoragePoolCommand.java
+++
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/RemoveStoragePoolCommand.java
@@ -184,7 +184,7 @@
if (getStoragePool().getstorage_pool_type() != StorageType.LOCALFS) {
for (VDS vds : vdss) {
StorageHelperDirector.getInstance().getItem(getStoragePool().getstorage_pool_type())
- .DisconnectStorageFromDomainByVdsId(masterDomain,
vds.getId());
+ .disconnectStorageFromDomainByVdsId(masterDomain,
vds.getId());
}
TransactionSupport.executeInNewTransaction(new
TransactionMethod<Void>() {
@Override
@@ -207,7 +207,7 @@
// Do nothing, exception already printed at logs
}
StorageHelperDirector.getInstance().getItem(getStoragePool().getstorage_pool_type())
- .DisconnectStorageFromDomainByVdsId(masterDomain,
vdss.get(0).getId());
+ .disconnectStorageFromDomainByVdsId(masterDomain,
vdss.get(0).getId());
removeDomainFromDb(masterDomain);
}
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 25dc359..e263704 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
@@ -56,7 +56,7 @@
}
@Override
- public boolean DisconnectStorageFromDomainByVdsId(storage_domains
storageDomain, Guid vdsId) {
+ public boolean disconnectStorageFromDomainByVdsId(storage_domains
storageDomain, Guid vdsId) {
return runConnectionStorageToDomain(storageDomain, vdsId,
VdcActionType.RemoveStorageServerConnection.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 956507f..609f828 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
@@ -161,7 +161,7 @@
IStorageHelper helper = mock(IStorageHelper.class);
if (connect) {
when(helper.connectStorageToDomainByVdsId(dom,
VDS_ID)).thenReturn(true);
- when(helper.DisconnectStorageFromDomainByVdsId(dom,
VDS_ID)).thenReturn(true);
+ when(helper.disconnectStorageFromDomainByVdsId(dom,
VDS_ID)).thenReturn(true);
}
if (!failure) {
when(helper.StorageDomainRemoved(dom.getStorageStaticData())).thenReturn(true);
--
To view, visit http://gerrit.ovirt.org/10131
To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Id4d13d3f4fe2d035395dd015cf27693590cab56d
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
