Sharad Mishra has uploaded a new change for review.
Change subject: core Renamed vm_pool_map.java to VmPoolMap.java
......................................................................
core Renamed vm_pool_map.java to VmPoolMap.java
Change-Id: I91de93b53e961c1a4003cfe36704ea0b79961f2d
Signed-off-by: Sharad Mishra <snmis...@linux.vnet.ibm.com>
---
M
backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/AddVmToPoolCommand.java
M
backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/RemoveVmFromPoolCommand.java
M
backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/VmPoolCommandBase.java
M
backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/VmPoolHandler.java
M
backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/VmPoolMonitor.java
R
backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/VmPoolMap.java
M
backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/VmPoolDAO.java
M
backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/VmPoolDAODbFacadeImpl.java
M
backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/VmPoolDAOHibernateImpl.java
M
backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/vmpools/VmPoolMapDAOHibernateImpl.java
M
backend/manager/modules/dal/src/test/java/org/ovirt/engine/core/dao/BaseDAOTestCase.java
M
backend/manager/modules/dal/src/test/java/org/ovirt/engine/core/dao/VmPoolDAOTest.java
M
frontend/webadmin/modules/gwt-common/src/main/resources/org/ovirt/engine/core/Common.gwt.xml
13 files changed, 61 insertions(+), 61 deletions(-)
git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/85/10085/1
diff --git
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/AddVmToPoolCommand.java
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/AddVmToPoolCommand.java
index 1235490..9dfb404 100644
---
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/AddVmToPoolCommand.java
+++
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/AddVmToPoolCommand.java
@@ -3,7 +3,7 @@
import org.ovirt.engine.core.common.AuditLogType;
import org.ovirt.engine.core.common.action.AddVmToPoolParameters;
import org.ovirt.engine.core.common.businessentities.VM;
-import org.ovirt.engine.core.common.businessentities.vm_pool_map;
+import org.ovirt.engine.core.common.businessentities.VmPoolMap;
import org.ovirt.engine.core.common.businessentities.vm_pools;
import org.ovirt.engine.core.compat.Guid;
import org.ovirt.engine.core.compat.NGuid;
@@ -67,7 +67,7 @@
@Override
protected void executeCommand() {
- DbFacade.getInstance().getVmPoolDao().addVmToPool(new
vm_pool_map(getVmId(), getVmPoolId()));
+ DbFacade.getInstance().getVmPoolDao().addVmToPool(new
VmPoolMap(getVmId(), getVmPoolId()));
setSucceeded(true);
}
diff --git
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/RemoveVmFromPoolCommand.java
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/RemoveVmFromPoolCommand.java
index b246411..752feca 100644
---
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/RemoveVmFromPoolCommand.java
+++
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/RemoveVmFromPoolCommand.java
@@ -2,7 +2,7 @@
import org.ovirt.engine.core.common.AuditLogType;
import org.ovirt.engine.core.common.action.RemoveVmFromPoolParameters;
-import org.ovirt.engine.core.common.businessentities.vm_pool_map;
+import org.ovirt.engine.core.common.businessentities.VmPoolMap;
import org.ovirt.engine.core.compat.Guid;
import org.ovirt.engine.core.dal.VdcBllMessages;
import org.ovirt.engine.core.dal.dbbroker.DbFacade;
@@ -11,7 +11,7 @@
public RemoveVmFromPoolCommand(T parameters) {
super(parameters);
super.setVmId(parameters.getVmId());
- vm_pool_map map =
DbFacade.getInstance().getVmPoolDao().getVmPoolMapByVmGuid(parameters.getVmId());
+ VmPoolMap map =
DbFacade.getInstance().getVmPoolDao().getVmPoolMapByVmGuid(parameters.getVmId());
if (map != null) {
setVmPoolId(map.getvm_pool_id());
}
diff --git
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/VmPoolCommandBase.java
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/VmPoolCommandBase.java
index 755c0ae..432b2e7 100644
---
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/VmPoolCommandBase.java
+++
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/VmPoolCommandBase.java
@@ -16,7 +16,7 @@
import org.ovirt.engine.core.common.businessentities.VmDynamic;
import org.ovirt.engine.core.common.businessentities.VmType;
import org.ovirt.engine.core.common.businessentities.tags;
-import org.ovirt.engine.core.common.businessentities.vm_pool_map;
+import org.ovirt.engine.core.common.businessentities.VmPoolMap;
import org.ovirt.engine.core.common.businessentities.vm_pools;
import org.ovirt.engine.core.compat.Guid;
import org.ovirt.engine.core.compat.NGuid;
@@ -82,10 +82,10 @@
}
protected static Guid getNonPrestartedVmToAttach(NGuid vmPoolId) {
- List<vm_pool_map> vmPoolMaps = DbFacade.getInstance().getVmPoolDao()
+ List<VmPoolMap> vmPoolMaps = DbFacade.getInstance().getVmPoolDao()
.getVmMapsInVmPoolByVmPoolIdAndStatus(vmPoolId, VMStatus.Down);
if (vmPoolMaps != null) {
- for (vm_pool_map map : vmPoolMaps) {
+ for (VmPoolMap map : vmPoolMaps) {
if (canAttachNonPrestartedVmToUser(map.getvm_guid())) {
return map.getvm_guid();
}
@@ -95,10 +95,10 @@
}
protected static Guid getPrestartedVmToAttach(NGuid vmPoolId) {
- List<vm_pool_map> vmPoolMaps = DbFacade.getInstance().getVmPoolDao()
+ List<VmPoolMap> vmPoolMaps = DbFacade.getInstance().getVmPoolDao()
.getVmMapsInVmPoolByVmPoolIdAndStatus(vmPoolId, VMStatus.Up);
if (vmPoolMaps != null) {
- for (vm_pool_map map : vmPoolMaps) {
+ for (VmPoolMap map : vmPoolMaps) {
if (canAttachPrestartedVmToUser(map.getvm_guid())) {
return map.getvm_guid();
}
@@ -108,11 +108,11 @@
}
protected static int getNumOfPrestartedVmsInPool(NGuid poolId) {
- List<vm_pool_map> vmPoolMaps = DbFacade.getInstance().getVmPoolDao()
+ List<VmPoolMap> vmPoolMaps = DbFacade.getInstance().getVmPoolDao()
.getVmMapsInVmPoolByVmPoolIdAndStatus(poolId, VMStatus.Up);
int prestartedVmsInPool = 0;
if (vmPoolMaps != null) {
- for (vm_pool_map map : vmPoolMaps) {
+ for (VmPoolMap map : vmPoolMaps) {
if (canAttachPrestartedVmToUser(map.getvm_guid())) {
prestartedVmsInPool++;
}
@@ -121,7 +121,7 @@
return prestartedVmsInPool;
}
- protected static List<vm_pool_map> getListOfVmsInPool(NGuid poolId) {
+ protected static List<VmPoolMap> getListOfVmsInPool(NGuid poolId) {
return
DbFacade.getInstance().getVmPoolDao().getVmPoolsMapByVmPoolId(poolId);
}
diff --git
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/VmPoolHandler.java
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/VmPoolHandler.java
index a81410c..66b377e 100644
---
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/VmPoolHandler.java
+++
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/VmPoolHandler.java
@@ -10,7 +10,7 @@
import org.ovirt.engine.core.common.businessentities.DbUser;
import org.ovirt.engine.core.common.businessentities.Snapshot.SnapshotType;
import org.ovirt.engine.core.common.businessentities.VmPoolType;
-import org.ovirt.engine.core.common.businessentities.vm_pool_map;
+import org.ovirt.engine.core.common.businessentities.VmPoolMap;
import org.ovirt.engine.core.common.businessentities.vm_pools;
import org.ovirt.engine.core.compat.Guid;
import org.ovirt.engine.core.dal.dbbroker.DbFacade;
@@ -30,7 +30,7 @@
* solution supplied
*/
public static void ProcessVmPoolOnStopVm(Guid vmId, CommandContext
context) {
- vm_pool_map map =
DbFacade.getInstance().getVmPoolDao().getVmPoolMapByVmGuid(vmId);
+ VmPoolMap map =
DbFacade.getInstance().getVmPoolDao().getVmPoolMapByVmGuid(vmId);
List<DbUser> users =
DbFacade.getInstance().getDbUserDao().getAllForVm(vmId);
// Check if this is a Vm from a Vm pool, and is attached to a user
if (map != null && users != null && !users.isEmpty()) {
diff --git
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/VmPoolMonitor.java
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/VmPoolMonitor.java
index 5f5f65c..f4c5d2f 100644
---
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/VmPoolMonitor.java
+++
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/VmPoolMonitor.java
@@ -9,7 +9,7 @@
import org.ovirt.engine.core.common.businessentities.VM;
import org.ovirt.engine.core.common.businessentities.VMStatus;
import org.ovirt.engine.core.common.businessentities.VmType;
-import org.ovirt.engine.core.common.businessentities.vm_pool_map;
+import org.ovirt.engine.core.common.businessentities.VmPoolMap;
import org.ovirt.engine.core.common.businessentities.vm_pools;
import org.ovirt.engine.core.common.config.Config;
import org.ovirt.engine.core.common.config.ConfigValues;
@@ -68,13 +68,13 @@
*/
private void prestartVms(Guid vmPoolId, int numOfVmsToPrestart) {
// Fetch all vms that are in status down
- List<vm_pool_map> vmPoolMaps = DbFacade.getInstance().getVmPoolDao()
+ List<VmPoolMap> vmPoolMaps = DbFacade.getInstance().getVmPoolDao()
.getVmMapsInVmPoolByVmPoolIdAndStatus(vmPoolId, VMStatus.Down);
int failedAttempts = 0;
int prestartedVmsCounter = 0;
final int maxFailedAttempts = Config.<Integer>
GetValue(ConfigValues.VmPoolMonitorMaxAttempts);
if (vmPoolMaps != null && vmPoolMaps.size() > 0) {
- for (vm_pool_map map : vmPoolMaps) {
+ for (VmPoolMap map : vmPoolMaps) {
if (failedAttempts < maxFailedAttempts && prestartedVmsCounter
< numOfVmsToPrestart) {
if (prestartVm(map.getvm_guid())) {
prestartedVmsCounter++;
diff --git
a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/vm_pool_map.java
b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/VmPoolMap.java
similarity index 91%
rename from
backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/vm_pool_map.java
rename to
backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/VmPoolMap.java
index c1363bf..1a3f00f 100644
---
a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/vm_pool_map.java
+++
b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/VmPoolMap.java
@@ -17,13 +17,13 @@
@Entity
@Table(name = "vm_pool_map")
@TypeDef(name = "guid", typeClass = GuidType.class)
-public class vm_pool_map implements Serializable {
+public class VmPoolMap implements Serializable {
private static final long serialVersionUID = 5876397644156138863L;
- public vm_pool_map() {
+ public VmPoolMap() {
}
- public vm_pool_map(Guid vm_guid, NGuid vm_pool_id) {
+ public VmPoolMap(Guid vm_guid, NGuid vm_pool_id) {
this.vmId = vm_guid;
this.vmPoolId = vm_pool_id;
}
@@ -70,7 +70,7 @@
return false;
if (getClass() != obj.getClass())
return false;
- vm_pool_map other = (vm_pool_map) obj;
+ VmPoolMap other = (VmPoolMap) obj;
if (vmId == null) {
if (other.vmId != null)
return false;
diff --git
a/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/VmPoolDAO.java
b/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/VmPoolDAO.java
index b7c5921..07414ef 100644
---
a/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/VmPoolDAO.java
+++
b/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/VmPoolDAO.java
@@ -4,7 +4,7 @@
import org.ovirt.engine.core.common.businessentities.VM;
import org.ovirt.engine.core.common.businessentities.VMStatus;
-import org.ovirt.engine.core.common.businessentities.vm_pool_map;
+import org.ovirt.engine.core.common.businessentities.VmPoolMap;
import org.ovirt.engine.core.common.businessentities.vm_pools;
import org.ovirt.engine.core.compat.Guid;
import org.ovirt.engine.core.compat.NGuid;
@@ -95,18 +95,18 @@
// TODO APIS to be moved to hibernate relationships
- vm_pool_map getVmPoolMapByVmGuid(Guid vmId);
+ VmPoolMap getVmPoolMapByVmGuid(Guid vmId);
- void addVmToPool(vm_pool_map map);
+ void addVmToPool(VmPoolMap map);
- List<vm_pool_map> getVmPoolsMapByVmPoolId(NGuid vmPoolId);
+ List<VmPoolMap> getVmPoolsMapByVmPoolId(NGuid vmPoolId);
/**
* Gets the maps of the given pool, for the Vms that are in the given
status
* @param vmPoolId
* @return
*/
- List<vm_pool_map> getVmMapsInVmPoolByVmPoolIdAndStatus(NGuid vmPoolId,
VMStatus vmStatus);
+ List<VmPoolMap> getVmMapsInVmPoolByVmPoolIdAndStatus(NGuid vmPoolId,
VMStatus vmStatus);
/**
* Returns a single VM from the vm pool with the specified id, with
optional filtering.
diff --git
a/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/VmPoolDAODbFacadeImpl.java
b/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/VmPoolDAODbFacadeImpl.java
index fd59238..d9d3442 100644
---
a/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/VmPoolDAODbFacadeImpl.java
+++
b/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/VmPoolDAODbFacadeImpl.java
@@ -7,7 +7,7 @@
import org.ovirt.engine.core.common.businessentities.VM;
import org.ovirt.engine.core.common.businessentities.VMStatus;
import org.ovirt.engine.core.common.businessentities.VmPoolType;
-import org.ovirt.engine.core.common.businessentities.vm_pool_map;
+import org.ovirt.engine.core.common.businessentities.VmPoolMap;
import org.ovirt.engine.core.common.businessentities.vm_pools;
import org.ovirt.engine.core.compat.Guid;
import org.ovirt.engine.core.compat.NGuid;
@@ -112,13 +112,13 @@
}
@Override
- public vm_pool_map getVmPoolMapByVmGuid(Guid vmId) {
+ public VmPoolMap getVmPoolMapByVmGuid(Guid vmId) {
MapSqlParameterSource parameterSource =
getCustomMapSqlParameterSource().addValue("vm_guid", vmId);
- ParameterizedRowMapper<vm_pool_map> mapper = new
ParameterizedRowMapper<vm_pool_map>() {
+ ParameterizedRowMapper<VmPoolMap> mapper = new
ParameterizedRowMapper<VmPoolMap>() {
@Override
- public vm_pool_map mapRow(ResultSet rs, int rowNum) throws
SQLException {
- vm_pool_map entity = new vm_pool_map();
+ public VmPoolMap mapRow(ResultSet rs, int rowNum) throws
SQLException {
+ VmPoolMap entity = new VmPoolMap();
entity.setvm_guid(Guid.createGuidFromString(rs.getString("vm_guid")));
entity.setvm_pool_id(Guid.createGuidFromString(rs.getString("vm_pool_id")));
return entity;
@@ -129,7 +129,7 @@
}
@Override
- public void addVmToPool(vm_pool_map map) {
+ public void addVmToPool(VmPoolMap map) {
MapSqlParameterSource parameterSource =
getCustomMapSqlParameterSource().addValue("vm_guid", map.getvm_guid())
.addValue("vm_pool_id", map.getvm_pool_id());
@@ -137,13 +137,13 @@
}
@Override
- public List<vm_pool_map> getVmPoolsMapByVmPoolId(NGuid vmPoolId) {
+ public List<VmPoolMap> getVmPoolsMapByVmPoolId(NGuid vmPoolId) {
MapSqlParameterSource parameterSource =
getCustomMapSqlParameterSource().addValue("vm_pool_id", vmPoolId);
- ParameterizedRowMapper<vm_pool_map> mapper = new
ParameterizedRowMapper<vm_pool_map>() {
+ ParameterizedRowMapper<VmPoolMap> mapper = new
ParameterizedRowMapper<VmPoolMap>() {
@Override
- public vm_pool_map mapRow(ResultSet rs, int rowNum) throws
SQLException {
- vm_pool_map entity = new vm_pool_map();
+ public VmPoolMap mapRow(ResultSet rs, int rowNum) throws
SQLException {
+ VmPoolMap entity = new VmPoolMap();
entity.setvm_guid(Guid.createGuidFromString(rs.getString("vm_guid")));
entity.setvm_pool_id(Guid.createGuidFromString(rs.getString("vm_pool_id")));
return entity;
@@ -154,15 +154,15 @@
}
@Override
- public List<vm_pool_map> getVmMapsInVmPoolByVmPoolIdAndStatus(NGuid
vmPoolId, VMStatus vmStatus) {
+ public List<VmPoolMap> getVmMapsInVmPoolByVmPoolIdAndStatus(NGuid
vmPoolId, VMStatus vmStatus) {
MapSqlParameterSource parameterSource =
getCustomMapSqlParameterSource().addValue("vm_pool_id",
vmPoolId).addValue("status",
vmStatus.getValue());
- ParameterizedRowMapper<vm_pool_map> mapper = new
ParameterizedRowMapper<vm_pool_map>() {
+ ParameterizedRowMapper<VmPoolMap> mapper = new
ParameterizedRowMapper<VmPoolMap>() {
@Override
- public vm_pool_map mapRow(ResultSet rs, int rowNum) throws
SQLException {
- vm_pool_map entity = new vm_pool_map();
+ public VmPoolMap mapRow(ResultSet rs, int rowNum) throws
SQLException {
+ VmPoolMap entity = new VmPoolMap();
entity.setvm_guid(Guid.createGuidFromString(rs.getString("vm_guid")));
entity.setvm_pool_id(Guid.createGuidFromString(rs.getString("vm_pool_id")));
return entity;
diff --git
a/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/VmPoolDAOHibernateImpl.java
b/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/VmPoolDAOHibernateImpl.java
index 0e9525f..2c2f2d6 100644
---
a/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/VmPoolDAOHibernateImpl.java
+++
b/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/VmPoolDAOHibernateImpl.java
@@ -13,7 +13,7 @@
import org.ovirt.engine.core.common.businessentities.VM;
import org.ovirt.engine.core.common.businessentities.VMStatus;
import org.ovirt.engine.core.common.businessentities.ad_groups;
-import org.ovirt.engine.core.common.businessentities.vm_pool_map;
+import org.ovirt.engine.core.common.businessentities.VmPoolMap;
import org.ovirt.engine.core.common.businessentities.vm_pools;
import org.ovirt.engine.core.compat.Guid;
import org.ovirt.engine.core.compat.NGuid;
@@ -109,22 +109,22 @@
}
@Override
- public vm_pool_map getVmPoolMapByVmGuid(Guid vmId) {
+ public VmPoolMap getVmPoolMapByVmGuid(Guid vmId) {
return vmPoolMapDAO.getByVmGuid(vmId);
}
@Override
- public void addVmToPool(vm_pool_map map) {
+ public void addVmToPool(VmPoolMap map) {
vmPoolMapDAO.save(map);
}
@Override
- public List<vm_pool_map> getVmPoolsMapByVmPoolId(NGuid vmPoolId) {
+ public List<VmPoolMap> getVmPoolsMapByVmPoolId(NGuid vmPoolId) {
return vmPoolMapDAO.getVmPoolsMapByVmPoolId(vmPoolId);
}
@Override
- public List<vm_pool_map> getVmMapsInVmPoolByVmPoolIdAndStatus(NGuid
vmPoolId, VMStatus vmStatus) {
+ public List<VmPoolMap> getVmMapsInVmPoolByVmPoolIdAndStatus(NGuid
vmPoolId, VMStatus vmStatus) {
// TODO Auto-generated method stub
return null;
}
diff --git
a/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/vmpools/VmPoolMapDAOHibernateImpl.java
b/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/vmpools/VmPoolMapDAOHibernateImpl.java
index d69f166..7b58e3b 100644
---
a/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/vmpools/VmPoolMapDAOHibernateImpl.java
+++
b/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/vmpools/VmPoolMapDAOHibernateImpl.java
@@ -4,21 +4,21 @@
import org.hibernate.criterion.Restrictions;
-import org.ovirt.engine.core.common.businessentities.vm_pool_map;
+import org.ovirt.engine.core.common.businessentities.VmPoolMap;
import org.ovirt.engine.core.compat.Guid;
import org.ovirt.engine.core.compat.NGuid;
import org.ovirt.engine.core.dao.BaseDAOHibernateImpl;
-public class VmPoolMapDAOHibernateImpl extends
BaseDAOHibernateImpl<vm_pool_map, Guid> {
+public class VmPoolMapDAOHibernateImpl extends BaseDAOHibernateImpl<VmPoolMap,
Guid> {
public VmPoolMapDAOHibernateImpl() {
- super(vm_pool_map.class);
+ super(VmPoolMap.class);
}
- public vm_pool_map getByVmGuid(Guid vmId) {
+ public VmPoolMap getByVmGuid(Guid vmId) {
return findOneByCriteria(Restrictions.eq("vmId", vmId));
}
- public List<vm_pool_map> getVmPoolsMapByVmPoolId(NGuid vmPoolId) {
+ public List<VmPoolMap> getVmPoolsMapByVmPoolId(NGuid vmPoolId) {
return findByCriteria(Restrictions.eq("vmPoolId", vmPoolId));
}
}
diff --git
a/backend/manager/modules/dal/src/test/java/org/ovirt/engine/core/dao/BaseDAOTestCase.java
b/backend/manager/modules/dal/src/test/java/org/ovirt/engine/core/dao/BaseDAOTestCase.java
index 53e22ee..4cb7c0b 100644
---
a/backend/manager/modules/dal/src/test/java/org/ovirt/engine/core/dao/BaseDAOTestCase.java
+++
b/backend/manager/modules/dal/src/test/java/org/ovirt/engine/core/dao/BaseDAOTestCase.java
@@ -58,7 +58,7 @@
import org.ovirt.engine.core.common.businessentities.tags_vds_map;
import org.ovirt.engine.core.common.businessentities.tags_vm_map;
import org.ovirt.engine.core.common.businessentities.tags_vm_pool_map;
-import org.ovirt.engine.core.common.businessentities.vm_pool_map;
+import org.ovirt.engine.core.common.businessentities.VmPoolMap;
import org.ovirt.engine.core.common.businessentities.vm_pools;
import org.ovirt.engine.core.common.businessentities.vm_template_image_map;
import org.ovirt.engine.core.common.config.Config;
@@ -234,7 +234,7 @@
.addAnnotatedClass(VDSGroup.class)
.addAnnotatedClass(VdsStatic.class)
.addAnnotatedClass(VdsStatistics.class)
- .addAnnotatedClass(vm_pool_map.class)
+ .addAnnotatedClass(VmPoolMap.class)
.addAnnotatedClass(vm_pools.class)
.addAnnotatedClass(vm_template_image_map.class)
.addAnnotatedClass(VmDynamic.class)
diff --git
a/backend/manager/modules/dal/src/test/java/org/ovirt/engine/core/dao/VmPoolDAOTest.java
b/backend/manager/modules/dal/src/test/java/org/ovirt/engine/core/dao/VmPoolDAOTest.java
index 585eaa7..0b2d592 100644
---
a/backend/manager/modules/dal/src/test/java/org/ovirt/engine/core/dao/VmPoolDAOTest.java
+++
b/backend/manager/modules/dal/src/test/java/org/ovirt/engine/core/dao/VmPoolDAOTest.java
@@ -11,7 +11,7 @@
import org.junit.Test;
import org.ovirt.engine.core.common.businessentities.VM;
import org.ovirt.engine.core.common.businessentities.VMStatus;
-import org.ovirt.engine.core.common.businessentities.vm_pool_map;
+import org.ovirt.engine.core.common.businessentities.VmPoolMap;
import org.ovirt.engine.core.common.businessentities.vm_pools;
import org.ovirt.engine.core.compat.Guid;
@@ -27,8 +27,8 @@
private vm_pools existingVmPool;
private vm_pools deletableVmPool;
private vm_pools newVmPool;
- private vm_pool_map newVmPoolMap;
- private vm_pool_map existingVmPoolMap;
+ private VmPoolMap newVmPoolMap;
+ private VmPoolMap existingVmPoolMap;
@Override
public void setUp() throws Exception {
@@ -46,7 +46,7 @@
existingVmPoolMap = dao.getVmPoolMapByVmGuid(new
Guid("77296e00-0cad-4e5a-9299-008a7b6f4355"));
newVmPoolMap =
- new vm_pool_map(FREE_VM_ID, existingVmPool.getvm_pool_id());
+ new VmPoolMap(FREE_VM_ID, existingVmPool.getvm_pool_id());
}
@Test
@@ -59,7 +59,7 @@
assertEquals(before - 1, after);
- vm_pool_map result = dao.getVmPoolMapByVmGuid(EXISTING_VM_ID);
+ VmPoolMap result = dao.getVmPoolMapByVmGuid(EXISTING_VM_ID);
assertNull(result);
}
@@ -206,7 +206,7 @@
@Test
public void testGetVmPoolMap() {
- vm_pool_map result = dao.getVmPoolMapByVmGuid(EXISTING_VM_ID);
+ VmPoolMap result = dao.getVmPoolMapByVmGuid(EXISTING_VM_ID);
assertNotNull(result);
assertEquals(existingVmPoolMap, result);
@@ -222,7 +222,7 @@
assertEquals(before + 1, after);
- vm_pool_map result =
dao.getVmPoolMapByVmGuid(newVmPoolMap.getvm_guid());
+ VmPoolMap result = dao.getVmPoolMapByVmGuid(newVmPoolMap.getvm_guid());
assertNotNull(result);
assertEquals(newVmPoolMap, result);
@@ -230,7 +230,7 @@
@Test
public void testGetVmMapsInVmPoolByVmPoolIdAndStatus() {
- List<vm_pool_map> result = dao.getVmMapsInVmPoolByVmPoolIdAndStatus(
+ List<VmPoolMap> result = dao.getVmMapsInVmPoolByVmPoolIdAndStatus(
existingVmPool.getvm_pool_id(), VMStatus.MigratingFrom);
assertNotNull(result);
diff --git
a/frontend/webadmin/modules/gwt-common/src/main/resources/org/ovirt/engine/core/Common.gwt.xml
b/frontend/webadmin/modules/gwt-common/src/main/resources/org/ovirt/engine/core/Common.gwt.xml
index e29d8b6..59882b1 100644
---
a/frontend/webadmin/modules/gwt-common/src/main/resources/org/ovirt/engine/core/Common.gwt.xml
+++
b/frontend/webadmin/modules/gwt-common/src/main/resources/org/ovirt/engine/core/Common.gwt.xml
@@ -106,7 +106,7 @@
<include name="common/businessentities/VDSStatus.java" />
<include name="common/businessentities/VDSType.java" />
<include name="common/businessentities/VdsVersion.java" />
- <include name="common/businessentities/vm_pool_map.java" />
+ <include name="common/businessentities/VmPoolMap.java" />
<include name="common/businessentities/vm_pools.java" />
<include name="common/businessentities/VM.java" />
<include name="common/businessentities/VmPayload.java" />
--
To view, visit http://gerrit.ovirt.org/10085
To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I91de93b53e961c1a4003cfe36704ea0b79961f2d
Gerrit-PatchSet: 1
Gerrit-Project: ovirt-engine
Gerrit-Branch: master
Gerrit-Owner: Sharad Mishra <snmis...@linux.vnet.ibm.com>
_______________________________________________
Engine-patches mailing list
Engine-patches@ovirt.org
http://lists.ovirt.org/mailman/listinfo/engine-patches
