Tal Nisan has uploaded a new change for review.
Change subject: core: Update StorageDomainDynamic methods to fit Java standard
......................................................................
core: Update StorageDomainDynamic methods to fit Java standard
Change-Id: Iee809cf4a74fb2f87686748914e6e9f2dc3af5bd
Signed-off-by: Tal Nisan <tni...@redhat.com>
---
M
backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/DeactivateStorageDomainCommand.java
M
backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/TestHelperImportVmTemplateCommand.java
M
backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/StorageDomain.java
M
backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/StorageDomainDynamic.java
M
backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/StorageDomainDynamicDAODbFacadeImpl.java
M
backend/manager/modules/dal/src/test/java/org/ovirt/engine/core/dao/StorageDomainDynamicDAOTest.java
6 files changed, 35 insertions(+), 36 deletions(-)
git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/01/12101/1
diff --git
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/DeactivateStorageDomainCommand.java
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/DeactivateStorageDomainCommand.java
index 2437c9f..2f80993 100644
---
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/DeactivateStorageDomainCommand.java
+++
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/DeactivateStorageDomainCommand.java
@@ -176,8 +176,8 @@
StoragePoolStatusHandler.PoolStatusChanged(getStoragePool().getId(),
getStoragePool().getstatus());
runSynchronizeOperation(new
DisconnectStoragePoolAsyncOperationFactory());
-
getStorageDomain().getStorageDynamicData().setavailable_disk_size(null);
- getStorageDomain().getStorageDynamicData().setused_disk_size(null);
+
getStorageDomain().getStorageDynamicData().setAvailableDiskSize(null);
+ getStorageDomain().getStorageDynamicData().setUsedDiskSize(null);
}
if (!getParameters().isInactive()) {
runVdsCommand(VDSCommandType.DeactivateStorageDomain,
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 38b2ca1..11d69f1 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
@@ -50,8 +50,8 @@
final StorageDomainDAO d = mock(StorageDomainDAO.class);
when(d.getForStoragePool(any(Guid.class),
any(Guid.class))).thenReturn(destination);
StorageDomainDynamic dy = new StorageDomainDynamic();
- dy.setavailable_disk_size(10);
- dy.setused_disk_size(0);
+ dy.setAvailableDiskSize(10);
+ dy.setUsedDiskSize(0);
destination.setStorageDynamicData(dy);
return d;
}
diff --git
a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/StorageDomain.java
b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/StorageDomain.java
index 9fb3551..5ab664e 100644
---
a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/StorageDomain.java
+++
b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/StorageDomain.java
@@ -136,11 +136,11 @@
}
public Integer getAvailableDiskSize() {
- return getStorageDynamicData().getavailable_disk_size();
+ return getStorageDynamicData().getAvailableDiskSize();
}
public void setAvailableDiskSize(Integer availableDiskSize) {
- getStorageDynamicData().setavailable_disk_size(availableDiskSize);
+ getStorageDynamicData().setAvailableDiskSize(availableDiskSize);
UpdateTotalDiskSize();
updateOverCommitPercent();
}
@@ -173,17 +173,17 @@
}
public Integer getUsedDiskSize() {
- return getStorageDynamicData().getused_disk_size();
+ return getStorageDynamicData().getUsedDiskSize();
}
public void setUsedDiskSize(Integer usedDiskSize) {
- getStorageDynamicData().setused_disk_size(usedDiskSize);
+ getStorageDynamicData().setUsedDiskSize(usedDiskSize);
UpdateTotalDiskSize();
}
private void UpdateTotalDiskSize() {
- Integer available = getStorageDynamicData().getavailable_disk_size();
- Integer used = getStorageDynamicData().getused_disk_size();
+ Integer available = getStorageDynamicData().getAvailableDiskSize();
+ Integer used = getStorageDynamicData().getUsedDiskSize();
if (available != null && used != null) {
setTotalDiskSize(available + used);
diff --git
a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/StorageDomainDynamic.java
b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/StorageDomainDynamic.java
index 8e05f9b..762d491 100644
---
a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/StorageDomainDynamic.java
+++
b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/StorageDomainDynamic.java
@@ -8,27 +8,27 @@
public StorageDomainDynamic() {
}
- public StorageDomainDynamic(Integer available_disk_size, Guid id, Integer
used_disk_size) {
- this.availableDiskSize = available_disk_size;
+ public StorageDomainDynamic(Integer availableDiskSize, Guid id, Integer
usedDiskSize) {
+ this.availableDiskSize = availableDiskSize;
this.id = id;
- this.usedDiskSize = used_disk_size;
+ this.usedDiskSize = usedDiskSize;
}
private Integer availableDiskSize = 0;
- public Integer getavailable_disk_size() {
- return this.availableDiskSize;
+ public Integer getAvailableDiskSize() {
+ return availableDiskSize;
}
- public void setavailable_disk_size(Integer value) {
- this.availableDiskSize = value;
+ public void setAvailableDiskSize(Integer availableDiskSize) {
+ this.availableDiskSize = availableDiskSize;
}
private Guid id = new Guid();
@Override
public Guid getId() {
- return this.id;
+ return id;
}
@Override
@@ -38,23 +38,23 @@
private Integer usedDiskSize = 0;
- public Integer getused_disk_size() {
- return this.usedDiskSize;
+ public Integer getUsedDiskSize() {
+ return usedDiskSize;
}
- public void setused_disk_size(Integer value) {
- this.usedDiskSize = value;
+ public void setUsedDiskSize(Integer usedDiskSize) {
+ this.usedDiskSize = usedDiskSize;
}
public double getfreeDiskPercent() {
- int usedDiskSize = getused_disk_size() == null ? 0 :
getused_disk_size();
- int availableDiskSize = getavailable_disk_size() == null ? 0 :
getavailable_disk_size();
+ int usedDiskSize = getUsedDiskSize() == null ? 0 : getUsedDiskSize();
+ int availableDiskSize = getAvailableDiskSize() == null ? 0 :
getAvailableDiskSize();
double totalSize = usedDiskSize + availableDiskSize;
return totalSize != 0 ? (availableDiskSize / totalSize) * 100 : 0.0;
}
public int getfreeDiskInGB() {
- int availableDiskSize = getavailable_disk_size() == null ? 0 :
getavailable_disk_size();
+ int availableDiskSize = getAvailableDiskSize() == null ? 0 :
getAvailableDiskSize();
return availableDiskSize;
}
@@ -102,5 +102,4 @@
return false;
return true;
}
-
}
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 a5f9c68..27e9494 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
@@ -21,10 +21,10 @@
public StorageDomainDynamic mapRow(ResultSet rs, int rowNum)
throws SQLException {
StorageDomainDynamic entity = new StorageDomainDynamic();
- entity.setavailable_disk_size((Integer) rs
+ entity.setAvailableDiskSize((Integer) rs
.getObject("available_disk_size"));
entity.setId(Guid.createGuidFromString(rs.getString("id")));
- entity.setused_disk_size((Integer) rs
+ entity.setUsedDiskSize((Integer) rs
.getObject("used_disk_size"));
return entity;
}
@@ -38,9 +38,9 @@
public void save(StorageDomainDynamic domain) {
MapSqlParameterSource parameterSource =
getCustomMapSqlParameterSource()
.addValue("available_disk_size",
- domain.getavailable_disk_size())
+ domain.getAvailableDiskSize())
.addValue("id", domain.getId())
- .addValue("used_disk_size", domain.getused_disk_size());
+ .addValue("used_disk_size", domain.getUsedDiskSize());
getCallsHandler().executeModification("Insertstorage_domain_dynamic",
parameterSource);
}
@@ -49,9 +49,9 @@
public void update(StorageDomainDynamic domain) {
MapSqlParameterSource parameterSource =
getCustomMapSqlParameterSource()
.addValue("available_disk_size",
- domain.getavailable_disk_size())
+ domain.getAvailableDiskSize())
.addValue("id", domain.getId())
- .addValue("used_disk_size", domain.getused_disk_size());
+ .addValue("used_disk_size", domain.getUsedDiskSize());
getCallsHandler().executeModification("Updatestorage_domain_dynamic",
parameterSource);
}
@@ -74,10 +74,10 @@
public StorageDomainDynamic mapRow(ResultSet rs, int rowNum)
throws SQLException {
StorageDomainDynamic entity = new StorageDomainDynamic();
- entity.setavailable_disk_size((Integer) rs
+ entity.setAvailableDiskSize((Integer) rs
.getObject("available_disk_size"));
entity.setId(Guid.createGuidFromString(rs.getString("id")));
- entity.setused_disk_size((Integer) rs
+ entity.setUsedDiskSize((Integer) rs
.getObject("used_disk_size"));
return entity;
}
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 69ed8c7..a985b4b 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
@@ -31,7 +31,7 @@
newStaticDomain = new StorageDomainStatic();
newStaticDomain.setStorage("fDMzhE-wx3s-zo3q-Qcxd-T0li-yoYU-QvVePl");
newDynamicDomain = new StorageDomainDynamic();
- newDynamicDomain.setavailable_disk_size(USED_DISK_SIZE);
+ newDynamicDomain.setAvailableDiskSize(USED_DISK_SIZE);
}
/**
@@ -75,7 +75,7 @@
*/
@Test
public void testUpdate() {
- existingDynamic.setused_disk_size(USED_DISK_SIZE);
+ existingDynamic.setUsedDiskSize(USED_DISK_SIZE);
dao.update(existingDynamic);
StorageDomainDynamic result = dao.get(existingDynamic.getId());
--
To view, visit http://gerrit.ovirt.org/12101
To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Iee809cf4a74fb2f87686748914e6e9f2dc3af5bd
Gerrit-PatchSet: 1
Gerrit-Project: ovirt-engine
Gerrit-Branch: master
Gerrit-Owner: Tal Nisan <tni...@redhat.com>
_______________________________________________
Engine-patches mailing list
Engine-patches@ovirt.org
http://lists.ovirt.org/mailman/listinfo/engine-patches
