Vered Volansky has uploaded a new change for review. Change subject: core: cleanup - Fix InActive typo ......................................................................
core: cleanup - Fix InActive typo Inactive is one word. Changed InActive usages to Inactive throughout the system, mainly in StorageDomainStatus & StorageDomainSharedStatusi enums. Change-Id: I3683e31ffa6965a6eef91a4eb52ae8bab4703fd2 Signed-off-by: Vered Volansky <[email protected]> --- M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/InitVdsOnUpCommand.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/AddStoragePoolWithStoragesCommand.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/FenceVdsManualyCommand.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/StorageDomainCommandBase.java M backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/storage/ActivateStorageDomainCommandTest.java M backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/storage/RemoveStoragePoolCommandTest.java M backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/storage/StorageDomainCommandBaseTest.java M backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/validator/MultipleStorageDomainsValidatorTest.java M backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/validator/StorageConnectionValidatorTest.java M backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/validator/StorageDomainValidatorTest.java M backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/VdcActionUtils.java M backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/StorageDomainSharedStatus.java M backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/StorageDomainStatus.java M backend/manager/modules/common/src/test/java/org/ovirt/engine/core/common/VdcActionUtilsTest.java M backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/StorageServerConnectionDAO.java M backend/manager/modules/dal/src/test/java/org/ovirt/engine/core/dal/dbbroker/auditloghandling/AuditLogableBaseTest.java M backend/manager/modules/dal/src/test/java/org/ovirt/engine/core/dao/DbFacadeDAOTest.java M backend/manager/modules/restapi/types/src/main/java/org/ovirt/engine/api/restapi/types/StorageDomainMapper.java M backend/manager/modules/restapi/types/src/test/java/org/ovirt/engine/api/restapi/types/StorageDomainMapperTest.java M backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/irsbroker/IrsBrokerCommand.java M backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/storage/StoragePoolDomainHelper.java M backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/GetStorageDomainStatsVDSCommand.java M frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/storage/ManageBackupModel.java M frontend/webadmin/modules/uicompat/src/main/java/org/ovirt/engine/ui/uicompat/Enums.java M frontend/webadmin/modules/uicompat/src/main/resources/org/ovirt/engine/ui/uicompat/Enums.properties M frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/widget/table/column/StorageDomainSharedStatusColumn.java M frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/widget/table/column/StorageDomainStatusColumn.java 30 files changed, 48 insertions(+), 48 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/55/27655/1 diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/InitVdsOnUpCommand.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/InitVdsOnUpCommand.java index a6c159f..77df6dd 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/InitVdsOnUpCommand.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/InitVdsOnUpCommand.java @@ -229,7 +229,7 @@ EventResult result = new EventResult(true, EventType.VDSCONNECTTOPOOL); StoragePool storagePool = getStoragePoolDAO().get(storagePoolId); StorageDomain masterDomain = getStorageDomainDAO().getStorageDomainByTypeAndPool(storagePoolId, StorageDomainType.Master); - boolean masterDomainInactiveOrUnknown = masterDomain.getStatus() == StorageDomainStatus.InActive + boolean masterDomainInactiveOrUnknown = masterDomain.getStatus() == StorageDomainStatus.Inactive || masterDomain.getStatus() == StorageDomainStatus.Unknown; VDSError error = null; try { 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 bed72b2..9a679aa 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 @@ -140,11 +140,11 @@ private boolean storageDomainStatusIsValid() { boolean returnValue; if (isInternalExecution()) { - returnValue = checkStorageDomainStatus(StorageDomainStatus.InActive, StorageDomainStatus.Unknown, + returnValue = checkStorageDomainStatus(StorageDomainStatus.Inactive, StorageDomainStatus.Unknown, StorageDomainStatus.Locked, StorageDomainStatus.Maintenance, StorageDomainStatus.PreparingForMaintenance); } else { - returnValue = checkStorageDomainStatus(StorageDomainStatus.InActive, StorageDomainStatus.Unknown, + returnValue = checkStorageDomainStatus(StorageDomainStatus.Inactive, StorageDomainStatus.Unknown, StorageDomainStatus.Maintenance, StorageDomainStatus.PreparingForMaintenance); } return returnValue; 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 5a16fe8..3cef621 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 @@ -233,7 +233,7 @@ .getStoragePoolIsoMapDao() .updateStatus( new StoragePoolIsoMapId(storageDomainId, getStoragePool().getId()), - StorageDomainStatus.InActive); + StorageDomainStatus.Inactive); return null; } }); 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 f750b85..df5e641 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 @@ -259,7 +259,7 @@ @Override public Object runInTransaction() { if (getParameters().isInactive()) { - map.setStatus(StorageDomainStatus.InActive); + map.setStatus(StorageDomainStatus.Inactive); } else if (_isLastMaster) { map.setStatus(StorageDomainStatus.Maintenance); } else { diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/FenceVdsManualyCommand.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/FenceVdsManualyCommand.java index 320f00a..53a914f 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/FenceVdsManualyCommand.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/FenceVdsManualyCommand.java @@ -174,7 +174,7 @@ if (masterDomain != null && masterDomain.getStatus() != null && (masterDomain.getStatus() == StorageDomainStatus.Active - || masterDomain.getStatus() == StorageDomainStatus.Unknown || masterDomain.getStatus() == StorageDomainStatus.InActive)) { + || masterDomain.getStatus() == StorageDomainStatus.Unknown || masterDomain.getStatus() == StorageDomainStatus.Inactive)) { if (!getStoragePool().isLocal()) { // if only one\"the fenced" host connected to sp in dc if (getAmountOfVdssInPool() == 1) { 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 1ac16e5..5dca336 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 @@ -101,7 +101,7 @@ executeInNewTransaction(new TransactionMethod<Void>() { @Override 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/StorageDomainCommandBase.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/StorageDomainCommandBase.java index 06b81c8..a14c436 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 @@ -72,7 +72,7 @@ protected boolean canDetachDomain(boolean isDestroyStoragePool, boolean isRemoveLast, boolean isInternal) { return checkStoragePool() && checkStorageDomain() - && checkStorageDomainStatus(StorageDomainStatus.InActive, StorageDomainStatus.Maintenance) + && checkStorageDomainStatus(StorageDomainStatus.Inactive, StorageDomainStatus.Maintenance) && (isMaster() || isDestroyStoragePool || checkMasterDomainIsUp()) && isNotLocalData(isInternal) && isDetachAllowed(isRemoveLast); @@ -346,7 +346,7 @@ newMaster = dbStorageDomain; break; } else if (selectInactiveWhenNoActiveUnknownDomains && newMaster == null - && dbStorageDomain.getStatus() == StorageDomainStatus.InActive) { + && dbStorageDomain.getStatus() == StorageDomainStatus.Inactive) { // if the found domain is inactive, we don't break to continue and look for // active/unknown domain. newMaster = dbStorageDomain; diff --git a/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/storage/ActivateStorageDomainCommandTest.java b/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/storage/ActivateStorageDomainCommandTest.java index 40113d9..64dac45 100644 --- a/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/storage/ActivateStorageDomainCommandTest.java +++ b/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/storage/ActivateStorageDomainCommandTest.java @@ -54,12 +54,12 @@ @Test public void internalInactiveAllowed() { - internalActionAllowed(StorageDomainStatus.InActive); + internalActionAllowed(StorageDomainStatus.Inactive); } @Test public void nonInternalInactiveAllowed() { - nonInternalActionAllowed(StorageDomainStatus.InActive); + nonInternalActionAllowed(StorageDomainStatus.Inactive); } @Test diff --git a/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/storage/RemoveStoragePoolCommandTest.java b/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/storage/RemoveStoragePoolCommandTest.java index 937b8d7..8163f2b 100644 --- a/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/storage/RemoveStoragePoolCommandTest.java +++ b/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/storage/RemoveStoragePoolCommandTest.java @@ -105,14 +105,14 @@ * Test when there is in active domain. */ @Test - public void testInActiveDomainInList() { + public void testInactiveDomainInList() { StoragePoolParametersBase param = new StoragePoolParametersBase(); RemoveStoragePoolCommand<StoragePoolParametersBase> cmd = createCommand(param); List<StorageDomain> domainsList = new ArrayList<StorageDomain>(); // Add first locked storage StorageDomain tempStorageDomains = new StorageDomain(); - tempStorageDomains.setStatus(StorageDomainStatus.InActive); + tempStorageDomains.setStatus(StorageDomainStatus.Inactive); domainsList.add(tempStorageDomains); List<StorageDomain> listReturned = cmd.getActiveOrLockedDomainList(domainsList); 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 aa6ed9e..c15e8fb 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 @@ -44,29 +44,29 @@ @Test public void statusMatches() { - setStorageDomainStatus(StorageDomainStatus.InActive); - assertTrue(cmd.checkStorageDomainStatus(StorageDomainStatus.InActive)); + setStorageDomainStatus(StorageDomainStatus.Inactive); + assertTrue(cmd.checkStorageDomainStatus(StorageDomainStatus.Inactive)); assertFalse(commandHasInvalidStatusMessage()); } @Test public void statusNotMatch() { - setStorageDomainStatus(StorageDomainStatus.InActive); + setStorageDomainStatus(StorageDomainStatus.Inactive); assertFalse(cmd.checkStorageDomainStatus(StorageDomainStatus.Active)); assertTrue(commandHasInvalidStatusMessage()); } @Test public void statusInList() { - setStorageDomainStatus(StorageDomainStatus.InActive); - assertTrue(cmd.checkStorageDomainStatus(StorageDomainStatus.Locked, StorageDomainStatus.InActive, + setStorageDomainStatus(StorageDomainStatus.Inactive); + assertTrue(cmd.checkStorageDomainStatus(StorageDomainStatus.Locked, StorageDomainStatus.Inactive, StorageDomainStatus.Unknown)); assertFalse(commandHasInvalidStatusMessage()); } @Test public void statusNotInList() { - setStorageDomainStatus(StorageDomainStatus.InActive); + setStorageDomainStatus(StorageDomainStatus.Inactive); assertFalse(cmd.checkStorageDomainStatus(StorageDomainStatus.Locked, StorageDomainStatus.Active, StorageDomainStatus.Unknown)); assertTrue(commandHasInvalidStatusMessage()); @@ -74,7 +74,7 @@ @Test public void canDetachInactiveDomain() { - setStorageDomainStatus(StorageDomainStatus.InActive); + setStorageDomainStatus(StorageDomainStatus.Inactive); storagePoolExists(); masterDomainIsUp(); isNotLocalData(); @@ -84,7 +84,7 @@ @Test public void canDetachMaintenanceDomain() { - setStorageDomainStatus(StorageDomainStatus.InActive); + setStorageDomainStatus(StorageDomainStatus.Inactive); storagePoolExists(); masterDomainIsUp(); isNotLocalData(); diff --git a/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/validator/MultipleStorageDomainsValidatorTest.java b/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/validator/MultipleStorageDomainsValidatorTest.java index da7a0fe..7f44c71 100644 --- a/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/validator/MultipleStorageDomainsValidatorTest.java +++ b/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/validator/MultipleStorageDomainsValidatorTest.java @@ -75,7 +75,7 @@ @Test public void testAllDomainsExistAndActiveOneInactive() { domain1.setStatus(StorageDomainStatus.Active); - domain2.setStatus(StorageDomainStatus.InActive); + domain2.setStatus(StorageDomainStatus.Inactive); ValidationResult result = validator.allDomainsExistAndActive(); assertFalse("One domain should not be active", result.isValid()); assertEquals("Wrong validation error", diff --git a/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/validator/StorageConnectionValidatorTest.java b/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/validator/StorageConnectionValidatorTest.java index 0131f04..2e1106f 100644 --- a/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/validator/StorageConnectionValidatorTest.java +++ b/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/validator/StorageConnectionValidatorTest.java @@ -41,7 +41,7 @@ domain.setStorageType(StorageType.ISCSI); domain.setId(Guid.createGuidFromString("72e3a666-89e1-4005-a7ca-f7548004a9ab")); domain.setStatus(StorageDomainStatus.Maintenance); - domain.setStorageDomainSharedStatus(StorageDomainSharedStatus.InActive); + domain.setStorageDomainSharedStatus(StorageDomainSharedStatus.Inactive); } @Test diff --git a/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/validator/StorageDomainValidatorTest.java b/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/validator/StorageDomainValidatorTest.java index 3657f44..a0de850 100644 --- a/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/validator/StorageDomainValidatorTest.java +++ b/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/validator/StorageDomainValidatorTest.java @@ -48,7 +48,7 @@ @Test public void testIsDomainExistAndActiveDomainNotUp() { - domain.setStatus(StorageDomainStatus.InActive); + domain.setStatus(StorageDomainStatus.Inactive); assertEquals("Wrong failure for inactive domain", VdcBllMessages.ACTION_TYPE_FAILED_STORAGE_DOMAIN_STATUS_ILLEGAL2, validator.isDomainExistAndActive().getMessage()); diff --git a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/VdcActionUtils.java b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/VdcActionUtils.java index b055f58..4e750f1 100644 --- a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/VdcActionUtils.java +++ b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/VdcActionUtils.java @@ -278,7 +278,7 @@ StorageDomainStatus.Active, EnumSet.of(VdcActionType.DetachStorageDomainFromPool, VdcActionType.ActivateStorageDomain)); storageDomainMatrix.put( - StorageDomainStatus.InActive, + StorageDomainStatus.Inactive, EnumSet.of(VdcActionType.DeactivateStorageDomain)); storageDomainMatrix.put( StorageDomainStatus.Locked, diff --git a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/StorageDomainSharedStatus.java b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/StorageDomainSharedStatus.java index f11dfd2..563b18e 100644 --- a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/StorageDomainSharedStatus.java +++ b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/StorageDomainSharedStatus.java @@ -4,7 +4,7 @@ // FIXME add ids and remove the ordinal impl of getValue Unattached, Active, - InActive, + Inactive, Mixed, Locked; diff --git a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/StorageDomainStatus.java b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/StorageDomainStatus.java index 4aa43c0..a57825c 100644 --- a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/StorageDomainStatus.java +++ b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/StorageDomainStatus.java @@ -5,7 +5,7 @@ Uninitialized, Unattached, Active, - InActive, + Inactive, Locked, Maintenance, PreparingForMaintenance; diff --git a/backend/manager/modules/common/src/test/java/org/ovirt/engine/core/common/VdcActionUtilsTest.java b/backend/manager/modules/common/src/test/java/org/ovirt/engine/core/common/VdcActionUtilsTest.java index 929152d..43c4b6a 100644 --- a/backend/manager/modules/common/src/test/java/org/ovirt/engine/core/common/VdcActionUtilsTest.java +++ b/backend/manager/modules/common/src/test/java/org/ovirt/engine/core/common/VdcActionUtilsTest.java @@ -44,7 +44,7 @@ upStorageDomain.setStatus(StorageDomainStatus.Active); StorageDomain downStorageDomain = new StorageDomain(); - downStorageDomain.setStatus(StorageDomainStatus.InActive); + downStorageDomain.setStatus(StorageDomainStatus.Inactive); return Arrays.asList(new Object[][] { { upVm, VdcActionType.MigrateVm, true }, diff --git a/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/StorageServerConnectionDAO.java b/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/StorageServerConnectionDAO.java index 4f56acf..bf97a4b 100644 --- a/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/StorageServerConnectionDAO.java +++ b/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/StorageServerConnectionDAO.java @@ -48,7 +48,7 @@ StorageServerConnections getForIqn(String iqn); /** - * Retrieves all connections of Active/Unknown/InActive domains in the specified storage pool. + * Retrieves all connections of Active/Unknown/Inactive domains in the specified storage pool. * * @param pool * the storage pool @@ -57,7 +57,7 @@ List<StorageServerConnections> getAllConnectableStorageSeverConnection(Guid pool); /** - * Retrieves all connections of Active/Unknown/InActive domains of the specified storage type + * Retrieves all connections of Active/Unknown/Inactive domains of the specified storage type * in the specified storage pool. If storage type is not specified then all connections of the same * domains are returned. * diff --git a/backend/manager/modules/dal/src/test/java/org/ovirt/engine/core/dal/dbbroker/auditloghandling/AuditLogableBaseTest.java b/backend/manager/modules/dal/src/test/java/org/ovirt/engine/core/dal/dbbroker/auditloghandling/AuditLogableBaseTest.java index b3dfac5..c9e01ce 100644 --- a/backend/manager/modules/dal/src/test/java/org/ovirt/engine/core/dal/dbbroker/auditloghandling/AuditLogableBaseTest.java +++ b/backend/manager/modules/dal/src/test/java/org/ovirt/engine/core/dal/dbbroker/auditloghandling/AuditLogableBaseTest.java @@ -1121,7 +1121,7 @@ private List<StorageDomain> getStorageDomainList() { final List<StorageDomain> l = new ArrayList<StorageDomain>(); final StorageDomain s = new StorageDomain(); - s.setStatus(StorageDomainStatus.InActive); + s.setStatus(StorageDomainStatus.Inactive); l.add(s); final StorageDomain s2 = new StorageDomain(); s2.setStatus(null); diff --git a/backend/manager/modules/dal/src/test/java/org/ovirt/engine/core/dao/DbFacadeDAOTest.java b/backend/manager/modules/dal/src/test/java/org/ovirt/engine/core/dao/DbFacadeDAOTest.java index e524f3c..4df4141 100644 --- a/backend/manager/modules/dal/src/test/java/org/ovirt/engine/core/dao/DbFacadeDAOTest.java +++ b/backend/manager/modules/dal/src/test/java/org/ovirt/engine/core/dao/DbFacadeDAOTest.java @@ -186,7 +186,7 @@ masterStorageDomainGuid, storagePoolToCheck.getId())); assertNotNull(storagePoolIsoMapToCheck); - storagePoolIsoMapToCheck.setStatus(StorageDomainStatus.InActive); + storagePoolIsoMapToCheck.setStatus(StorageDomainStatus.Inactive); dbFacade.getStoragePoolIsoMapDao().update(storagePoolIsoMapToCheck); assertFalse(dbFacade.isStoragePoolMasterUp(STORAGE_POOL_WITH_MASTER_DOWN)); } diff --git a/backend/manager/modules/restapi/types/src/main/java/org/ovirt/engine/api/restapi/types/StorageDomainMapper.java b/backend/manager/modules/restapi/types/src/main/java/org/ovirt/engine/api/restapi/types/StorageDomainMapper.java index 1c3830d..a6fa94a 100644 --- a/backend/manager/modules/restapi/types/src/main/java/org/ovirt/engine/api/restapi/types/StorageDomainMapper.java +++ b/backend/manager/modules/restapi/types/src/main/java/org/ovirt/engine/api/restapi/types/StorageDomainMapper.java @@ -388,7 +388,7 @@ return StorageDomainStatus.UNATTACHED; case Active: return StorageDomainStatus.ACTIVE; - case InActive: + case Inactive: return StorageDomainStatus.INACTIVE; case Locked: return StorageDomainStatus.LOCKED; diff --git a/backend/manager/modules/restapi/types/src/test/java/org/ovirt/engine/api/restapi/types/StorageDomainMapperTest.java b/backend/manager/modules/restapi/types/src/test/java/org/ovirt/engine/api/restapi/types/StorageDomainMapperTest.java index 4e55832..88ada5a 100644 --- a/backend/manager/modules/restapi/types/src/test/java/org/ovirt/engine/api/restapi/types/StorageDomainMapperTest.java +++ b/backend/manager/modules/restapi/types/src/test/java/org/ovirt/engine/api/restapi/types/StorageDomainMapperTest.java @@ -72,7 +72,7 @@ assertEquals(StorageDomainStatus.ACTIVE, StorageDomainMapper.map(org.ovirt.engine.core.common .businessentities.StorageDomainStatus.Active, null)); assertEquals(StorageDomainStatus.INACTIVE, StorageDomainMapper.map(org.ovirt.engine.core.common - .businessentities.StorageDomainStatus.InActive, null)); + .businessentities.StorageDomainStatus.Inactive, null)); assertEquals(StorageDomainStatus.LOCKED, StorageDomainMapper.map(org.ovirt.engine.core.common .businessentities.StorageDomainStatus.Locked, null)); assertEquals(StorageDomainStatus.UNATTACHED, StorageDomainMapper.map(org.ovirt.engine.core.common diff --git a/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/irsbroker/IrsBrokerCommand.java b/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/irsbroker/IrsBrokerCommand.java index 69262b3..d32d50a 100644 --- a/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/irsbroker/IrsBrokerCommand.java +++ b/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/irsbroker/IrsBrokerCommand.java @@ -412,12 +412,12 @@ statusChanged = true; } else if (domainPoolMap.getStatus() != StorageDomainStatus.Locked && domainPoolMap.getStatus() != data.getStatus()) { - if (domainPoolMap.getStatus() != StorageDomainStatus.InActive - && data.getStatus() != StorageDomainStatus.InActive) { + if (domainPoolMap.getStatus() != StorageDomainStatus.Inactive + && data.getStatus() != StorageDomainStatus.Inactive) { DbFacade.getInstance().getStoragePoolIsoMapDao().update(data.getStoragePoolIsoMapData()); statusChanged = true; } - if (data.getStatus() != null && data.getStatus() == StorageDomainStatus.InActive + if (data.getStatus() != null && data.getStatus() == StorageDomainStatus.Inactive && domainFromDb.getStorageDomainType() == StorageDomainType.Master) { StoragePool pool = DbFacade.getInstance().getStoragePoolDao() .get(domainPoolMap.getstorage_pool_id()); @@ -432,7 +432,7 @@ // if status didn't change and still not active no need to // update dynamic data if (statusChanged - || (domainPoolMap.getStatus() != StorageDomainStatus.InActive && data.getStatus() == StorageDomainStatus.Active)) { + || (domainPoolMap.getStatus() != StorageDomainStatus.Inactive && data.getStatus() == StorageDomainStatus.Active)) { DbFacade.getInstance().getStorageDomainDynamicDao().update(data.getStorageDynamicData()); if (data.getAvailableDiskSize() != null && data.getUsedDiskSize() != null) { double freePercent = data.getStorageDynamicData().getfreeDiskPercent(); @@ -1082,7 +1082,7 @@ Set<Guid> inActiveDomainsInPool = new HashSet<Guid>(DbFacade.getInstance() .getStorageDomainStaticDao() - .getAllIds(_storagePoolId, StorageDomainStatus.InActive)); + .getAllIds(_storagePoolId, StorageDomainStatus.Inactive)); // build a list of all the domains in // pool (domainsInPool) that are not diff --git a/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/storage/StoragePoolDomainHelper.java b/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/storage/StoragePoolDomainHelper.java index bde2488..d5d9bbd 100644 --- a/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/storage/StoragePoolDomainHelper.java +++ b/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/storage/StoragePoolDomainHelper.java @@ -20,7 +20,7 @@ private static final Log log = LogFactory.getLog(StoragePoolDomainHelper.class); public static final Set<StorageDomainStatus> storageDomainMonitoredStatus = - Collections.unmodifiableSet(EnumSet.of(StorageDomainStatus.InActive, StorageDomainStatus.Active)); + Collections.unmodifiableSet(EnumSet.of(StorageDomainStatus.Inactive, StorageDomainStatus.Active)); public static Map<String, String> buildStoragePoolDomainsMap(List<StoragePoolIsoMap> storagePoolIsoMaps) { Map<String, String> storageDomains = new HashMap<String, String>(); diff --git a/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/GetStorageDomainStatsVDSCommand.java b/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/GetStorageDomainStatsVDSCommand.java index 0e5df16..93c27e6 100644 --- a/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/GetStorageDomainStatsVDSCommand.java +++ b/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/GetStorageDomainStatsVDSCommand.java @@ -43,7 +43,7 @@ StorageDomain domain = new StorageDomain(); if (xmlRpcStruct.containsKey("status")) { if ("Attached".equals(xmlRpcStruct.get("status").toString())) { - domain.setStatus(StorageDomainStatus.InActive); + domain.setStatus(StorageDomainStatus.Inactive); } else { domain.setStatus(EnumUtils.valueOf(StorageDomainStatus.class, xmlRpcStruct.get("status") .toString(), true)); diff --git a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/storage/ManageBackupModel.java b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/storage/ManageBackupModel.java index 8de723c..8837f84 100644 --- a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/storage/ManageBackupModel.java +++ b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/storage/ManageBackupModel.java @@ -113,7 +113,7 @@ { if (getEntity() != null) { - if (getEntity().getStorageDomainSharedStatus() == StorageDomainSharedStatus.InActive + if (getEntity().getStorageDomainSharedStatus() == StorageDomainSharedStatus.Inactive || getEntity().getStorageDomainSharedStatus() == StorageDomainSharedStatus.Mixed) { setMessage(ConstantsManager.getInstance().getConstants().theExportDomainIsInactiveMsg()); diff --git a/frontend/webadmin/modules/uicompat/src/main/java/org/ovirt/engine/ui/uicompat/Enums.java b/frontend/webadmin/modules/uicompat/src/main/java/org/ovirt/engine/ui/uicompat/Enums.java index 8219337..ff333a4 100644 --- a/frontend/webadmin/modules/uicompat/src/main/java/org/ovirt/engine/ui/uicompat/Enums.java +++ b/frontend/webadmin/modules/uicompat/src/main/java/org/ovirt/engine/ui/uicompat/Enums.java @@ -7,7 +7,7 @@ String StorageDomainStatus___Active(); - String StorageDomainStatus___InActive(); + String StorageDomainStatus___Inactive(); String StorageDomainStatus___Unattached(); @@ -23,7 +23,7 @@ String StorageDomainSharedStatus___Active(); - String StorageDomainSharedStatus___InActive(); + String StorageDomainSharedStatus___Inactive(); String StorageDomainSharedStatus___Unattached(); diff --git a/frontend/webadmin/modules/uicompat/src/main/resources/org/ovirt/engine/ui/uicompat/Enums.properties b/frontend/webadmin/modules/uicompat/src/main/resources/org/ovirt/engine/ui/uicompat/Enums.properties index 6020a6c..21f7d13 100644 --- a/frontend/webadmin/modules/uicompat/src/main/resources/org/ovirt/engine/ui/uicompat/Enums.properties +++ b/frontend/webadmin/modules/uicompat/src/main/resources/org/ovirt/engine/ui/uicompat/Enums.properties @@ -1,7 +1,7 @@ NetworkStatus___NON_OPERATIONAL=Non Operational NetworkStatus___OPERATIONAL=Operational StorageDomainStatus___Active=Active -StorageDomainStatus___InActive=Inactive +StorageDomainStatus___Inactive=Inactive StorageDomainStatus___Unattached=Unattached StorageDomainStatus___Uninitialized=Uninitialized StorageDomainStatus___Unknown=Unknown @@ -9,7 +9,7 @@ StorageDomainStatus___Maintenance=Maintenance StorageDomainStatus___PreparingForMaintenance=Preparing For Maintenance StorageDomainSharedStatus___Active=Active -StorageDomainSharedStatus___InActive=Inactive +StorageDomainSharedStatus___Inactive=Inactive StorageDomainSharedStatus___Unattached=Unattached StorageDomainSharedStatus___Mixed=Mixed StorageDomainSharedStatus___Locked=Locked diff --git a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/widget/table/column/StorageDomainSharedStatusColumn.java b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/widget/table/column/StorageDomainSharedStatusColumn.java index 463808e..8a700ea 100644 --- a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/widget/table/column/StorageDomainSharedStatusColumn.java +++ b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/widget/table/column/StorageDomainSharedStatusColumn.java @@ -21,7 +21,7 @@ } case Active: return getApplicationResources().upImage(); - case InActive: + case Inactive: return getApplicationResources().downImage(); case Mixed: return getApplicationResources().upalertImage(); diff --git a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/widget/table/column/StorageDomainStatusColumn.java b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/widget/table/column/StorageDomainStatusColumn.java index 186b075..e06cb1b 100644 --- a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/widget/table/column/StorageDomainStatusColumn.java +++ b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/widget/table/column/StorageDomainStatusColumn.java @@ -19,7 +19,7 @@ } case Active: return getApplicationResources().upImage(); - case InActive: + case Inactive: return getApplicationResources().downImage(); case Uninitialized: return getApplicationResources().unconfiguredImage(); -- To view, visit http://gerrit.ovirt.org/27655 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I3683e31ffa6965a6eef91a4eb52ae8bab4703fd2 Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Vered Volansky <[email protected]> _______________________________________________ Engine-patches mailing list [email protected] http://lists.ovirt.org/mailman/listinfo/engine-patches
