Allon Mureinik has uploaded a new change for review. Change subject: core: FB: StorageDomainCommandBase method names ......................................................................
core: FB: StorageDomainCommandBase method names Fixed FindBugs NM_METHOD_NAMING_CONVENTION warnings regarding StorageDomainCommandBase's naming convention (i.e., not starting with a lowercase letter). Changes in other files are due to other classes using or overriding these methods. Change-Id: I730fdee95aceed27940f591f6f87c7c939457dce Signed-off-by: Allon Mureinik <[email protected]> --- M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/MoveOrCopyTemplateCommand.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/MoveVmCommand.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/ActivateStorageDomainCommand.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/AddLocalStorageDomainCommand.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/AddStorageDomainCommand.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/AddStorageDomainCommon.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/AttachStorageDomainToPoolCommand.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/ConnectDomainToStorageCommand.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/DetachStorageDomainFromPoolCommand.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/ExtendSANStorageDomainCommand.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/ForceRemoveStorageDomainCommand.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/RemoveStorageDomainCommand.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/StorageDomainCommandBase.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/UpdateStorageDomainCommand.java M backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/storage/StorageDomainCommandBaseTest.java 17 files changed, 41 insertions(+), 41 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/56/8556/1 diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/MoveOrCopyTemplateCommand.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/MoveOrCopyTemplateCommand.java index ac797c0..2401cde 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/MoveOrCopyTemplateCommand.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/MoveOrCopyTemplateCommand.java @@ -118,7 +118,7 @@ if (retValue) { setStoragePoolId(getVmTemplate().getstorage_pool_id()); retValue = - CheckStorageDomain() + checkStorageDomain() && checkStorageDomainStatus(StorageDomainStatus.Active) && checkIfDisksExist(getTemplateDisks()) && checkFreeSpaceOnDestinationDomain(getStorageDomain(), diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/MoveVmCommand.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/MoveVmCommand.java index bf03970..586be88 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/MoveVmCommand.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/MoveVmCommand.java @@ -123,7 +123,7 @@ } protected boolean checkTemplateInStorageDomain(List<DiskImage> diskImages) { - boolean retValue = CheckStorageDomain() && checkStorageDomainStatus(StorageDomainStatus.Active) + boolean retValue = checkStorageDomain() && checkStorageDomainStatus(StorageDomainStatus.Active) && checkIfDisksExist(diskImages); if (retValue && !VmTemplateHandler.BlankVmTemplateId.equals(getVm().getvmt_guid())) { List<DiskImage> imageList = diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/ActivateStorageDomainCommand.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/ActivateStorageDomainCommand.java index 9834589..b6f1542 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/ActivateStorageDomainCommand.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/ActivateStorageDomainCommand.java @@ -46,9 +46,9 @@ boolean returnValue = checkStoragePool() && CheckStoragePoolStatusNotEqual(StoragePoolStatus.Uninitialized, VdcBllMessages.ACTION_TYPE_FAILED_STORAGE_POOL_STATUS_ILLEGAL) - && CheckStorageDomain() + && checkStorageDomain() && storageDomainStatusIsValid() - && (getStorageDomain().getstorage_domain_type() == StorageDomainType.Master || CheckMasterDomainIsUp()); + && (getStorageDomain().getstorage_domain_type() == StorageDomainType.Master || checkMasterDomainIsUp()); return returnValue; } @@ -63,12 +63,12 @@ freeLock(); log.infoFormat("ActivateStorage Domain. Before Connect all hosts to pool. Time:{0}", new Date()); - ConnectAllHostsToPool(); + connectAllHostsToPool(); runVdsCommand(VDSCommandType.ActivateStorageDomain, new ActivateStorageDomainVDSCommandParameters(getStoragePool().getId(), getStorageDomain().getId())); log.infoFormat("ActivateStorage Domain. After Connect all hosts to pool. Time:{0}", new Date()); - RefreshAllVdssInPool(false); + refreshAllVdssInPool(false); TransactionSupport.executeInNewTransaction(new TransactionMethod<Void>() { @Override public Void runInTransaction() { diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/AddLocalStorageDomainCommand.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/AddLocalStorageDomainCommand.java index 04c1da7..3920c0d 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/AddLocalStorageDomainCommand.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/AddLocalStorageDomainCommand.java @@ -51,7 +51,7 @@ } if (retVal && storagePool.getstatus() != StoragePoolStatus.Uninitialized) { - retVal = CheckMasterDomainIsUp(); + retVal = checkMasterDomainIsUp(); } // we limit RHEV-H local storage to its persistence mount - /data/images/rhev/ diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/AddStorageDomainCommand.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/AddStorageDomainCommand.java index 8d2b6c8..cb438cf 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/AddStorageDomainCommand.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/AddStorageDomainCommand.java @@ -119,7 +119,7 @@ @Override protected boolean canDoAction() { addCanDoActionMessage(VdcBllMessages.VAR__ACTION__ADD); - boolean returnValue = super.canDoAction() && InitializeVds() && CheckStorageDomainNameLengthValid(); + boolean returnValue = super.canDoAction() && InitializeVds() && checkStorageDomainNameLengthValid(); if (returnValue && IsStorageWithSameNameExists()) { addCanDoActionMessage(VdcBllMessages.ACTION_TYPE_FAILED_STORAGE_DOMAIN_NAME_ALREADY_EXIST); returnValue = false; diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/AddStorageDomainCommon.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/AddStorageDomainCommon.java index 119f5a9..a17c154 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/AddStorageDomainCommon.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/AddStorageDomainCommon.java @@ -21,7 +21,7 @@ @Override protected boolean CanAddDomain() { - return CheckStorageConnection(getStorageDomain().getstorage()); + return checkStorageConnection(getStorageDomain().getstorage()); } @Override diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/AttachStorageDomainToPoolCommand.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/AttachStorageDomainToPoolCommand.java index 0b61aff..4bcb6e9 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/AttachStorageDomainToPoolCommand.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/AttachStorageDomainToPoolCommand.java @@ -76,7 +76,7 @@ return null; } }); - ConnectAllHostsToPool(); + connectAllHostsToPool(); runVdsCommand(VDSCommandType.AttachStorageDomain, new AttachStorageDomainVDSCommandParameters(getParameters().getStoragePoolId(), getParameters().getStorageDomainId())); @@ -125,7 +125,7 @@ // which is not attached. boolean returnValue = checkStoragePool() - && InitializeVds() && CheckStorageDomain() && checkDomainCanBeAttached(getStorageDomain()); + && InitializeVds() && checkStorageDomain() && checkDomainCanBeAttached(getStorageDomain()); if (returnValue && getStoragePool().getstatus() == StoragePoolStatus.Uninitialized && getStorageDomain().getstorage_domain_type() != StorageDomainType.Data) { @@ -133,7 +133,7 @@ addCanDoActionMessage(VdcBllMessages.ERROR_CANNOT_ADD_STORAGE_POOL_WITHOUT_DATA_DOMAIN); } if (returnValue && getStoragePool().getstatus() != StoragePoolStatus.Uninitialized) { - returnValue = CheckMasterDomainIsUp(); + returnValue = checkMasterDomainIsUp(); } return returnValue; } diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/ConnectDomainToStorageCommand.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/ConnectDomainToStorageCommand.java index e466c5a..9f8b7d1 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/ConnectDomainToStorageCommand.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/ConnectDomainToStorageCommand.java @@ -19,7 +19,7 @@ @Override protected void executeCommand() { log.infoFormat("ConnectDomainToStorage. Before Connect all hosts to pool. Time:{0}", new Date()); - ConnectAllHostsToPool(); + connectAllHostsToPool(); log.infoFormat("ConnectDomainToStorage. After Connect all hosts to pool. Time:{0}", new Date()); } } 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 2ee385f..df59089 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 @@ -74,7 +74,7 @@ @Override protected boolean canDoAction() { - if (!(CheckStorageDomain() && checkStorageDomainStatus(StorageDomainStatus.Active))) { + if (!(checkStorageDomain() && checkStorageDomainStatus(StorageDomainStatus.Active))) { return false; } diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/DetachStorageDomainFromPoolCommand.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/DetachStorageDomainFromPoolCommand.java index 61a9ba9..d1ac31b 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/DetachStorageDomainFromPoolCommand.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/DetachStorageDomainFromPoolCommand.java @@ -40,7 +40,7 @@ changeStorageDomainStatusInTransaction(getStorageDomain().getStoragePoolIsoMapData(), StorageDomainStatus.Locked); log.info(" Detach storage domain: before connect"); - ConnectAllHostsToPool(); + connectAllHostsToPool(); log.info(" Detach storage domain: after connect"); @@ -50,7 +50,7 @@ getParameters().getStorageDomainId(), Guid.Empty, getStoragePool() .getmaster_domain_version())); log.info(" Detach storage domain: after detach in vds"); - DiconnectAllHostsInPool(); + diconnectAllHostsInPool(); log.info(" Detach storage domain: after disconnect storage"); TransactionSupport.executeInNewTransaction(new TransactionMethod<Object>() { diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/ExtendSANStorageDomainCommand.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/ExtendSANStorageDomainCommand.java index 5e650d2..cd36ee8 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/ExtendSANStorageDomainCommand.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/ExtendSANStorageDomainCommand.java @@ -23,7 +23,7 @@ @Override protected void executeCommand() { - SetStorageDomainStatus(StorageDomainStatus.Locked, null); + setStorageDomainStatus(StorageDomainStatus.Locked, null); for (LUNs lun : getParameters().getLunsList()) { proceedLUNInDb(lun, getStorageDomain().getstorage_type()); } @@ -34,7 +34,7 @@ VDSCommandType.ExtendStorageDomain, new ExtendStorageDomainVDSCommandParameters(getStoragePoolId().getValue(), getStorageDomain() .getId(), getParameters().getLunIds())).getSucceeded()) { - SetStorageDomainStatus(StorageDomainStatus.Active, null); + setStorageDomainStatus(StorageDomainStatus.Active, null); setSucceeded(true); } } @@ -44,7 +44,7 @@ protected boolean canDoAction() { super.canDoAction(); addCanDoActionMessage(VdcBllMessages.VAR__ACTION__EXTEND); - boolean returnValue = CheckStorageDomain() && checkStorageDomainStatus(StorageDomainStatus.Active); + boolean returnValue = checkStorageDomain() && checkStorageDomainStatus(StorageDomainStatus.Active); if (returnValue && (getStorageDomain().getstorage_type() == StorageType.NFS || getStorageDomain().getstorage_type() == StorageType.UNKNOWN)) { addCanDoActionMessage(VdcBllMessages.ACTION_TYPE_FAILED_STORAGE_DOMAIN_TYPE_ILLEGAL); diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/ForceRemoveStorageDomainCommand.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/ForceRemoveStorageDomainCommand.java index 6689328..cedf064 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/ForceRemoveStorageDomainCommand.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/ForceRemoveStorageDomainCommand.java @@ -83,8 +83,8 @@ addCanDoActionMessage(VdcBllMessages.VAR__ACTION__DESTROY_DOMAIN); boolean returnValue = super.canDoAction() - && CheckStorageDomain() - && (getStorageDomain().getstorage_domain_shared_status() == StorageDomainSharedStatus.Unattached || CheckStorageDomainStatusNotEqual(StorageDomainStatus.Active)); + && checkStorageDomain() + && (getStorageDomain().getstorage_domain_shared_status() == StorageDomainSharedStatus.Unattached || checkStorageDomainStatusNotEqual(StorageDomainStatus.Active)); if (returnValue && getStorageDomain().getstorage_domain_type() == StorageDomainType.Master && getStoragePool() != null) { 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 da847ea..d21da8c 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 @@ -83,7 +83,7 @@ if (getParameters().isInactive()) { executeInNewTransaction(new TransactionMethod<Void>() { public Void runInTransaction() { - SetStorageDomainStatus(StorageDomainStatus.InActive, getCompensationContext()); + setStorageDomainStatus(StorageDomainStatus.InActive, getCompensationContext()); calcStoragePoolStatusByDomainsStatus(); getCompensationContext().stateChanged(); return null; 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 9061024..858751d 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 @@ -96,11 +96,11 @@ addCanDoActionMessage(VdcBllMessages.VAR__ACTION__REMOVE); - if (!CheckStorageDomain() || !checkStorageDomainSharedStatusNotLocked(dom)) { + if (!checkStorageDomain() || !checkStorageDomainSharedStatusNotLocked(dom)) { return false; } - if (!localFs && !CheckStorageDomainNotInPool()) { + if (!localFs && !checkStorageDomainNotInPool()) { return false; } diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/StorageDomainCommandBase.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/StorageDomainCommandBase.java index 47bd3c6..c2a840d 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/StorageDomainCommandBase.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/StorageDomainCommandBase.java @@ -69,9 +69,9 @@ protected boolean canDetachDomain(boolean isDestroyStoragePool, boolean isRemoveLast, boolean isInternal) { return checkStoragePool() - && CheckStorageDomain() + && checkStorageDomain() && checkStorageDomainStatus(StorageDomainStatus.InActive, StorageDomainStatus.Maintenance) - && (isMaster() || isDestroyStoragePool || CheckMasterDomainIsUp()) + && (isMaster() || isDestroyStoragePool || checkMasterDomainIsUp()) && isNotLocalData(isInternal) && isDetachAllowed(isRemoveLast); } @@ -149,7 +149,7 @@ return super.canDoAction(); } - protected boolean CheckStorageDomainNameLengthValid() { + protected boolean checkStorageDomainNameLengthValid() { boolean result = true; if (getStorageDomain().getstorage_name().length() > Config .<Integer> GetValue(ConfigValues.StorageDomainNameSizeLimit)) { @@ -159,7 +159,7 @@ return result; } - protected boolean CheckStorageDomain() { + protected boolean checkStorageDomain() { return isStorageDomainNotNull(getStorageDomain()); } @@ -178,7 +178,7 @@ return valid; } - protected boolean CheckStorageDomainStatusNotEqual(StorageDomainStatus status) { + protected boolean checkStorageDomainStatusNotEqual(StorageDomainStatus status) { boolean returnValue = false; if (getStorageDomain() != null && getStorageDomain().getstatus() != null) { returnValue = (getStorageDomain().getstatus() != status); @@ -190,11 +190,11 @@ return returnValue; } - protected boolean CheckStorageDomainNotInPool() { + protected boolean checkStorageDomainNotInPool() { return isStorageDomainNotInPool(getStorageDomain()); } - protected boolean CheckStorageConnection(String storageDomainConnection) { + protected boolean checkStorageConnection(String storageDomainConnection) { boolean returnValue = true; if (getStorageServerConnectionDAO().get(storageDomainConnection) == null) { returnValue = false; @@ -203,7 +203,7 @@ return returnValue; } - protected boolean CheckMasterDomainIsUp() { + protected boolean checkMasterDomainIsUp() { boolean returnValue = true; List<storage_domains> storageDomains = getStorageDomainDAO().getAllForStoragePool(getStoragePool().getId()); storageDomains = LinqUtils.filter(storageDomains, new Predicate<storage_domains>() { @@ -220,7 +220,7 @@ return returnValue; } - protected void SetStorageDomainStatus(StorageDomainStatus status, CompensationContext context) { + protected void setStorageDomainStatus(StorageDomainStatus status, CompensationContext context) { if (getStorageDomain() != null && getStorageDomain().getstorage_pool_id() != null) { storage_pool_iso_map map = getStorageDomain().getStoragePoolIsoMapData(); if(context != null) { @@ -231,7 +231,7 @@ } } - protected void RefreshAllVdssInPool(boolean connect) { + protected void refreshAllVdssInPool(boolean connect) { java.util.ArrayList<Guid> vdsIdsToSetNonOperational = new java.util.ArrayList<Guid>(); runSynchronizeOperation(new RefreshPoolSingleAsyncOperationFactory(), vdsIdsToSetNonOperational); for (Guid vdsId : vdsIdsToSetNonOperational) { @@ -269,11 +269,11 @@ } } - protected void ConnectAllHostsToPool() { + protected void connectAllHostsToPool() { runSynchronizeOperation(new ConnectSingleAsyncOperationFactory()); } - protected void DiconnectAllHostsInPool() { + protected void diconnectAllHostsInPool() { runSynchronizeOperation(new RefreshStoragePoolAndDisconnectAsyncOperationFactory()); } diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/UpdateStorageDomainCommand.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/UpdateStorageDomainCommand.java index 5cb97fc..fb8ff7b 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/UpdateStorageDomainCommand.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/UpdateStorageDomainCommand.java @@ -27,8 +27,8 @@ @Override protected boolean canDoAction() { addCanDoActionMessage(VdcBllMessages.VAR__ACTION__UPDATE); - boolean returnValue = super.canDoAction() && CheckStorageDomain() - && checkStorageDomainStatus(StorageDomainStatus.Active) && CheckStorageDomainNameLengthValid(); + boolean returnValue = super.canDoAction() && checkStorageDomain() + && checkStorageDomainStatus(StorageDomainStatus.Active) && checkStorageDomainNameLengthValid(); storage_domain_static oldDomain = DbFacade.getInstance().getStorageDomainStaticDao().get(getStorageDomain().getId()); diff --git a/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/storage/StorageDomainCommandBaseTest.java b/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/storage/StorageDomainCommandBaseTest.java index 028b1d6..f9ba3b1 100644 --- a/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/storage/StorageDomainCommandBaseTest.java +++ b/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/storage/StorageDomainCommandBaseTest.java @@ -79,7 +79,7 @@ @Test public void checkStorageDomainNotEqualWithStatusActive() { setStorageDomainStatus(StorageDomainStatus.Active); - assertFalse(cmd.CheckStorageDomainStatusNotEqual(StorageDomainStatus.Active)); + assertFalse(cmd.checkStorageDomainStatusNotEqual(StorageDomainStatus.Active)); List<String> messages = cmd.getReturnValue().getCanDoActionMessages(); assertEquals(messages.size(), 2); assertEquals(messages.get(0), VdcBllMessages.ACTION_TYPE_FAILED_STORAGE_DOMAIN_STATUS_ILLEGAL2.toString()); @@ -89,7 +89,7 @@ @Test public void checkStorageDomainNotEqualWithNonActiveStatus() { setStorageDomainStatus(StorageDomainStatus.Maintenance); - assertTrue(cmd.CheckStorageDomainStatusNotEqual(StorageDomainStatus.Active)); + assertTrue(cmd.checkStorageDomainStatusNotEqual(StorageDomainStatus.Active)); } private void storagePoolExists() { @@ -97,7 +97,7 @@ } private void masterDomainIsUp() { - doReturn(true).when(cmd).CheckMasterDomainIsUp(); + doReturn(true).when(cmd).checkMasterDomainIsUp(); } private void isNotLocalData() { -- To view, visit http://gerrit.ovirt.org/8556 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I730fdee95aceed27940f591f6f87c7c939457dce Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Allon Mureinik <[email protected]> _______________________________________________ Engine-patches mailing list [email protected] http://lists.ovirt.org/mailman/listinfo/engine-patches
