Allon Mureinik has uploaded a new change for review.
Change subject: core: StoragePoolIsoMap: rename status methods
......................................................................
core: StoragePoolIsoMap: rename status methods
Ranamed getstatus() and setstatus(StorageDomainStatus) to
getStatus() and setStatus(StorageDomainStatus) in the
StoragePoolIsoMap class, as per the proper Java convention.
Change-Id: I01e37d7c6bcf6f7e55ed6ea5d43c0eb333f46c3a
Signed-off-by: Allon Mureinik <amure...@redhat.com>
---
M
backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/IsoDomainListSyncronizer.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/AttachStorageDomainToPoolCommand.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/ReconstructMasterDomainCommand.java
M
backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/SetStoragePoolStatusCommand.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/UpdateStorageServerConnectionCommand.java
M
backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/storage/AttachStorageDomainToPoolCommandTest.java
M
backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/storage/DeactivateStorageDomainCommandTest.java
M
backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/StorageDomain.java
M
backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/StoragePoolIsoMap.java
M
backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/vdscommands/ReconstructMasterVDSCommandParameters.java
M
backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/StoragePoolIsoMapDAODbFacadeImpl.java
M
backend/manager/modules/dal/src/test/java/org/ovirt/engine/core/dao/DbFacadeDAOTest.java
M
backend/manager/modules/dal/src/test/java/org/ovirt/engine/core/dao/StoragePoolIsoMapDAOTest.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/vdsbroker/ReconstructMasterVDSCommand.java
18 files changed, 48 insertions(+), 48 deletions(-)
git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/57/18857/1
diff --git
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/IsoDomainListSyncronizer.java
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/IsoDomainListSyncronizer.java
index cdd7bb3..f516a0e 100644
---
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/IsoDomainListSyncronizer.java
+++
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/IsoDomainListSyncronizer.java
@@ -310,7 +310,7 @@
while (iter.hasNext() && !refreshSucceeded) {
StoragePoolIsoMap storagePoolIsoMap = iter.next();
Guid storagePoolId = storagePoolIsoMap.getstorage_pool_id();
- StorageDomainStatus status = storagePoolIsoMap.getstatus();
+ StorageDomainStatus status = storagePoolIsoMap.getStatus();
if (status != StorageDomainStatus.Active) {
log.debugFormat("Storage domain id {0}, is not active, and
therefore could not be refreshed for {1} file type (Iso domain status is {2}).",
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 b43dea2..8ffcc8e 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
@@ -83,8 +83,8 @@
TransactionSupport.executeInNewTransaction(new
TransactionMethod<Void>() {
@Override
public Void runInTransaction() {
- map.setstatus(StorageDomainStatus.Active);
-
DbFacade.getInstance().getStoragePoolIsoMapDao().updateStatus(map.getId(),
map.getstatus());
+ map.setStatus(StorageDomainStatus.Active);
+
DbFacade.getInstance().getStoragePoolIsoMapDao().updateStatus(map.getId(),
map.getStatus());
if (getStorageDomain().getStorageDomainType() ==
StorageDomainType.Master) {
calcStoragePoolStatusByDomainsStatus();
}
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 2bca9bd..2158e21 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
@@ -82,8 +82,8 @@
@Override
public Object runInTransaction() {
final StorageDomainType sdType =
getStorageDomain().getStorageDomainType();
- map.setstatus(StorageDomainStatus.Maintenance);
-
getStoragePoolIsoMapDAO().updateStatus(map.getId(), map.getstatus());
+ map.setStatus(StorageDomainStatus.Maintenance);
+
getStoragePoolIsoMapDAO().updateStatus(map.getId(), map.getStatus());
if (sdType == StorageDomainType.Master) {
calcStoragePoolStatusByDomainsStatus();
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 97269c4..28d6fbd 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
@@ -166,7 +166,7 @@
getStoragePoolIsoMapDAO().get
(new
StoragePoolIsoMapId(getParameters().getStorageDomainId(),
getParameters().getStoragePoolId()));
- map.setstatus(StorageDomainStatus.Unknown);
+ map.setStatus(StorageDomainStatus.Unknown);
changeStorageDomainStatusInTransaction(map,
StorageDomainStatus.Locked);
ProceedStorageDomainTreatmentByDomainType(false);
@@ -226,15 +226,15 @@
@Override
public Object runInTransaction() {
if (getParameters().isInactive()) {
- map.setstatus(StorageDomainStatus.InActive);
+ map.setStatus(StorageDomainStatus.InActive);
} else {
- map.setstatus(StorageDomainStatus.Maintenance);
+ map.setStatus(StorageDomainStatus.Maintenance);
}
- getStoragePoolIsoMapDAO().updateStatus(map.getId(),
map.getstatus());
+ getStoragePoolIsoMapDAO().updateStatus(map.getId(),
map.getStatus());
if (!Guid.Empty.equals(_newMasterStorageDomainId)) {
StoragePoolIsoMap mapOfNewMaster =
getNewMaster(false).getStoragePoolIsoMapData();
- mapOfNewMaster.setstatus(StorageDomainStatus.Active);
-
getStoragePoolIsoMapDAO().updateStatus(mapOfNewMaster.getId(),
mapOfNewMaster.getstatus());
+ mapOfNewMaster.setStatus(StorageDomainStatus.Active);
+
getStoragePoolIsoMapDAO().updateStatus(mapOfNewMaster.getId(),
mapOfNewMaster.getStatus());
}
return null;
}
@@ -280,10 +280,10 @@
newMaster.setStorageDomainType(StorageDomainType.Master);
_newMasterStorageDomainId = newMaster.getId();
if (!duringReconstruct) {
-
newMasterMap.setstatus(StorageDomainStatus.Unknown);
-
getCompensationContext().snapshotEntityStatus(newMasterMap,
newMasterMap.getstatus());
+
newMasterMap.setStatus(StorageDomainStatus.Unknown);
+
getCompensationContext().snapshotEntityStatus(newMasterMap,
newMasterMap.getStatus());
newMaster.setStatus(StorageDomainStatus.Locked);
-
getStoragePoolIsoMapDAO().updateStatus(newMasterMap.getId(),
newMasterMap.getstatus());
+
getStoragePoolIsoMapDAO().updateStatus(newMasterMap.getId(),
newMasterMap.getStatus());
}
DbFacade.getInstance()
.getStorageDomainStaticDao()
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 6093dbe..7a45feb 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
@@ -51,7 +51,7 @@
}
private boolean checkIsDomainLocked(StoragePoolIsoMap domainMap) {
- if (StorageDomainStatus.Locked == domainMap.getstatus()) {
+ if (StorageDomainStatus.Locked == domainMap.getStatus()) {
addInvalidSDStatusMessage(StorageDomainStatus.Locked);
return true;
}
diff --git
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/SetStoragePoolStatusCommand.java
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/SetStoragePoolStatusCommand.java
index 0d697c9..1399eb4 100644
---
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/SetStoragePoolStatusCommand.java
+++
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/SetStoragePoolStatusCommand.java
@@ -27,12 +27,12 @@
List<StoragePoolIsoMap> storagesStatusInPool =
DbFacade.getInstance()
.getStoragePoolIsoMapDao().getAllForStoragePool(getStoragePool().getId());
for (StoragePoolIsoMap storageStatusInPool : storagesStatusInPool)
{
- if (storageStatusInPool.getstatus() != null
- && storageStatusInPool.getstatus() ==
StorageDomainStatus.Active) {
- storageStatusInPool.setstatus(StorageDomainStatus.Unknown);
+ if (storageStatusInPool.getStatus() != null
+ && storageStatusInPool.getStatus() ==
StorageDomainStatus.Active) {
+ storageStatusInPool.setStatus(StorageDomainStatus.Unknown);
DbFacade.getInstance()
.getStoragePoolIsoMapDao()
- .updateStatus(storageStatusInPool.getId(),
storageStatusInPool.getstatus());
+ .updateStatus(storageStatusInPool.getId(),
storageStatusInPool.getStatus());
}
}
}
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 e9eccfe..6052e60 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
@@ -208,7 +208,7 @@
if (getStorageDomain() != null &&
getStorageDomain().getStoragePoolId() != null) {
StoragePoolIsoMap map =
getStorageDomain().getStoragePoolIsoMapData();
if(context != null) {
- context.snapshotEntityStatus(map, map.getstatus());
+ context.snapshotEntityStatus(map, map.getStatus());
}
getStorageDomain().setStatus(status);
getStoragePoolIsoMapDAO().updateStatus(map.getId(), status);
@@ -315,9 +315,9 @@
@Override
public StoragePoolIsoMap runInTransaction() {
CompensationContext context = getCompensationContext();
- context.snapshotEntityStatus(map, map.getstatus());
- map.setstatus(status);
- getStoragePoolIsoMapDAO().updateStatus(map.getId(),
map.getstatus());
+ context.snapshotEntityStatus(map, map.getStatus());
+ map.setStatus(status);
+ getStoragePoolIsoMapDAO().updateStatus(map.getId(),
map.getStatus());
getCompensationContext().stateChanged();
return null;
}
diff --git
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/UpdateStorageServerConnectionCommand.java
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/UpdateStorageServerConnectionCommand.java
index 569c5db..9e743d0 100644
---
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/UpdateStorageServerConnectionCommand.java
+++
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/UpdateStorageServerConnectionCommand.java
@@ -151,7 +151,7 @@
StorageDomain domain =
getStorageDomainDao().get(storageDomainId);
if
(!domain.getStorageDomainSharedStatus().equals(StorageDomainSharedStatus.Unattached))
{
for (StoragePoolIsoMap map :
getStoragePoolIsoMap(domain)) {
- if
(!map.getstatus().equals(StorageDomainStatus.Maintenance)) {
+ if
(!map.getStatus().equals(StorageDomainStatus.Maintenance)) {
String domainName = domain.getStorageName();
problematicDomainNames.add(domainName);
} else {
@@ -260,7 +260,7 @@
CompensationContext context = getCompensationContext();
for (StorageDomain domain : domains) {
for (StoragePoolIsoMap map : getStoragePoolIsoMap(domain))
{
- context.snapshotEntityStatus(map, map.getstatus());
+ context.snapshotEntityStatus(map, map.getStatus());
updateStatus(map, status);
}
}
@@ -287,8 +287,8 @@
protected void updateStatus(StoragePoolIsoMap map, StorageDomainStatus
status) {
log.infoFormat("Setting domain %s to status $s", map.getId(),
status.name());
- map.setstatus(status);
- getStoragePoolIsoMapDao().updateStatus(map.getId(), map.getstatus());
+ map.setStatus(status);
+ getStoragePoolIsoMapDao().updateStatus(map.getId(), map.getStatus());
}
protected void executeInNewTransaction(TransactionMethod<?> method) {
diff --git
a/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/storage/AttachStorageDomainToPoolCommandTest.java
b/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/storage/AttachStorageDomainToPoolCommandTest.java
index bb706bd..b93a4d8 100644
---
a/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/storage/AttachStorageDomainToPoolCommandTest.java
+++
b/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/storage/AttachStorageDomainToPoolCommandTest.java
@@ -118,6 +118,6 @@
cmd.setCompensationContext(mock(CompensationContext.class));
cmd.executeCommand();
assertNotNull(map);
- assertEquals(StorageDomainStatus.Maintenance, map.getstatus());
+ assertEquals(StorageDomainStatus.Maintenance, map.getStatus());
}
}
diff --git
a/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/storage/DeactivateStorageDomainCommandTest.java
b/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/storage/DeactivateStorageDomainCommandTest.java
index 49883ad..2160dca 100644
---
a/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/storage/DeactivateStorageDomainCommandTest.java
+++
b/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/storage/DeactivateStorageDomainCommandTest.java
@@ -89,10 +89,10 @@
when(vdsBrokerFrontend.RunVdsCommand(any(VDSCommandType.class),
any(VDSParametersBase.class)))
.thenReturn(returnValue);
when(vdsDAO.get(any(Guid.class))).thenReturn(vds);
- map.setstatus(StorageDomainStatus.Active);
+ map.setStatus(StorageDomainStatus.Active);
cmd.setCompensationContext(mock(CompensationContext.class));
cmd.executeCommand();
- assertTrue(map.getstatus() == StorageDomainStatus.Maintenance);
+ assertTrue(map.getStatus() == StorageDomainStatus.Maintenance);
}
}
diff --git
a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/StorageDomain.java
b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/StorageDomain.java
index f2e99c7..7b91719 100644
---
a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/StorageDomain.java
+++
b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/StorageDomain.java
@@ -198,12 +198,12 @@
@Override
public StorageDomainStatus getStatus() {
- return getStoragePoolIsoMapData().getstatus();
+ return getStoragePoolIsoMapData().getStatus();
}
@Override
public void setStatus(StorageDomainStatus status) {
- getStoragePoolIsoMapData().setstatus(status);
+ getStoragePoolIsoMapData().setStatus(status);
}
private String storagePoolName;
diff --git
a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/StoragePoolIsoMap.java
b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/StoragePoolIsoMap.java
index a0f1bdb..1fb204a 100644
---
a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/StoragePoolIsoMap.java
+++
b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/StoragePoolIsoMap.java
@@ -15,7 +15,7 @@
this();
setstorage_id(storage_id);
setstorage_pool_id(storage_pool_id);
- this.setstatus(status);
+ this.setStatus(status);
}
private StoragePoolIsoMapId id;
@@ -48,14 +48,14 @@
private Integer persistentStorageDomainStatus;
- public StorageDomainStatus getstatus() {
+ public StorageDomainStatus getStatus() {
if (persistentStorageDomainStatus == null) {
return null;
}
return StorageDomainStatus.forValue(persistentStorageDomainStatus);
}
- public void setstatus(StorageDomainStatus value) {
+ public void setStatus(StorageDomainStatus value) {
if (value == null) {
persistentStorageDomainStatus = null;
} else {
diff --git
a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/vdscommands/ReconstructMasterVDSCommandParameters.java
b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/vdscommands/ReconstructMasterVDSCommandParameters.java
index 84d31c3..fb42892 100644
---
a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/vdscommands/ReconstructMasterVDSCommandParameters.java
+++
b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/vdscommands/ReconstructMasterVDSCommandParameters.java
@@ -103,7 +103,7 @@
sb.append("{ domainId: ");
sb.append(map.getstorage_id());
sb.append(", status: ");
- sb.append(map.getstatus().name());
+ sb.append(map.getStatus().name());
sb.append(" };");
}
return sb.toString();
diff --git
a/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/StoragePoolIsoMapDAODbFacadeImpl.java
b/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/StoragePoolIsoMapDAODbFacadeImpl.java
index 233f1fb..e5ff8af 100644
---
a/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/StoragePoolIsoMapDAODbFacadeImpl.java
+++
b/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/StoragePoolIsoMapDAODbFacadeImpl.java
@@ -21,7 +21,7 @@
StoragePoolIsoMap entity = new StoragePoolIsoMap();
entity.setstorage_id(getGuidDefaultEmpty(rs, "storage_id"));
entity.setstorage_pool_id(getGuid(rs, "storage_pool_id"));
-
entity.setstatus(StorageDomainStatus.forValue(rs.getInt("status")));
+
entity.setStatus(StorageDomainStatus.forValue(rs.getInt("status")));
return entity;
}
}
@@ -40,13 +40,13 @@
public void save(StoragePoolIsoMap map) {
MapSqlParameterSource parameterSource =
getCustomMapSqlParameterSource().addValue("storage_id",
map.getstorage_id()).addValue("storage_pool_id",
map.getstorage_pool_id()).addValue("status",
- map.getstatus());
+ map.getStatus());
getCallsHandler().executeModification("Insertstorage_pool_iso_map",
parameterSource);
}
@Override
public void update(StoragePoolIsoMap map) {
- updateStatus(map.getId(), map.getstatus());
+ updateStatus(map.getId(), map.getStatus());
}
@Override
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 5fe5743..9a76558 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
@@ -191,7 +191,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/dal/src/test/java/org/ovirt/engine/core/dao/StoragePoolIsoMapDAOTest.java
b/backend/manager/modules/dal/src/test/java/org/ovirt/engine/core/dao/StoragePoolIsoMapDAOTest.java
index a290ef9..13bc067 100644
---
a/backend/manager/modules/dal/src/test/java/org/ovirt/engine/core/dao/StoragePoolIsoMapDAOTest.java
+++
b/backend/manager/modules/dal/src/test/java/org/ovirt/engine/core/dao/StoragePoolIsoMapDAOTest.java
@@ -61,7 +61,7 @@
@Test
public void testUpdateStoragePoolIsoMap() {
- existingStoragePoolIsoMap.setstatus(StorageDomainStatus.Active);
+ existingStoragePoolIsoMap.setStatus(StorageDomainStatus.Active);
dao.update(existingStoragePoolIsoMap);
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 64935d0..708f9d0 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
@@ -318,7 +318,7 @@
domainPoolMap = storage_domain.getStoragePoolIsoMapData();
// If the domain is master in the DB
if (domainFromDb.getStorageDomainType() ==
StorageDomainType.Master && domainPoolMap != null
- && domainPoolMap.getstatus() !=
StorageDomainStatus.Locked) {
+ && domainPoolMap.getStatus() !=
StorageDomainStatus.Locked) {
// and the domain is not master in the VDSM
if (!((data.getStorageDomainType() ==
StorageDomainType.Master) || (data.getStorageDomainType() ==
StorageDomainType.Unknown))) {
reconstructMasterDomainNotInSync(data.getStoragePoolId(),
@@ -345,9 +345,9 @@
data.setStoragePoolId(_storagePoolId);
DbFacade.getInstance().getStoragePoolIsoMapDao().save(data.getStoragePoolIsoMapData());
statusChanged = true;
- } else if (domainPoolMap.getstatus() !=
StorageDomainStatus.Locked
- && domainPoolMap.getstatus() != data.getStatus()) {
- if (domainPoolMap.getstatus() !=
StorageDomainStatus.InActive
+ } else if (domainPoolMap.getStatus() !=
StorageDomainStatus.Locked
+ && domainPoolMap.getStatus() != data.getStatus()) {
+ if (domainPoolMap.getStatus() !=
StorageDomainStatus.InActive
&& data.getStatus() !=
StorageDomainStatus.InActive) {
DbFacade.getInstance().getStoragePoolIsoMapDao().update(data.getStoragePoolIsoMapData());
statusChanged = true;
@@ -367,7 +367,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();
@@ -1060,7 +1060,7 @@
DbFacade.getInstance()
.getStoragePoolIsoMapDao()
.get(new
StoragePoolIsoMapId(tempData.getDomainId(), _storagePoolId));
- map.setstatus(StorageDomainStatus.Active);
+ map.setStatus(StorageDomainStatus.Active);
DbFacade.getInstance().getStoragePoolIsoMapDao().update(map);
}
}
diff --git
a/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/ReconstructMasterVDSCommand.java
b/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/ReconstructMasterVDSCommand.java
index 66c5501..3f8b3b2 100644
---
a/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/ReconstructMasterVDSCommand.java
+++
b/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/ReconstructMasterVDSCommand.java
@@ -19,7 +19,7 @@
final Map<String, String> domains = new HashMap<String, String>();
for (StoragePoolIsoMap domain : getParameters().getDomainsList()) {
- if (domain.getstatus() == StorageDomainStatus.Maintenance) {
+ if (domain.getStatus() == StorageDomainStatus.Maintenance) {
domains.put(domain.getstorage_id().toString(), "attached");
} else {
domains.put(domain.getstorage_id().toString(),
StorageDomainStatus.Active.toString().toLowerCase());
--
To view, visit http://gerrit.ovirt.org/18857
To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I01e37d7c6bcf6f7e55ed6ea5d43c0eb333f46c3a
Gerrit-PatchSet: 1
Gerrit-Project: ovirt-engine
Gerrit-Branch: master
Gerrit-Owner: Allon Mureinik <amure...@redhat.com>
_______________________________________________
Engine-patches mailing list
Engine-patches@ovirt.org
http://lists.ovirt.org/mailman/listinfo/engine-patches
