Shireesh Anjal has uploaded a new change for review.
Change subject: engine: Changes in VdsStaticDAO
......................................................................
engine: Changes in VdsStaticDAO
Since there is a unique constraint on host_name now, the method
getAllForHostname() doesn't make sense any more. Hence replaced
it with getByHostName() that returns a single object
Change-Id: I0075430a97f19238b93da1e199fa73a4584556d6
Signed-off-by: Shireesh Anjal <san...@redhat.com>
---
M
backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/VdsHandler.java
M
backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/gluster/GetGlusterServersForImportQuery.java
M
backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/gluster/GetGlusterServersForImportQueryTest.java
M
backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/VdsStaticDAO.java
M
backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/VdsStaticDAODbFacadeImpl.java
M
backend/manager/modules/dal/src/test/java/org/ovirt/engine/core/dao/VdsStaticDAOTest.java
M
backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/gluster/GlusterVolumesListReturnForXmlRpc.java
7 files changed, 33 insertions(+), 37 deletions(-)
git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/52/12052/1
diff --git
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/VdsHandler.java
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/VdsHandler.java
index fb44b3a..7f6fc8d 100644
---
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/VdsHandler.java
+++
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/VdsHandler.java
@@ -95,13 +95,11 @@
}
public static boolean isVdsWithSameNameExistStatic(String vdsName) {
- VdsStatic vds = DbFacade.getInstance().getVdsStaticDao().get(vdsName);
- return (vds != null);
+ return DbFacade.getInstance().getVdsStaticDao().getByVdsName(vdsName)
!= null;
}
public static boolean isVdsWithSameHostExistStatic(String hostName) {
- List<VdsStatic> vds =
DbFacade.getInstance().getVdsStaticDao().getAllForHost(hostName);
- return (vds.size() != 0);
+ return
DbFacade.getInstance().getVdsStaticDao().getByHostName(hostName) != null;
}
public static boolean isVdsWithSameIpExistsStatic(String ipAddress) {
diff --git
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/gluster/GetGlusterServersForImportQuery.java
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/gluster/GetGlusterServersForImportQuery.java
index 8e47d88..3f34340 100644
---
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/gluster/GetGlusterServersForImportQuery.java
+++
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/gluster/GetGlusterServersForImportQuery.java
@@ -53,7 +53,7 @@
@Override
protected void executeQueryCommand() {
// Check whether the given server is already part of the cluster
- if
(getVdsStaticDao().getAllForHost(getParameters().getServerName()).size() > 0
+ if (getVdsStaticDao().getByHostName(getParameters().getServerName())
!= null
||
getVdsStaticDao().getAllWithIpAddress(getParameters().getServerName()).size() >
0) {
setReturnMessage(VdcBllMessages.SERVER_ALREADY_EXISTS_IN_ANOTHER_CLUSTER.toString());
return;
@@ -96,7 +96,7 @@
*/
private boolean validateServers(Set<String> serverNames) {
for (String serverName : serverNames) {
- if (getVdsStaticDao().getAllForHost(serverName).size() > 0
+ if (getVdsStaticDao().getByHostName(serverName) != null
||
getVdsStaticDao().getAllWithIpAddress(serverName).size() > 0) {
return false;
}
diff --git
a/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/gluster/GetGlusterServersForImportQueryTest.java
b/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/gluster/GetGlusterServersForImportQueryTest.java
index de7cd6f..dfc82ad 100644
---
a/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/gluster/GetGlusterServersForImportQueryTest.java
+++
b/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/gluster/GetGlusterServersForImportQueryTest.java
@@ -57,7 +57,7 @@
private void setupMock() {
vdsStaticDaoMock = mock(VdsStaticDAO.class);
doReturn(vdsStaticDaoMock).when(getQuery()).getVdsStaticDao();
-
doReturn(getVdsStatic()).when(vdsStaticDaoMock).getAllForHost(NEW_SERVER);
+
doReturn(getVdsStatic().get(0)).when(vdsStaticDaoMock).getByHostName(NEW_SERVER);
doReturn(getVdsStatic()).when(vdsStaticDaoMock).getAllWithIpAddress(NEW_SERVER);
clientMock = mock(SSHClient.class);
diff --git
a/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/VdsStaticDAO.java
b/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/VdsStaticDAO.java
index f967f85..3869acf 100644
---
a/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/VdsStaticDAO.java
+++
b/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/VdsStaticDAO.java
@@ -18,16 +18,16 @@
* the name
* @return the instance
*/
- VdsStatic get(String name);
+ VdsStatic getByVdsName(String name);
/**
- * Retrieves all instances for the given host.
+ * Retrieves the instance for the given host name.
*
- * @param host
- * the host
- * @return the list of instances
+ * @param hostname
+ * the host name
+ * @return the instance
*/
- List<VdsStatic> getAllForHost(String host);
+ VdsStatic getByHostName(String hostname);
/**
* Finds all instances with the given ip address.
diff --git
a/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/VdsStaticDAODbFacadeImpl.java
b/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/VdsStaticDAODbFacadeImpl.java
index 25f328a..a4ab8f0 100644
---
a/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/VdsStaticDAODbFacadeImpl.java
+++
b/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/VdsStaticDAODbFacadeImpl.java
@@ -28,16 +28,16 @@
}
@Override
- public VdsStatic get(String name) {
- return (VdsStatic)
DbFacadeUtils.asSingleResult(getCallsHandler().executeReadList("GetVdsStaticByVdsName",
+ public VdsStatic getByVdsName(String name) {
+ return getCallsHandler().executeRead("GetVdsStaticByVdsName",
new VdsStaticRowMapper(),
getCustomMapSqlParameterSource()
- .addValue("vds_name", name)));
+ .addValue("vds_name", name));
}
@Override
- public List<VdsStatic> getAllForHost(String host) {
- return getCallsHandler().executeReadList("GetVdsStaticByHostName",
+ public VdsStatic getByHostName(String host) {
+ return getCallsHandler().executeRead("GetVdsStaticByHostName",
new VdsStaticRowMapper(),
getCustomMapSqlParameterSource()
.addValue("host_name", host));
diff --git
a/backend/manager/modules/dal/src/test/java/org/ovirt/engine/core/dao/VdsStaticDAOTest.java
b/backend/manager/modules/dal/src/test/java/org/ovirt/engine/core/dao/VdsStaticDAOTest.java
index 72cbda7..abd01a0 100644
---
a/backend/manager/modules/dal/src/test/java/org/ovirt/engine/core/dao/VdsStaticDAOTest.java
+++
b/backend/manager/modules/dal/src/test/java/org/ovirt/engine/core/dao/VdsStaticDAOTest.java
@@ -62,8 +62,8 @@
* Ensures null is returned when the name is invalid.
*/
@Test
- public void testGetByNameWithInvalidName() {
- VdsStatic result = dao.get("farkle");
+ public void testGetByVdsNameWithInvalidName() {
+ VdsStatic result = dao.getByVdsName("farkle");
assertNull(result);
}
@@ -72,8 +72,8 @@
* Ensures that retrieving by name works.
*/
@Test
- public void testGetByName() {
- VdsStatic result = dao.get(existingVds.getVdsName());
+ public void testGetByVdsName() {
+ VdsStatic result = dao.getByVdsName(existingVds.getVdsName());
assertNotNull(result);
assertEquals(existingVds.getVdsName(), result.getVdsName());
@@ -85,14 +85,11 @@
*/
@Test
public void testGetAllForHost() {
- List<VdsStatic> result = dao.getAllForHost(existingVds
+ VdsStatic vds = dao.getByHostName(existingVds
.getHostName());
- assertNotNull(result);
- assertFalse(result.isEmpty());
- for (VdsStatic vds : result) {
- assertEquals(existingVds.getHostName(), vds.getHostName());
- }
+ assertNotNull(vds);
+ assertEquals(existingVds.getHostName(), vds.getHostName());
}
/**
diff --git
a/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/gluster/GlusterVolumesListReturnForXmlRpc.java
b/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/gluster/GlusterVolumesListReturnForXmlRpc.java
index 5d19435..7431e7f 100644
---
a/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/gluster/GlusterVolumesListReturnForXmlRpc.java
+++
b/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/gluster/GlusterVolumesListReturnForXmlRpc.java
@@ -7,6 +7,7 @@
import java.util.Map.Entry;
import org.ovirt.engine.core.common.businessentities.VDS;
+import org.ovirt.engine.core.common.businessentities.VdsStatic;
import
org.ovirt.engine.core.common.businessentities.gluster.GlusterBrickEntity;
import org.ovirt.engine.core.common.businessentities.gluster.GlusterStatus;
import
org.ovirt.engine.core.common.businessentities.gluster.GlusterVolumeEntity;
@@ -14,7 +15,7 @@
import
org.ovirt.engine.core.common.businessentities.network.VdsNetworkInterface;
import org.ovirt.engine.core.compat.Guid;
import org.ovirt.engine.core.dal.dbbroker.DbFacade;
-import org.ovirt.engine.core.dao.VdsDAO;
+import org.ovirt.engine.core.dao.VdsStaticDAO;
import org.ovirt.engine.core.dao.network.InterfaceDao;
import org.ovirt.engine.core.utils.log.Log;
import org.ovirt.engine.core.utils.log.LogFactory;
@@ -161,7 +162,7 @@
brick.setBrickOrder(brickOrder);
brick.setBrickDirectory(brickDir);
- VDS server = getServer(clusterId, hostnameOrIp);
+ VdsStatic server = getServer(clusterId, hostnameOrIp);
if(server == null) {
log.warnFormat("Could not find server {0} in cluster {1}",
hostnameOrIp, clusterId);
} else {
@@ -171,8 +172,8 @@
return brick;
}
- private VdsDAO getVdsDao() {
- return DbFacade.getInstance().getVdsDao();
+ private VdsStaticDAO getVdsStaticDao() {
+ return DbFacade.getInstance().getVdsStaticDao();
}
private InterfaceDao getInterfaceDao() {
@@ -185,16 +186,16 @@
* @param hostnameOrIp
* @return
*/
- private VDS getServer(Guid clusterId, String hostnameOrIp) {
- List<VDS> servers = getVdsDao().getAllForHostname(hostnameOrIp);
- if(servers.size() > 0) {
- return getServerOfCluster(clusterId, servers);
+ private VdsStatic getServer(Guid clusterId, String hostnameOrIp) {
+ VdsStatic server = getVdsStaticDao().getByHostName(hostnameOrIp);
+ if(server != null) {
+ return server.getVdsGroupId().equals(clusterId) ? server : null;
}
List<VdsNetworkInterface> ifaces =
getInterfaceDao().getAllInterfacesWithIpAddress(clusterId, hostnameOrIp);
if(ifaces.size() == 1) {
for(VdsNetworkInterface iface : ifaces) {
- VDS server = getVdsDao().get(iface.getVdsId());
+ server = getVdsStaticDao().get(iface.getVdsId().getValue());
if(server.getVdsGroupId().equals(clusterId)) {
return server;
}
--
To view, visit http://gerrit.ovirt.org/12052
To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I0075430a97f19238b93da1e199fa73a4584556d6
Gerrit-PatchSet: 1
Gerrit-Project: ovirt-engine
Gerrit-Branch: master
Gerrit-Owner: Shireesh Anjal <san...@redhat.com>
_______________________________________________
Engine-patches mailing list
Engine-patches@ovirt.org
http://lists.ovirt.org/mailman/listinfo/engine-patches
