Liron Aravot has uploaded a new change for review.
Change subject: core: renaming connectAllHostsToPool
......................................................................
core: renaming connectAllHostsToPool
connectAllHostsToPool actually connects the hosts to the related domain
storage server, therefore in this patch its name was changed to
connectHostsInUpToDomainStorageServer.
Change-Id: I15b3cfc6f4a08350b16f252df2587bd2c7737ebe
Signed-off-by: Liron Aravot <lara...@redhat.com>
---
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/ConnectDomainToStorageCommand.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/StorageDomainCommandBase.java
M
backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/storage/AttachStorageDomainToPoolCommandTest.java
6 files changed, 7 insertions(+), 8 deletions(-)
git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/61/29661/1
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 150f633..4a206f0 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
@@ -95,7 +95,7 @@
freeLock();
log.infoFormat("ActivateStorage Domain. Before Connect all hosts to
pool. Time:{0}", new Date());
- connectAllHostsToPool();
+ connectHostsInUpToDomainStorageServer();
runVdsCommand(VDSCommandType.ActivateStorageDomain,
new
ActivateStorageDomainVDSCommandParameters(getStoragePool().getId(),
getStorageDomain().getId()));
log.infoFormat("ActivateStorage Domain. 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/AttachStorageDomainToPoolCommand.java
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/AttachStorageDomainToPoolCommand.java
index 341b798..b66d98a 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
@@ -104,7 +104,7 @@
return null;
}
});
- connectAllHostsToPool();
+ connectHostsInUpToDomainStorageServer();
// Forcibly detach only data storage domains.
if (getStorageDomain().getStorageDomainType() ==
StorageDomainType.Data) {
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 fd49871..28a68cb 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
@@ -23,7 +23,7 @@
@Override
protected void executeCommand() {
log.infoFormat("ConnectDomainToStorage. Before Connect all hosts to
pool. Time:{0}", new Date());
- connectAllHostsToPool();
+ connectHostsInUpToDomainStorageServer();
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/DetachStorageDomainFromPoolCommand.java
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/DetachStorageDomainFromPoolCommand.java
index ec338ef..440e5d8 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
@@ -47,7 +47,7 @@
changeStorageDomainStatusInTransaction(getStorageDomain().getStoragePoolIsoMapData(),
StorageDomainStatus.Detaching);
log.info(" Detach storage domain: before connect");
- connectAllHostsToPool();
+ connectHostsInUpToDomainStorageServer();
log.info(" Detach storage domain: after connect");
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 8e77b79..dd0b155 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
@@ -329,7 +329,7 @@
}
}
- protected List<Pair<Guid, Boolean>> connectAllHostsToPool() {
+ protected List<Pair<Guid, Boolean>>
connectHostsInUpToDomainStorageServer() {
List<VDS> hostsInStatusUp = getAllRunningVdssInPool();
List<Callable<Pair<Guid, Boolean>>> callables = new LinkedList<>();
for (final VDS vds : hostsInStatusUp) {
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 84b4d4e..e36ee52 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
@@ -12,6 +12,7 @@
import static org.mockito.Mockito.when;
import java.util.ArrayList;
+import java.util.Collections;
import java.util.List;
import org.junit.ClassRule;
@@ -38,7 +39,6 @@
import org.ovirt.engine.core.common.businessentities.StoragePoolIsoMapId;
import org.ovirt.engine.core.common.businessentities.StoragePoolStatus;
import org.ovirt.engine.core.common.businessentities.VDS;
-import org.ovirt.engine.core.common.businessentities.VDSStatus;
import org.ovirt.engine.core.common.interfaces.VDSBrokerFrontend;
import org.ovirt.engine.core.common.utils.Pair;
import
org.ovirt.engine.core.common.vdscommands.AttachStorageDomainVDSCommandParameters;
@@ -88,7 +88,7 @@
doReturn(dbFacade).when(cmd).getDbFacade();
doNothing().when(cmd).attemptToActivateDomain();
-
+
doReturn(Collections.emptyList()).when(cmd).connectHostsInUpToDomainStorageServer();
when(dbFacade.getStoragePoolIsoMapDao()).thenReturn(isoMapDAO);
when(dbFacade.getStoragePoolDao()).thenReturn(storagePoolDAO);
when(dbFacade.getVdsDao()).thenReturn(vdsDAO);
@@ -102,7 +102,6 @@
when(storageDomainStaticDAO.get(any(Guid.class))).thenReturn(new
StorageDomainStatic());
doReturn(backendInternal).when(cmd).getBackend();
- when(vdsDAO.getAllForStoragePoolAndStatus(any(Guid.class),
any(VDSStatus.class))).thenReturn(new ArrayList<VDS>());
when(backendInternal.getResourceManager()).thenReturn(vdsBrokerFrontend);
VdcReturnValueBase vdcReturnValue = new VdcReturnValueBase();
vdcReturnValue.setSucceeded(true);
--
To view, visit http://gerrit.ovirt.org/29661
To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I15b3cfc6f4a08350b16f252df2587bd2c7737ebe
Gerrit-PatchSet: 1
Gerrit-Project: ovirt-engine
Gerrit-Branch: master
Gerrit-Owner: Liron Aravot <lara...@redhat.com>
_______________________________________________
Engine-patches mailing list
Engine-patches@ovirt.org
http://lists.ovirt.org/mailman/listinfo/engine-patches
