Sharad Mishra has uploaded a new change for review.
Change subject: core: Renamed tags_vm_map.java to TagsVmMap.java
......................................................................
core: Renamed tags_vm_map.java to TagsVmMap.java
Change-Id: I6cde0a730e78a6d2d0682ccc3ecfe0e0e5e8b78c
Signed-off-by: Sharad Mishra <snmis...@linux.vnet.ibm.com>
---
M
backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/AttachVmsToTagCommand.java
M
backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/UpdateTagsVmMapDefaultDisplayTypeCommand.java
M
backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/VmCommand.java
M
backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/action/TagsVmMapParameters.java
R
backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/TagsVmMap.java
M
backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/TagDAO.java
M
backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/TagDAODbFacadeImpl.java
M
backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/TagDAOHibernateImpl.java
M
backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/tags/TagVmMapDAO.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/TagDAOTest.java
M
frontend/webadmin/modules/gwt-common/src/main/resources/org/ovirt/engine/core/Common.gwt.xml
12 files changed, 67 insertions(+), 67 deletions(-)
git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/82/10082/1
diff --git
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/AttachVmsToTagCommand.java
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/AttachVmsToTagCommand.java
index d4f00f8..639e762 100644
---
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/AttachVmsToTagCommand.java
+++
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/AttachVmsToTagCommand.java
@@ -3,7 +3,7 @@
import org.ovirt.engine.core.common.AuditLogType;
import org.ovirt.engine.core.common.action.AttachEntityToTagParameters;
import org.ovirt.engine.core.common.businessentities.VM;
-import org.ovirt.engine.core.common.businessentities.tags_vm_map;
+import org.ovirt.engine.core.common.businessentities.TagsVmMap;
import org.ovirt.engine.core.compat.Guid;
import org.ovirt.engine.core.dal.dbbroker.DbFacade;
@@ -22,7 +22,7 @@
if (vm != null) {
AppendCustomValue("VmsNames", vm.getVmName(), ", ");
}
- tags_vm_map map = new tags_vm_map(getTagId(), vmGuid);
+ TagsVmMap map = new TagsVmMap(getTagId(), vmGuid);
DbFacade.getInstance().getTagDao().attachVmToTag(map);
noActionDone = false;
} else {
diff --git
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/UpdateTagsVmMapDefaultDisplayTypeCommand.java
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/UpdateTagsVmMapDefaultDisplayTypeCommand.java
index 3cd3e66..b3c07ec 100644
---
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/UpdateTagsVmMapDefaultDisplayTypeCommand.java
+++
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/UpdateTagsVmMapDefaultDisplayTypeCommand.java
@@ -2,7 +2,7 @@
import org.ovirt.engine.core.common.AuditLogType;
import org.ovirt.engine.core.common.action.TagsVmMapParameters;
-import org.ovirt.engine.core.common.businessentities.tags_vm_map;
+import org.ovirt.engine.core.common.businessentities.TagsVmMap;
import org.ovirt.engine.core.dal.VdcBllMessages;
import org.ovirt.engine.core.dal.dbbroker.DbFacade;
@@ -13,7 +13,7 @@
@Override
protected boolean canDoAction() {
- tags_vm_map tagsVmMap;
+ TagsVmMap tagsVmMap;
tagsVmMap =
DbFacade.getInstance().getTagDao().getTagVmByTagIdAndByVmId(getParameters().getTagsVmMap().gettag_id(),
getParameters().getTagsVmMap().getvm_id());
if (tagsVmMap == null) {
diff --git
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/VmCommand.java
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/VmCommand.java
index d94c653..fb9a28d 100644
---
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/VmCommand.java
+++
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/VmCommand.java
@@ -24,7 +24,7 @@
import org.ovirt.engine.core.common.businessentities.VmStatic;
import org.ovirt.engine.core.common.businessentities.VmTemplate;
import org.ovirt.engine.core.common.businessentities.tags;
-import org.ovirt.engine.core.common.businessentities.tags_vm_map;
+import org.ovirt.engine.core.common.businessentities.TagsVmMap;
import org.ovirt.engine.core.common.config.Config;
import org.ovirt.engine.core.common.config.ConfigValues;
import org.ovirt.engine.core.common.utils.VmDeviceType;
@@ -240,8 +240,8 @@
}
protected void removeVmUsers() {
- List<tags_vm_map> all =
getTagDao().getTagVmMapByVmIdAndDefaultTag(getVmId());
- for (tags_vm_map tagVm : all) {
+ List<TagsVmMap> all =
getTagDao().getTagVmMapByVmIdAndDefaultTag(getVmId());
+ for (TagsVmMap tagVm : all) {
getTagDao().detachVmFromTag(tagVm.gettag_id(), getVmId());
}
}
diff --git
a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/action/TagsVmMapParameters.java
b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/action/TagsVmMapParameters.java
index fd3a5fb..ab673a7 100644
---
a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/action/TagsVmMapParameters.java
+++
b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/action/TagsVmMapParameters.java
@@ -4,14 +4,14 @@
public class TagsVmMapParameters extends TagsActionParametersBase {
private static final long serialVersionUID = 6685955961538163300L;
- private tags_vm_map _tagsVmMap;
+ private TagsVmMap _tagsVmMap;
- public TagsVmMapParameters(tags_vm_map tagsVmMap) {
+ public TagsVmMapParameters(TagsVmMap tagsVmMap) {
super(tagsVmMap.gettag_id());
_tagsVmMap = tagsVmMap;
}
- public tags_vm_map getTagsVmMap() {
+ public TagsVmMap getTagsVmMap() {
return _tagsVmMap;
}
diff --git
a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/tags_vm_map.java
b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/TagsVmMap.java
similarity index 93%
rename from
backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/tags_vm_map.java
rename to
backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/TagsVmMap.java
index adc8b7c..bba90e5 100644
---
a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/tags_vm_map.java
+++
b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/TagsVmMap.java
@@ -18,7 +18,7 @@
@Entity
@Table(name = "tags_vm_map")
@TypeDef(name = "guid", typeClass = GuidType.class)
-public class tags_vm_map implements Serializable {
+public class TagsVmMap implements Serializable {
private static final long serialVersionUID = 4061390921955269261L;
@EmbeddedId
@@ -33,10 +33,10 @@
@Column(name = "_create_date")
private Date created = new Date();
- public tags_vm_map() {
+ public TagsVmMap() {
}
- public tags_vm_map(Guid tag_id, Guid vm_id) {
+ public TagsVmMap(Guid tag_id, Guid vm_id) {
this.id.tagId = tag_id;
this.id.vmId = vm_id;
}
@@ -83,7 +83,7 @@
return false;
if (getClass() != obj.getClass())
return false;
- tags_vm_map other = (tags_vm_map) obj;
+ TagsVmMap other = (TagsVmMap) obj;
if (defaultDisplayType == null) {
if (other.defaultDisplayType != null)
return false;
diff --git
a/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/TagDAO.java
b/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/TagDAO.java
index ba754f5..d580933 100644
---
a/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/TagDAO.java
+++
b/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/TagDAO.java
@@ -6,7 +6,7 @@
import org.ovirt.engine.core.common.businessentities.TagsUserGroupMap;
import org.ovirt.engine.core.common.businessentities.TagsUserMap;
import org.ovirt.engine.core.common.businessentities.TagsVdsMap;
-import org.ovirt.engine.core.common.businessentities.tags_vm_map;
+import org.ovirt.engine.core.common.businessentities.TagsVmMap;
import org.ovirt.engine.core.common.businessentities.tags_vm_pool_map;
import org.ovirt.engine.core.compat.Guid;
import org.ovirt.engine.core.compat.NGuid;
@@ -182,19 +182,19 @@
List<TagsVdsMap> getTagVdsMapByTagName(String tagName);
- tags_vm_map getTagVmByTagIdAndByVmId(Guid tagId, Guid vmId);
+ TagsVmMap getTagVmByTagIdAndByVmId(Guid tagId, Guid vmId);
- void attachVmToTag(tags_vm_map tagVmMap);
+ void attachVmToTag(TagsVmMap tagVmMap);
- void updateDefaultDisplayForVmTag(tags_vm_map tagsVmMap);
+ void updateDefaultDisplayForVmTag(TagsVmMap tagsVmMap);
void detachVmFromTag(Guid tagId, Guid vmId);
- List<tags_vm_map> getTagVmMapByTagName(String tagName);
+ List<TagsVmMap> getTagVmMapByTagName(String tagName);
- List<tags_vm_map> getTagVmMapByVmIdAndDefaultTag(Guid vmid);
+ List<TagsVmMap> getTagVmMapByVmIdAndDefaultTag(Guid vmid);
- List<tags_vm_map> getTimeLeasedUserVmsByAdGroupAndVmPoolId(Guid adGroupId,
Guid vmPoolId);
+ List<TagsVmMap> getTimeLeasedUserVmsByAdGroupAndVmPoolId(Guid adGroupId,
Guid vmPoolId);
List<tags_vm_pool_map> getVmPoolTagsByVmPoolIdAndAdElementId(NGuid
vmPoolId, Guid adElementId);
}
diff --git
a/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/TagDAODbFacadeImpl.java
b/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/TagDAODbFacadeImpl.java
index 012d6ef..364363d 100644
---
a/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/TagDAODbFacadeImpl.java
+++
b/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/TagDAODbFacadeImpl.java
@@ -9,7 +9,7 @@
import org.ovirt.engine.core.common.businessentities.TagsUserGroupMap;
import org.ovirt.engine.core.common.businessentities.TagsUserMap;
import org.ovirt.engine.core.common.businessentities.TagsVdsMap;
-import org.ovirt.engine.core.common.businessentities.tags_vm_map;
+import org.ovirt.engine.core.common.businessentities.TagsVmMap;
import org.ovirt.engine.core.common.businessentities.tags_vm_pool_map;
import org.ovirt.engine.core.compat.Guid;
import org.ovirt.engine.core.compat.NGuid;
@@ -390,14 +390,14 @@
}
@Override
- public tags_vm_map getTagVmByTagIdAndByVmId(Guid tagId, Guid vmId) {
+ public TagsVmMap getTagVmByTagIdAndByVmId(Guid tagId, Guid vmId) {
MapSqlParameterSource parameterSource =
getCustomMapSqlParameterSource().addValue("tag_id", tagId).addValue(
"vm_id", vmId);
- ParameterizedRowMapper<tags_vm_map> mapper = new
ParameterizedRowMapper<tags_vm_map>() {
+ ParameterizedRowMapper<TagsVmMap> mapper = new
ParameterizedRowMapper<TagsVmMap>() {
@Override
- public tags_vm_map mapRow(ResultSet rs, int rowNum) throws
SQLException {
- tags_vm_map entity = new tags_vm_map();
+ public TagsVmMap mapRow(ResultSet rs, int rowNum) throws
SQLException {
+ TagsVmMap entity = new TagsVmMap();
entity.settag_id(Guid.createGuidFromString(rs.getString("tag_id")));
entity.setvm_id(Guid.createGuidFromString(rs.getString("vm_id")));
entity.setDefaultDisplayType((Integer)
rs.getObject("DefaultDisplayType"));
@@ -410,7 +410,7 @@
}
@Override
- public void attachVmToTag(tags_vm_map tagVmMap) {
+ public void attachVmToTag(TagsVmMap tagVmMap) {
MapSqlParameterSource parameterSource =
getCustomMapSqlParameterSource().addValue("tag_id",
tagVmMap.gettag_id()).addValue("vm_id",
tagVmMap.getvm_id()).addValue("DefaultDisplayType",
tagVmMap.getDefaultDisplayType());
@@ -420,7 +420,7 @@
}
@Override
- public void updateDefaultDisplayForVmTag(tags_vm_map tagsVmMap) {
+ public void updateDefaultDisplayForVmTag(TagsVmMap tagsVmMap) {
MapSqlParameterSource parameterSource =
getCustomMapSqlParameterSource().addValue("tag_id",
tagsVmMap.gettag_id()).addValue("vm_id",
tagsVmMap.getvm_id()).addValue("DefaultDisplayType",
tagsVmMap.getDefaultDisplayType());
@@ -440,13 +440,13 @@
@SuppressWarnings("unchecked")
@Override
- public List<tags_vm_map> getTagVmMapByTagName(String tagName) {
+ public List<TagsVmMap> getTagVmMapByTagName(String tagName) {
MapSqlParameterSource parameterSource =
getCustomMapSqlParameterSource().addValue("tag_name", tagName);
- ParameterizedRowMapper<tags_vm_map> mapper = new
ParameterizedRowMapper<tags_vm_map>() {
+ ParameterizedRowMapper<TagsVmMap> mapper = new
ParameterizedRowMapper<TagsVmMap>() {
@Override
- public tags_vm_map mapRow(ResultSet rs, int rowNum) throws
SQLException {
- tags_vm_map entity = new tags_vm_map();
+ public TagsVmMap mapRow(ResultSet rs, int rowNum) throws
SQLException {
+ TagsVmMap entity = new TagsVmMap();
entity.settag_id(Guid.createGuidFromString(rs.getString("tag_id")));
entity.setvm_id(Guid.createGuidFromString(rs.getString("vm_id")));
return entity;
@@ -459,13 +459,13 @@
@SuppressWarnings("unchecked")
@Override
- public List<tags_vm_map> getTagVmMapByVmIdAndDefaultTag(Guid vmid) {
+ public List<TagsVmMap> getTagVmMapByVmIdAndDefaultTag(Guid vmid) {
MapSqlParameterSource parameterSource =
getCustomMapSqlParameterSource().addValue("vm_id", vmid);
- ParameterizedRowMapper<tags_vm_map> mapper = new
ParameterizedRowMapper<tags_vm_map>() {
+ ParameterizedRowMapper<TagsVmMap> mapper = new
ParameterizedRowMapper<TagsVmMap>() {
@Override
- public tags_vm_map mapRow(ResultSet rs, int rowNum) throws
SQLException {
- tags_vm_map entity = new tags_vm_map();
+ public TagsVmMap mapRow(ResultSet rs, int rowNum) throws
SQLException {
+ TagsVmMap entity = new TagsVmMap();
entity.settag_id(Guid.createGuidFromString(rs.getString("tag_id")));
entity.setvm_id(Guid.createGuidFromString(rs.getString("vm_id")));
entity.setDefaultDisplayType((Integer)
rs.getObject("DefaultDisplayType"));
@@ -480,14 +480,14 @@
@SuppressWarnings("unchecked")
@Override
- public List<tags_vm_map> getTimeLeasedUserVmsByAdGroupAndVmPoolId(Guid
adGroupId, Guid vmPoolId) {
+ public List<TagsVmMap> getTimeLeasedUserVmsByAdGroupAndVmPoolId(Guid
adGroupId, Guid vmPoolId) {
MapSqlParameterSource parameterSource =
getCustomMapSqlParameterSource().addValue("groupId", adGroupId)
.addValue("vm_pool_id", vmPoolId);
- ParameterizedRowMapper<tags_vm_map> mapper = new
ParameterizedRowMapper<tags_vm_map>() {
+ ParameterizedRowMapper<TagsVmMap> mapper = new
ParameterizedRowMapper<TagsVmMap>() {
@Override
- public tags_vm_map mapRow(ResultSet rs, int rowNum) throws
SQLException {
- tags_vm_map entity = new tags_vm_map();
+ public TagsVmMap mapRow(ResultSet rs, int rowNum) throws
SQLException {
+ TagsVmMap entity = new TagsVmMap();
entity.settag_id(Guid.createGuidFromString(rs.getString("tag_id")));
entity.setvm_id(Guid.createGuidFromString(rs.getString("vm_id")));
entity.setDefaultDisplayType((Integer)
rs.getObject("DefaultDisplayType"));
diff --git
a/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/TagDAOHibernateImpl.java
b/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/TagDAOHibernateImpl.java
index 7316adc..7e1509c 100644
---
a/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/TagDAOHibernateImpl.java
+++
b/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/TagDAOHibernateImpl.java
@@ -13,7 +13,7 @@
import org.ovirt.engine.core.common.businessentities.TagsUserMap;
import org.ovirt.engine.core.common.businessentities.TagsVdsMap;
import org.ovirt.engine.core.common.businessentities.TagsVdsMapId;
-import org.ovirt.engine.core.common.businessentities.tags_vm_map;
+import org.ovirt.engine.core.common.businessentities.TagsVmMap;
import org.ovirt.engine.core.common.businessentities.tags_vm_pool_map;
import org.ovirt.engine.core.compat.Guid;
import org.ovirt.engine.core.compat.NGuid;
@@ -191,17 +191,17 @@
}
@Override
- public tags_vm_map getTagVmByTagIdAndByVmId(Guid tagId, Guid vmId) {
+ public TagsVmMap getTagVmByTagIdAndByVmId(Guid tagId, Guid vmId) {
return tagVmMapDAO.findOneByCriteria(Restrictions.eq("id.tagId",
tagId), Restrictions.eq("id.vmId", vmId));
}
@Override
- public void attachVmToTag(tags_vm_map tagVmMap) {
+ public void attachVmToTag(TagsVmMap tagVmMap) {
tagVmMapDAO.save(tagVmMap);
}
@Override
- public void updateDefaultDisplayForVmTag(tags_vm_map tagsVmMap) {
+ public void updateDefaultDisplayForVmTag(TagsVmMap tagsVmMap) {
tagVmMapDAO.save(tagsVmMap);
}
@@ -211,18 +211,18 @@
}
@Override
- public List<tags_vm_map> getTagVmMapByTagName(String tagName) {
+ public List<TagsVmMap> getTagVmMapByTagName(String tagName) {
tags tag = getByName(tagName);
if (tag != null) {
return tagVmMapDAO.findByCriteria(Restrictions.eq("id.tagId",
tag.gettag_id()));
} else {
- return new ArrayList<tags_vm_map>();
+ return new ArrayList<TagsVmMap>();
}
}
@Override
- public List<tags_vm_map> getTagVmMapByVmIdAndDefaultTag(Guid vmid) {
+ public List<TagsVmMap> getTagVmMapByVmIdAndDefaultTag(Guid vmid) {
List<tags> defaultTags = findByCriteria(Restrictions.eq("type",
TagsType.AdElementTag));
List<Guid> ids = new ArrayList<Guid>();
@@ -234,7 +234,7 @@
}
@Override
- public List<tags_vm_map> getTimeLeasedUserVmsByAdGroupAndVmPoolId(Guid
adGroupId, Guid vmPoolId) {
+ public List<TagsVmMap> getTimeLeasedUserVmsByAdGroupAndVmPoolId(Guid
adGroupId, Guid vmPoolId) {
// TODO Auto-generated method stub
return null;
}
diff --git
a/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/tags/TagVmMapDAO.java
b/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/tags/TagVmMapDAO.java
index 22f1308..d9d5509 100644
---
a/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/tags/TagVmMapDAO.java
+++
b/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/tags/TagVmMapDAO.java
@@ -3,14 +3,14 @@
import org.hibernate.Query;
import org.hibernate.Session;
-import org.ovirt.engine.core.common.businessentities.tags_vm_map;
+import org.ovirt.engine.core.common.businessentities.TagsVmMap;
import org.ovirt.engine.core.common.businessentities.TagsVmMapId;
import org.ovirt.engine.core.compat.Guid;
import org.ovirt.engine.core.dao.BaseDAOHibernateImpl;
-public class TagVmMapDAO extends BaseDAOHibernateImpl<tags_vm_map,
TagsVmMapId> {
+public class TagVmMapDAO extends BaseDAOHibernateImpl<TagsVmMap, TagsVmMapId> {
public TagVmMapDAO() {
- super(tags_vm_map.class);
+ super(TagsVmMap.class);
}
public void remove(Guid tagId, Guid vmId) {
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 4d9eacb..2f492f6 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
@@ -56,7 +56,7 @@
import org.ovirt.engine.core.common.businessentities.TagsUserGroupMap;
import org.ovirt.engine.core.common.businessentities.TagsUserMap;
import org.ovirt.engine.core.common.businessentities.TagsVdsMap;
-import org.ovirt.engine.core.common.businessentities.tags_vm_map;
+import org.ovirt.engine.core.common.businessentities.TagsVmMap;
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.vm_pools;
@@ -226,7 +226,7 @@
.addAnnotatedClass(TagsUserGroupMap.class)
.addAnnotatedClass(TagsUserMap.class)
.addAnnotatedClass(TagsVdsMap.class)
- .addAnnotatedClass(tags_vm_map.class)
+ .addAnnotatedClass(TagsVmMap.class)
.addAnnotatedClass(tags_vm_pool_map.class)
.addAnnotatedClass(user_sessions.class)
.addAnnotatedClass(VdcOption.class)
diff --git
a/backend/manager/modules/dal/src/test/java/org/ovirt/engine/core/dao/TagDAOTest.java
b/backend/manager/modules/dal/src/test/java/org/ovirt/engine/core/dao/TagDAOTest.java
index 1c038fc..3e0f09b 100644
---
a/backend/manager/modules/dal/src/test/java/org/ovirt/engine/core/dao/TagDAOTest.java
+++
b/backend/manager/modules/dal/src/test/java/org/ovirt/engine/core/dao/TagDAOTest.java
@@ -11,7 +11,7 @@
import org.ovirt.engine.core.common.businessentities.TagsUserGroupMap;
import org.ovirt.engine.core.common.businessentities.TagsUserMap;
import org.ovirt.engine.core.common.businessentities.TagsVdsMap;
-import org.ovirt.engine.core.common.businessentities.tags_vm_map;
+import org.ovirt.engine.core.common.businessentities.TagsVmMap;
import org.ovirt.engine.core.compat.Guid;
/**
@@ -38,8 +38,8 @@
private TagsUserMap existingUserTag;
private TagsVdsMap existingVdsTag;
private TagsVdsMap newVdsTag;
- private tags_vm_map existingVmTag;
- private tags_vm_map newVmTag;
+ private TagsVmMap existingVmTag;
+ private TagsVmMap newVmTag;
private Guid vmPool;
@Override
@@ -71,7 +71,7 @@
newVdsTag = new TagsVdsMap(EXISTING_TAG_ID, FREE_VDS_ID);
existingVmTag = dao.getTagVmByTagIdAndByVmId(EXISTING_TAG_ID,
EXISTING_VM_ID);
- newVmTag = new tags_vm_map(EXISTING_TAG_ID, FREE_VM_ID);
+ newVmTag = new TagsVmMap(EXISTING_TAG_ID, FREE_VM_ID);
}
/**
@@ -445,13 +445,13 @@
@Test
public void testGetTagVmMapByTag() {
- tags_vm_map result =
dao.getTagVmByTagIdAndByVmId(existingVmTag.gettag_id(),
existingVmTag.getvm_id());
+ TagsVmMap result =
dao.getTagVmByTagIdAndByVmId(existingVmTag.gettag_id(),
existingVmTag.getvm_id());
assertNotNull(result);
assertEqualsTagsVmMap(existingVmTag, result);
}
- private void assertEqualsTagsVmMap(tags_vm_map existing, tags_vm_map
result) {
+ private void assertEqualsTagsVmMap(TagsVmMap existing, TagsVmMap result) {
assertEquals("TG is not
equal",existing.gettag_id(),result.gettag_id());
assertEquals("VM id not equal ",existing.getvm_id(),result.getvm_id());
assertEquals("Object equation",existing,result);
@@ -461,7 +461,7 @@
public void testAttachVmToTag() {
dao.attachVmToTag(newVmTag);
- tags_vm_map result =
dao.getTagVmByTagIdAndByVmId(newVmTag.gettag_id(), newVmTag.getvm_id());
+ TagsVmMap result = dao.getTagVmByTagIdAndByVmId(newVmTag.gettag_id(),
newVmTag.getvm_id());
assertNotNull(result);
assertEqualsTagsVmMap(newVmTag, result);
@@ -473,7 +473,7 @@
dao.updateDefaultDisplayForVmTag(existingVmTag);
- tags_vm_map result =
dao.getTagVmByTagIdAndByVmId(existingVmTag.gettag_id(),
existingVmTag.getvm_id());
+ TagsVmMap result =
dao.getTagVmByTagIdAndByVmId(existingVmTag.gettag_id(),
existingVmTag.getvm_id());
assertNotNull(result);
assertEqualsTagsVmMap(existingVmTag, result);
@@ -483,29 +483,29 @@
public void testDetachVmFromTag() {
dao.detachVmFromTag(existingVmTag.gettag_id(),
existingVmTag.getvm_id());
- tags_vm_map result =
dao.getTagVmByTagIdAndByVmId(existingVmTag.gettag_id(),
existingVmTag.getvm_id());
+ TagsVmMap result =
dao.getTagVmByTagIdAndByVmId(existingVmTag.gettag_id(),
existingVmTag.getvm_id());
assertNull(result);
}
@Test
public void testGetTagVmMapByTagName() {
- List<tags_vm_map> result =
dao.getTagVmMapByTagName(existingTag.gettag_name());
+ List<TagsVmMap> result =
dao.getTagVmMapByTagName(existingTag.gettag_name());
assertNotNull(result);
assertFalse(result.isEmpty());
- for (tags_vm_map mapping : result) {
+ for (TagsVmMap mapping : result) {
assertEquals(existingTag.gettag_id(), mapping.gettag_id());
}
}
@Test
public void testGetTagVmMapByByVmIdAndDefaultTag() {
- List<tags_vm_map> result =
dao.getTagVmMapByVmIdAndDefaultTag(EXISTING_VM_ID);
+ List<TagsVmMap> result =
dao.getTagVmMapByVmIdAndDefaultTag(EXISTING_VM_ID);
assertNotNull(result);
assertFalse(result.isEmpty());
- for (tags_vm_map mapping : result) {
+ for (TagsVmMap mapping : result) {
assertEquals(EXISTING_VM_ID, mapping.getvm_id());
}
}
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 9c2c235..9c39b4e 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
@@ -87,7 +87,7 @@
<include name="common/businessentities/StorageType.java" />
<include name="common/businessentities/StorageFormatType.java"
/>
<include name="common/businessentities/TabType.java" />
- <include name="common/businessentities/tags_vm_map.java" />
+ <include name="common/businessentities/TagsVmMap.java" />
<include name="common/businessentities/tags.java" />
<include name="common/businessentities/TagsType.java" />
<include name="common/queries/IRegisterQueryUpdatedData.java" />
--
To view, visit http://gerrit.ovirt.org/10082
To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I6cde0a730e78a6d2d0682ccc3ecfe0e0e5e8b78c
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
