Allon Mureinik has uploaded a new change for review. Change subject: core: VdsDynamic: [get|set]status->[get|set]Status ......................................................................
core: VdsDynamic: [get|set]status->[get|set]Status Ranamed getstatus() and setstatus(VdsStatus) to getStatus() and setStatus(VdsStatus) in the VdsDynamic class, as per the proper Java convention. Change-Id: Ifeb38f61fca9f5d92b168dd2e864e780ea46f762 Signed-off-by: Allon Mureinik <[email protected]> --- M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/AddVdsCommand.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/FenceExecutor.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/UpdateVdsCommand.java M backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/VDS.java M backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/VdsDynamic.java M backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/VdsDynamicDAODbFacadeImpl.java M backend/manager/modules/dal/src/test/java/org/ovirt/engine/core/dao/VdsDynamicDAOTest.java M backend/manager/modules/utils/src/test/java/org/ovirt/engine/core/utils/serialization/json/JsonObjectSerializationEntitiesTest.java M backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/VdsUpdateRunTimeInfo.java M backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/irsbroker/IrsBrokerCommand.java 10 files changed, 16 insertions(+), 16 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/56/18856/1 diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/AddVdsCommand.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/AddVdsCommand.java index d51f6a9..6f60124 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/AddVdsCommand.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/AddVdsCommand.java @@ -273,9 +273,9 @@ // TODO: oVirt type - here oVirt behaves like power client? if (Config.<Boolean> GetValue(ConfigValues.InstallVds) && getParameters().getVdsStaticData().getVdsType() == VDSType.VDS) { - vdsDynamic.setstatus(VDSStatus.Installing); + vdsDynamic.setStatus(VDSStatus.Installing); } else if (getParameters().getAddPending()) { - vdsDynamic.setstatus(VDSStatus.PendingApproval); + vdsDynamic.setStatus(VDSStatus.PendingApproval); } DbFacade.getInstance().getVdsDynamicDao().save(vdsDynamic); getCompensationContext().snapshotNewEntity(vdsDynamic); diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/FenceExecutor.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/FenceExecutor.java index 0e3f67d..b7b746d 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/FenceExecutor.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/FenceExecutor.java @@ -275,7 +275,7 @@ private boolean isHostNetworkUnreacable(VDS vds) { VdsDynamic vdsDynamic = vds.getDynamicData(); - return ((vdsDynamic.getstatus() == VDSStatus.Reboot) || (vdsDynamic.getstatus() == VDSStatus.NonOperational && vdsDynamic.getNonOperationalReason() == NonOperationalReason.NETWORK_UNREACHABLE)); + return ((vdsDynamic.getStatus() == VDSStatus.Reboot) || (vdsDynamic.getStatus() == VDSStatus.NonOperational && vdsDynamic.getNonOperationalReason() == NonOperationalReason.NETWORK_UNREACHABLE)); } private VDS getFenceProxy(final boolean onlyUpHost, final boolean filterSelf, final PMProxyOptions proxyOptions) { diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/UpdateVdsCommand.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/UpdateVdsCommand.java index d43876e..fa8ed65 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/UpdateVdsCommand.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/UpdateVdsCommand.java @@ -169,7 +169,7 @@ // add old vds dynamic data to compensation context. This // way the status will revert back to what it was before // starting installation process - getCompensationContext().snapshotEntityStatus(_oldVds.getDynamicData(), _oldVds.getDynamicData().getstatus()); + getCompensationContext().snapshotEntityStatus(_oldVds.getDynamicData(), _oldVds.getDynamicData().getStatus()); getCompensationContext().stateChanged(); return; } diff --git a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/VDS.java b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/VDS.java index b1d7a26..ad193f9 100644 --- a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/VDS.java +++ b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/VDS.java @@ -362,12 +362,12 @@ @Override public VDSStatus getStatus() { - return this.mVdsDynamic.getstatus(); + return this.mVdsDynamic.getStatus(); } @Override public void setStatus(VDSStatus value) { - this.mVdsDynamic.setstatus(value); + this.mVdsDynamic.setStatus(value); } public Integer getCpuCores() { diff --git a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/VdsDynamic.java b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/VdsDynamic.java index 7bd2e83..b079a4e 100644 --- a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/VdsDynamic.java +++ b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/VdsDynamic.java @@ -238,11 +238,11 @@ this.physical_mem_mb = value; } - public VDSStatus getstatus() { + public VDSStatus getStatus() { return status; } - public void setstatus(VDSStatus value) { + public void setStatus(VDSStatus value) { this.status = value; } diff --git a/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/VdsDynamicDAODbFacadeImpl.java b/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/VdsDynamicDAODbFacadeImpl.java index 82389b4..bda9460 100644 --- a/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/VdsDynamicDAODbFacadeImpl.java +++ b/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/VdsDynamicDAODbFacadeImpl.java @@ -41,7 +41,7 @@ entity.setmem_commited((Integer) rs.getObject("mem_commited")); entity.setphysical_mem_mb((Integer) rs .getObject("physical_mem_mb")); - entity.setstatus(VDSStatus.forValue(rs.getInt("status"))); + entity.setStatus(VDSStatus.forValue(rs.getInt("status"))); entity.setId(getGuidDefaultEmpty(rs, "vds_id")); entity.setvm_active((Integer) rs.getObject("vm_active")); entity.setvm_count(rs.getInt("vm_count")); @@ -110,7 +110,7 @@ .addValue("kvm_enabled", vds.getkvm_enabled()) .addValue("mem_commited", vds.getmem_commited()) .addValue("physical_mem_mb", vds.getphysical_mem_mb()) - .addValue("status", vds.getstatus()) + .addValue("status", vds.getStatus()) .addValue("vds_id", vds.getId()) .addValue("vm_active", vds.getvm_active()) .addValue("vm_count", vds.getvm_count()) @@ -168,7 +168,7 @@ .addValue("kvm_enabled", vds.getkvm_enabled()) .addValue("mem_commited", vds.getmem_commited()) .addValue("physical_mem_mb", vds.getphysical_mem_mb()) - .addValue("status", vds.getstatus()) + .addValue("status", vds.getStatus()) .addValue("vds_id", vds.getId()) .addValue("vm_active", vds.getvm_active()) .addValue("vm_count", vds.getvm_count()) diff --git a/backend/manager/modules/dal/src/test/java/org/ovirt/engine/core/dao/VdsDynamicDAOTest.java b/backend/manager/modules/dal/src/test/java/org/ovirt/engine/core/dao/VdsDynamicDAOTest.java index a50e12c..8b07ffc 100644 --- a/backend/manager/modules/dal/src/test/java/org/ovirt/engine/core/dao/VdsDynamicDAOTest.java +++ b/backend/manager/modules/dal/src/test/java/org/ovirt/engine/core/dao/VdsDynamicDAOTest.java @@ -90,8 +90,8 @@ @Test public void testUpdateStatus() { VdsDynamic before = dao.get(existingVds.getId()); - before.setstatus(VDSStatus.Down); - dao.updateStatus(before.getId(), before.getstatus()); + before.setStatus(VDSStatus.Down); + dao.updateStatus(before.getId(), before.getStatus()); VdsDynamic after = dao.get(existingVds.getId()); assertEquals(before, after); } 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 139f400..bd373ec 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 @@ -112,7 +112,7 @@ vdsDynamic.setkvm_enabled(random.nextBoolean()); vdsDynamic.setmem_commited(random.nextInt()); vdsDynamic.setphysical_mem_mb(random.nextInt()); - vdsDynamic.setstatus(random.nextEnum(VDSStatus.class)); + vdsDynamic.setStatus(random.nextEnum(VDSStatus.class)); vdsDynamic.setId(Guid.newGuid()); vdsDynamic.setvm_active(random.nextInt()); vdsDynamic.setvm_count(random.nextInt()); diff --git a/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/VdsUpdateRunTimeInfo.java b/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/VdsUpdateRunTimeInfo.java index 4c5a266..6e9706a 100644 --- a/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/VdsUpdateRunTimeInfo.java +++ b/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/VdsUpdateRunTimeInfo.java @@ -515,7 +515,7 @@ private void markIsSetNonOperationalExecuted() { if (!_vdsManager.isSetNonOperationalExecuted()) { VdsDynamic vdsDynamic = getDbFacade().getVdsDynamicDao().get(_vds.getId()); - if (vdsDynamic.getstatus() == VDSStatus.NonOperational) { + if (vdsDynamic.getStatus() == VDSStatus.NonOperational) { _vdsManager.setIsSetNonOperationalExecuted(true); } } diff --git a/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/irsbroker/IrsBrokerCommand.java b/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/irsbroker/IrsBrokerCommand.java index b089357..64935d0 100644 --- a/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/irsbroker/IrsBrokerCommand.java +++ b/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/irsbroker/IrsBrokerCommand.java @@ -770,7 +770,7 @@ int total = 0; Integer maxSecToWait = Config.GetValue(ConfigValues.WaitForVdsInitInSec); while (total <= maxSecToWait - && DbFacade.getInstance().getVdsDynamicDao().get(curVdsId).getstatus() == VDSStatus.Initializing) { + && DbFacade.getInstance().getVdsDynamicDao().get(curVdsId).getStatus() == VDSStatus.Initializing) { try { Thread.sleep(DELAY * 1000); } catch (InterruptedException e) { -- To view, visit http://gerrit.ovirt.org/18856 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ifeb38f61fca9f5d92b168dd2e864e780ea46f762 Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Allon Mureinik <[email protected]> _______________________________________________ Engine-patches mailing list [email protected] http://lists.ovirt.org/mailman/listinfo/engine-patches
