Sharad Mishra has uploaded a new change for review.
Change subject: core: Renamed storage_domain_dynamic.java
StorageDomainDynamic.java
......................................................................
core: Renamed storage_domain_dynamic.java StorageDomainDynamic.java
Change-Id: I6189f8c735a415618d8a3e1b72493c8111dc0a9e
Signed-off-by: Sharad Mishra <snmis...@linux.vnet.ibm.com>
---
M
backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/command/utils/StorageDomainSpaceChecker.java
M
backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/AddStorageDomainCommand.java
M
backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/TestHelperImportVmTemplateCommand.java
M
backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/command/utils/StorageDomainSpaceCheckerTest.java
R
backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/StorageDomainDynamic.java
M
backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/storage_domains.java
M
backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dal/dbbroker/DbFacade.java
M
backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/StorageDomainDAOWrapperImpl.java
M
backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/StorageDomainDynamicDAO.java
M
backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/StorageDomainDynamicDAODbFacadeImpl.java
M
backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/StorageDomainDynamicDAOHibernateImpl.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/StorageDomainDynamicDAOTest.java
M
backend/manager/modules/utils/src/test/java/org/ovirt/engine/core/utils/serialization/json/JsonObjectSerializationEntitiesTest.java
M
frontend/webadmin/modules/gwt-common/src/main/resources/org/ovirt/engine/core/Common.gwt.xml
15 files changed, 53 insertions(+), 53 deletions(-)
git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/73/10073/1
diff --git
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/command/utils/StorageDomainSpaceChecker.java
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/command/utils/StorageDomainSpaceChecker.java
index 5d2c87b..d7d2d08 100644
---
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/command/utils/StorageDomainSpaceChecker.java
+++
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/command/utils/StorageDomainSpaceChecker.java
@@ -1,6 +1,6 @@
package org.ovirt.engine.core.bll.command.utils;
-import org.ovirt.engine.core.common.businessentities.storage_domain_dynamic;
+import org.ovirt.engine.core.common.businessentities.StorageDomainDynamic;
import org.ovirt.engine.core.common.businessentities.storage_domains;
import org.ovirt.engine.core.common.config.Config;
import org.ovirt.engine.core.common.config.ConfigValues;
@@ -20,7 +20,7 @@
}
private static boolean isBelowPctThreshold(final storage_domains domain) {
- storage_domain_dynamic dynamic = domain.getStorageDynamicData();
+ StorageDomainDynamic dynamic = domain.getStorageDynamicData();
return (dynamic != null
&& dynamic.getfreeDiskInGB() > Config
.<Integer>
GetValue(ConfigValues.FreeSpaceCriticalLowInGB) && dynamic.getfreeDiskPercent()
> Config
diff --git
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/AddStorageDomainCommand.java
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/AddStorageDomainCommand.java
index 0f8e1b7..445ed5d 100644
---
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/AddStorageDomainCommand.java
+++
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/AddStorageDomainCommand.java
@@ -15,7 +15,7 @@
import org.ovirt.engine.core.common.businessentities.StorageDomainType;
import org.ovirt.engine.core.common.businessentities.StorageFormatType;
import org.ovirt.engine.core.common.businessentities.StorageType;
-import org.ovirt.engine.core.common.businessentities.storage_domain_dynamic;
+import org.ovirt.engine.core.common.businessentities.StorageDomainDynamic;
import org.ovirt.engine.core.common.businessentities.storage_domain_static;
import org.ovirt.engine.core.common.businessentities.storage_domains;
import org.ovirt.engine.core.common.businessentities.storage_pool;
@@ -70,8 +70,8 @@
public Void runInTransaction() {
DbFacade.getInstance().getStorageDomainStaticDao().save(getStorageDomain().getStorageStaticData());
getCompensationContext().snapshotNewEntity(getStorageDomain().getStorageStaticData());
- storage_domain_dynamic newStorageDynamic =
- new storage_domain_dynamic(null,
getStorageDomain().getId(), null);
+ StorageDomainDynamic newStorageDynamic =
+ new StorageDomainDynamic(null,
getStorageDomain().getId(), null);
getReturnValue().setActionReturnValue(getStorageDomain().getId());
DbFacade.getInstance().getStorageDomainDynamicDao().save(newStorageDynamic);
getCompensationContext().snapshotNewEntity(newStorageDynamic);
diff --git
a/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/TestHelperImportVmTemplateCommand.java
b/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/TestHelperImportVmTemplateCommand.java
index 91e55b5..8e6575a 100644
---
a/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/TestHelperImportVmTemplateCommand.java
+++
b/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/TestHelperImportVmTemplateCommand.java
@@ -15,7 +15,7 @@
import org.ovirt.engine.core.common.businessentities.StorageDomainStatus;
import org.ovirt.engine.core.common.businessentities.StorageDomainType;
import org.ovirt.engine.core.common.businessentities.VmTemplate;
-import org.ovirt.engine.core.common.businessentities.storage_domain_dynamic;
+import org.ovirt.engine.core.common.businessentities.StorageDomainDynamic;
import org.ovirt.engine.core.common.businessentities.storage_domain_static;
import org.ovirt.engine.core.common.businessentities.storage_domains;
import org.ovirt.engine.core.common.businessentities.storage_pool;
@@ -49,7 +49,7 @@
final StorageDomainDAO d = mock(StorageDomainDAO.class);
when(d.getForStoragePool(any(Guid.class),
any(Guid.class))).thenReturn(destination);
- storage_domain_dynamic dy = new storage_domain_dynamic();
+ StorageDomainDynamic dy = new StorageDomainDynamic();
dy.setavailable_disk_size(10);
dy.setused_disk_size(0);
destination.setStorageDynamicData(dy);
diff --git
a/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/command/utils/StorageDomainSpaceCheckerTest.java
b/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/command/utils/StorageDomainSpaceCheckerTest.java
index 43eff04..73ce89f 100644
---
a/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/command/utils/StorageDomainSpaceCheckerTest.java
+++
b/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/command/utils/StorageDomainSpaceCheckerTest.java
@@ -5,7 +5,7 @@
import org.junit.ClassRule;
import org.junit.Test;
-import org.ovirt.engine.core.common.businessentities.storage_domain_dynamic;
+import org.ovirt.engine.core.common.businessentities.StorageDomainDynamic;
import org.ovirt.engine.core.common.businessentities.storage_domains;
import org.ovirt.engine.core.common.config.ConfigValues;
import org.ovirt.engine.core.utils.MockConfigRule;
@@ -115,7 +115,7 @@
}
public storage_domains setupForSpaceTest(final SpaceTestSettings settings)
{
- storage_domain_dynamic dynamic = new storage_domain_dynamic();
+ StorageDomainDynamic dynamic = new StorageDomainDynamic();
dynamic.setavailable_disk_size(settings.diskSpaceFree);
dynamic.setused_disk_size(settings.diskSpaceUsed);
storage_domains domain = new storage_domains();
diff --git
a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/storage_domain_dynamic.java
b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/StorageDomainDynamic.java
similarity index 89%
rename from
backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/storage_domain_dynamic.java
rename to
backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/StorageDomainDynamic.java
index 7ffa221..0608c40 100644
---
a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/storage_domain_dynamic.java
+++
b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/StorageDomainDynamic.java
@@ -14,13 +14,13 @@
@Entity
@Table(name = "storage_domain_dynamic")
@TypeDef(name = "guid", typeClass = GuidType.class)
-public class storage_domain_dynamic implements BusinessEntity<Guid> {
+public class StorageDomainDynamic implements BusinessEntity<Guid> {
private static final long serialVersionUID = -5305319985243261293L;
- public storage_domain_dynamic() {
+ public StorageDomainDynamic() {
}
- public storage_domain_dynamic(Integer available_disk_size, Guid id,
Integer used_disk_size) {
+ public StorageDomainDynamic(Integer available_disk_size, Guid id, Integer
used_disk_size) {
this.availableDiskSize = available_disk_size;
this.id = id;
this.usedDiskSize = used_disk_size;
@@ -80,8 +80,8 @@
return availableDiskSize;
}
- public static storage_domain_dynamic copyOf(storage_domain_dynamic domain)
{
- storage_domain_dynamic sdd = new storage_domain_dynamic();
+ public static StorageDomainDynamic copyOf(StorageDomainDynamic domain) {
+ StorageDomainDynamic sdd = new StorageDomainDynamic();
sdd.availableDiskSize = domain.availableDiskSize;
sdd.id = new Guid(domain.id.getUuid());
sdd.usedDiskSize = domain.usedDiskSize;
@@ -106,7 +106,7 @@
return false;
if (getClass() != obj.getClass())
return false;
- storage_domain_dynamic other = (storage_domain_dynamic) obj;
+ StorageDomainDynamic other = (StorageDomainDynamic) obj;
if (availableDiskSize == null) {
if (other.availableDiskSize != null)
return false;
diff --git
a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/storage_domains.java
b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/storage_domains.java
index 54e33f0..c26c372 100644
---
a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/storage_domains.java
+++
b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/storage_domains.java
@@ -16,7 +16,7 @@
public storage_domains() {
_staticData = new storage_domain_static();
- _dynamicData = new storage_domain_dynamic();
+ _dynamicData = new StorageDomainDynamic();
setStoragePoolIsoMapData(new storage_pool_iso_map());
}
@@ -24,7 +24,7 @@
Integer available_disk_size, Integer used_disk_size,
StorageDomainStatus status, String storage_pool_name,
int storage_pool_type, int storage_type) {
_staticData = new storage_domain_static();
- _dynamicData = new storage_domain_dynamic();
+ _dynamicData = new StorageDomainDynamic();
setStoragePoolIsoMapData(new storage_pool_iso_map());
this.setId(id);
this.setstorage(storage);
@@ -78,13 +78,13 @@
_staticData = value;
}
- private storage_domain_dynamic _dynamicData;
+ private StorageDomainDynamic _dynamicData;
- public storage_domain_dynamic getStorageDynamicData() {
+ public StorageDomainDynamic getStorageDynamicData() {
return _dynamicData;
}
- public void setStorageDynamicData(storage_domain_dynamic value) {
+ public void setStorageDynamicData(StorageDomainDynamic value) {
_dynamicData = value;
}
diff --git
a/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dal/dbbroker/DbFacade.java
b/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dal/dbbroker/DbFacade.java
index 787b238..877596f 100644
---
a/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dal/dbbroker/DbFacade.java
+++
b/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dal/dbbroker/DbFacade.java
@@ -33,7 +33,7 @@
import org.ovirt.engine.core.common.businessentities.VmTemplate;
import org.ovirt.engine.core.common.businessentities.image_storage_domain_map;
import org.ovirt.engine.core.common.businessentities.permissions;
-import org.ovirt.engine.core.common.businessentities.storage_domain_dynamic;
+import org.ovirt.engine.core.common.businessentities.StorageDomainDynamic;
import org.ovirt.engine.core.common.businessentities.storage_domain_static;
import org.ovirt.engine.core.common.businessentities.storage_domains;
import org.ovirt.engine.core.common.businessentities.storage_pool;
@@ -123,7 +123,7 @@
put(storage_pool.class, StoragePoolDAO.class);
put(storage_pool_iso_map.class, StoragePoolIsoMapDAO.class);
put(storage_domain_static.class, StorageDomainStaticDAO.class);
- put(storage_domain_dynamic.class, StorageDomainDynamicDAO.class);
+ put(StorageDomainDynamic.class, StorageDomainDynamicDAO.class);
put(VdsStatic.class, VdsStaticDAO.class);
put(VdsDynamic.class, VdsDynamicDAO.class);
put(VdsStatistics.class, VdsStatisticsDAO.class);
diff --git
a/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/StorageDomainDAOWrapperImpl.java
b/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/StorageDomainDAOWrapperImpl.java
index 0baf187..6ebe94b 100644
---
a/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/StorageDomainDAOWrapperImpl.java
+++
b/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/StorageDomainDAOWrapperImpl.java
@@ -7,7 +7,7 @@
import org.hibernate.Session;
import org.ovirt.engine.core.common.businessentities.ActionGroup;
import org.ovirt.engine.core.common.businessentities.StorageDomainType;
-import org.ovirt.engine.core.common.businessentities.storage_domain_dynamic;
+import org.ovirt.engine.core.common.businessentities.StorageDomainDynamic;
import org.ovirt.engine.core.common.businessentities.storage_domain_static;
import org.ovirt.engine.core.common.businessentities.storage_domains;
import org.ovirt.engine.core.common.businessentities.storage_pool_iso_map;
@@ -54,7 +54,7 @@
storage_domains result = null;
if (staticPart != null) {
- storage_domain_dynamic dynamicPart =
dynamicDAO.get(staticPart.getId());
+ StorageDomainDynamic dynamicPart =
dynamicDAO.get(staticPart.getId());
if (dynamicPart != null) {
result = new storage_domains();
diff --git
a/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/StorageDomainDynamicDAO.java
b/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/StorageDomainDynamicDAO.java
index c376594..3a795d0 100644
---
a/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/StorageDomainDynamicDAO.java
+++
b/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/StorageDomainDynamicDAO.java
@@ -1,7 +1,7 @@
package org.ovirt.engine.core.dao;
-import org.ovirt.engine.core.common.businessentities.storage_domain_dynamic;
+import org.ovirt.engine.core.common.businessentities.StorageDomainDynamic;
import org.ovirt.engine.core.compat.Guid;
-public interface StorageDomainDynamicDAO extends
GenericDao<storage_domain_dynamic, Guid> {
+public interface StorageDomainDynamicDAO extends
GenericDao<StorageDomainDynamic, Guid> {
}
diff --git
a/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/StorageDomainDynamicDAODbFacadeImpl.java
b/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/StorageDomainDynamicDAODbFacadeImpl.java
index 6daf6a9..a5f9c68 100644
---
a/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/StorageDomainDynamicDAODbFacadeImpl.java
+++
b/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/StorageDomainDynamicDAODbFacadeImpl.java
@@ -4,7 +4,7 @@
import java.sql.SQLException;
import java.util.List;
-import org.ovirt.engine.core.common.businessentities.storage_domain_dynamic;
+import org.ovirt.engine.core.common.businessentities.StorageDomainDynamic;
import org.ovirt.engine.core.compat.Guid;
import org.springframework.jdbc.core.namedparam.MapSqlParameterSource;
import org.springframework.jdbc.core.simple.ParameterizedRowMapper;
@@ -12,15 +12,15 @@
public class StorageDomainDynamicDAODbFacadeImpl extends BaseDAODbFacade
implements StorageDomainDynamicDAO{
@Override
- public storage_domain_dynamic get(Guid id) {
+ public StorageDomainDynamic get(Guid id) {
MapSqlParameterSource parameterSource =
getCustomMapSqlParameterSource()
.addValue("id", id);
- ParameterizedRowMapper<storage_domain_dynamic> mapper = new
ParameterizedRowMapper<storage_domain_dynamic>() {
+ ParameterizedRowMapper<StorageDomainDynamic> mapper = new
ParameterizedRowMapper<StorageDomainDynamic>() {
@Override
- public storage_domain_dynamic mapRow(ResultSet rs, int rowNum)
+ public StorageDomainDynamic mapRow(ResultSet rs, int rowNum)
throws SQLException {
- storage_domain_dynamic entity = new storage_domain_dynamic();
+ StorageDomainDynamic entity = new StorageDomainDynamic();
entity.setavailable_disk_size((Integer) rs
.getObject("available_disk_size"));
entity.setId(Guid.createGuidFromString(rs.getString("id")));
@@ -35,7 +35,7 @@
@Override
- public void save(storage_domain_dynamic domain) {
+ public void save(StorageDomainDynamic domain) {
MapSqlParameterSource parameterSource =
getCustomMapSqlParameterSource()
.addValue("available_disk_size",
domain.getavailable_disk_size())
@@ -46,7 +46,7 @@
}
@Override
- public void update(storage_domain_dynamic domain) {
+ public void update(StorageDomainDynamic domain) {
MapSqlParameterSource parameterSource =
getCustomMapSqlParameterSource()
.addValue("available_disk_size",
domain.getavailable_disk_size())
@@ -66,14 +66,14 @@
@Override
- public List<storage_domain_dynamic> getAll() {
+ public List<StorageDomainDynamic> getAll() {
MapSqlParameterSource parameterSource =
getCustomMapSqlParameterSource();
- ParameterizedRowMapper<storage_domain_dynamic> mapper = new
ParameterizedRowMapper<storage_domain_dynamic>() {
+ ParameterizedRowMapper<StorageDomainDynamic> mapper = new
ParameterizedRowMapper<StorageDomainDynamic>() {
@Override
- public storage_domain_dynamic mapRow(ResultSet rs, int rowNum)
+ public StorageDomainDynamic mapRow(ResultSet rs, int rowNum)
throws SQLException {
- storage_domain_dynamic entity = new storage_domain_dynamic();
+ StorageDomainDynamic entity = new StorageDomainDynamic();
entity.setavailable_disk_size((Integer) rs
.getObject("available_disk_size"));
entity.setId(Guid.createGuidFromString(rs.getString("id")));
diff --git
a/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/StorageDomainDynamicDAOHibernateImpl.java
b/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/StorageDomainDynamicDAOHibernateImpl.java
index e7f75d0..81086ee 100644
---
a/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/StorageDomainDynamicDAOHibernateImpl.java
+++
b/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/StorageDomainDynamicDAOHibernateImpl.java
@@ -1,10 +1,10 @@
package org.ovirt.engine.core.dao;
-import org.ovirt.engine.core.common.businessentities.storage_domain_dynamic;
+import org.ovirt.engine.core.common.businessentities.StorageDomainDynamic;
import org.ovirt.engine.core.compat.Guid;
-public class StorageDomainDynamicDAOHibernateImpl extends
BaseDAOHibernateImpl<storage_domain_dynamic, Guid> implements
StorageDomainDynamicDAO {
+public class StorageDomainDynamicDAOHibernateImpl extends
BaseDAOHibernateImpl<StorageDomainDynamic, Guid> implements
StorageDomainDynamicDAO {
public StorageDomainDynamicDAOHibernateImpl() {
- super(storage_domain_dynamic.class);
+ super(StorageDomainDynamic.class);
}
}
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..d4123aa 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
@@ -47,7 +47,7 @@
import org.ovirt.engine.core.common.businessentities.network_cluster;
import org.ovirt.engine.core.common.businessentities.permissions;
import org.ovirt.engine.core.common.businessentities.Role;
-import org.ovirt.engine.core.common.businessentities.storage_domain_dynamic;
+import org.ovirt.engine.core.common.businessentities.StorageDomainDynamic;
import org.ovirt.engine.core.common.businessentities.storage_domain_static;
import org.ovirt.engine.core.common.businessentities.storage_pool;
import org.ovirt.engine.core.common.businessentities.storage_pool_iso_map;
@@ -217,7 +217,7 @@
.addAnnotatedClass(RoleGroupMap.class)
.addAnnotatedClass(Role.class)
.addAnnotatedClass(RoleGroupMap.class)
- .addAnnotatedClass(storage_domain_dynamic.class)
+ .addAnnotatedClass(StorageDomainDynamic.class)
.addAnnotatedClass(storage_domain_static.class)
.addAnnotatedClass(storage_pool.class)
.addAnnotatedClass(storage_pool_iso_map.class)
diff --git
a/backend/manager/modules/dal/src/test/java/org/ovirt/engine/core/dao/StorageDomainDynamicDAOTest.java
b/backend/manager/modules/dal/src/test/java/org/ovirt/engine/core/dao/StorageDomainDynamicDAOTest.java
index 06af757..db93b6d 100644
---
a/backend/manager/modules/dal/src/test/java/org/ovirt/engine/core/dao/StorageDomainDynamicDAOTest.java
+++
b/backend/manager/modules/dal/src/test/java/org/ovirt/engine/core/dao/StorageDomainDynamicDAOTest.java
@@ -5,7 +5,7 @@
import org.junit.Test;
-import org.ovirt.engine.core.common.businessentities.storage_domain_dynamic;
+import org.ovirt.engine.core.common.businessentities.StorageDomainDynamic;
import org.ovirt.engine.core.common.businessentities.storage_domain_static;
import org.ovirt.engine.core.compat.Guid;
@@ -15,9 +15,9 @@
private StorageDomainDynamicDAO dao;
private StorageDomainStaticDAO staticDao;
- private storage_domain_dynamic newDynamicDomain;
+ private StorageDomainDynamic newDynamicDomain;
private storage_domain_static newStaticDomain;
- private storage_domain_dynamic existingDynamic;
+ private StorageDomainDynamic existingDynamic;
@Override
public void setUp() throws Exception {
@@ -30,7 +30,7 @@
newStaticDomain = new storage_domain_static();
newStaticDomain.setstorage("fDMzhE-wx3s-zo3q-Qcxd-T0li-yoYU-QvVePl");
- newDynamicDomain = new storage_domain_dynamic();
+ newDynamicDomain = new StorageDomainDynamic();
newDynamicDomain.setavailable_disk_size(USED_DISK_SIZE);
}
@@ -39,7 +39,7 @@
*/
@Test
public void testGet() {
- storage_domain_dynamic result = dao.get(EXISTING_DOMAIN_ID);
+ StorageDomainDynamic result = dao.get(EXISTING_DOMAIN_ID);
assertNotNull(result);
assertEquals(EXISTING_DOMAIN_ID, result.getId());
@@ -50,7 +50,7 @@
*/
@Test
public void testGetAll() {
- List<storage_domain_dynamic> result = dao.getAll();
+ List<StorageDomainDynamic> result = dao.getAll();
assertNotNull(result);
assertFalse(result.isEmpty());
@@ -65,7 +65,7 @@
newDynamicDomain.setId(newStaticDomain.getId());
dao.save(newDynamicDomain);
- storage_domain_dynamic result = dao.get(newDynamicDomain.getId());
+ StorageDomainDynamic result = dao.get(newDynamicDomain.getId());
assertNotNull(result);
}
@@ -78,7 +78,7 @@
existingDynamic.setused_disk_size(USED_DISK_SIZE);
dao.update(existingDynamic);
- storage_domain_dynamic result = dao.get(existingDynamic.getId());
+ StorageDomainDynamic result = dao.get(existingDynamic.getId());
assertEquals(existingDynamic, result);
}
diff --git
a/backend/manager/modules/utils/src/test/java/org/ovirt/engine/core/utils/serialization/json/JsonObjectSerializationEntitiesTest.java
b/backend/manager/modules/utils/src/test/java/org/ovirt/engine/core/utils/serialization/json/JsonObjectSerializationEntitiesTest.java
index 4674974..885e06c 100644
---
a/backend/manager/modules/utils/src/test/java/org/ovirt/engine/core/utils/serialization/json/JsonObjectSerializationEntitiesTest.java
+++
b/backend/manager/modules/utils/src/test/java/org/ovirt/engine/core/utils/serialization/json/JsonObjectSerializationEntitiesTest.java
@@ -23,7 +23,7 @@
import org.ovirt.engine.core.common.businessentities.VdsDynamic;
import org.ovirt.engine.core.common.businessentities.VdsStatic;
import org.ovirt.engine.core.common.businessentities.VdsStatistics;
-import org.ovirt.engine.core.common.businessentities.storage_domain_dynamic;
+import org.ovirt.engine.core.common.businessentities.StorageDomainDynamic;
import org.ovirt.engine.core.common.businessentities.storage_domain_static;
import org.ovirt.engine.core.common.businessentities.storage_pool;
import org.ovirt.engine.core.common.businessentities.storage_pool_iso_map;
@@ -96,7 +96,7 @@
random.nextString(10),
random.nextInt(StorageDomainType.values().length),
random.nextString(10)) },
- { new storage_domain_dynamic(random.nextInt(),
Guid.NewGuid(), random.nextInt()) },
+ { new StorageDomainDynamic(random.nextInt(),
Guid.NewGuid(), random.nextInt()) },
{ new storage_pool(random.nextString(10),
Guid.NewGuid(),
random.nextString(10),
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..8d7e6ae 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
@@ -72,7 +72,7 @@
<include name="common/businessentities/ServerCpu.java" />
<include name="common/businessentities/SessionState.java" />
<include name="common/businessentities/Snapshot.java" />
- <include
name="common/businessentities/storage_domain_dynamic.java" />
+ <include
name="common/businessentities/StorageDomainDynamic.java" />
<include
name="common/businessentities/storage_domain_static.java" />
<include name="common/businessentities/storage_domains.java" />
<include
name="common/businessentities/storage_pool_iso_map.java" />
--
To view, visit http://gerrit.ovirt.org/10073
To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I6189f8c735a415618d8a3e1b72493c8111dc0a9e
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
