Sergey Gotliv has uploaded a new change for review.
Change subject: engine: Remove redundant constant IrsBrokerCommand.BYTES_TO_GB
......................................................................
engine: Remove redundant constant IrsBrokerCommand.BYTES_TO_GB
We have a lot of similar constants across the Engine. BYTES_TO_GB is
one of them. Generic org.ovirt.engine.core.common.utils.SizeConverter
introduces BYTES_IN_GB which can be used instead of
IrsBrokerCommand.BYTES_TO_GB.
Change-Id: I0a3cede172aebab1182dca0ceec901be8553e6ae
Signed-off-by: Sergey Gotliv <sgot...@redhat.com>
---
M
backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/irsbroker/IrsBrokerCommand.java
M
backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/GetDeviceListVDSCommand.java
M
backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/GetStorageDomainStatsVDSCommand.java
M
backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/GetVGListVDSCommand.java
4 files changed, 8 insertions(+), 6 deletions(-)
git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/14/21314/1
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 6a2c3e1..4649a13 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
@@ -85,7 +85,6 @@
import org.ovirt.engine.core.vdsbroker.xmlrpc.XmlRpcUtils;
@Logged(errorLevel = LogLevel.ERROR)
public abstract class IrsBrokerCommand<P extends IrsBaseVDSCommandParameters>
extends BrokerCommandBase<P> {
- public static final long BYTES_TO_GB = 1024 * 1024 * 1024;
private static Map<Guid, IrsProxyData> _irsProxyData = new
ConcurrentHashMap<Guid, IrsProxyData>();
/**
diff --git
a/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/GetDeviceListVDSCommand.java
b/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/GetDeviceListVDSCommand.java
index 9b891d3..6df08a1 100644
---
a/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/GetDeviceListVDSCommand.java
+++
b/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/GetDeviceListVDSCommand.java
@@ -9,6 +9,7 @@
import org.ovirt.engine.core.common.businessentities.StorageType;
import org.ovirt.engine.core.common.businessentities.StorageServerConnections;
import org.ovirt.engine.core.common.utils.EnumUtils;
+import org.ovirt.engine.core.common.utils.SizeConverter;
import
org.ovirt.engine.core.common.vdscommands.GetDeviceListVDSCommandParameters;
import org.ovirt.engine.core.vdsbroker.irsbroker.IrsBrokerCommand;
@@ -114,7 +115,7 @@
size = IrsBrokerCommand.AssignLongValue(xlun, "capacity");
}
if (size != null) {
- lun.setDeviceSize((int) (size / IrsBrokerCommand.BYTES_TO_GB));
+ lun.setDeviceSize((int) (size / SizeConverter.BYTES_IN_GB));
}
if (xlun.containsKey("vendorID")) {
lun.setVendorName(xlun.get("vendorID").toString());
diff --git
a/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/GetStorageDomainStatsVDSCommand.java
b/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/GetStorageDomainStatsVDSCommand.java
index 83162d7..b0c9987 100644
---
a/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/GetStorageDomainStatsVDSCommand.java
+++
b/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/GetStorageDomainStatsVDSCommand.java
@@ -8,6 +8,7 @@
import org.ovirt.engine.core.common.businessentities.StorageDomain;
import org.ovirt.engine.core.common.errors.VdcBllErrors;
import org.ovirt.engine.core.common.utils.EnumUtils;
+import org.ovirt.engine.core.common.utils.SizeConverter;
import
org.ovirt.engine.core.common.vdscommands.GetStorageDomainStatsVDSCommandParameters;
import org.ovirt.engine.core.utils.log.Log;
import org.ovirt.engine.core.utils.log.LogFactory;
@@ -49,10 +50,10 @@
}
}
Long size = IrsBrokerCommand.AssignLongValue(xmlRpcStruct,
"diskfree");
- domain.setAvailableDiskSize((size == null) ? null : (int) (size /
IrsBrokerCommand.BYTES_TO_GB));
+ domain.setAvailableDiskSize((size == null) ? null : (int) (size /
SizeConverter.BYTES_IN_GB));
size = IrsBrokerCommand.AssignLongValue(xmlRpcStruct, "disktotal");
domain.setUsedDiskSize((size == null ||
domain.getAvailableDiskSize() == null) ? null :
- (int) (size / IrsBrokerCommand.BYTES_TO_GB) -
domain.getAvailableDiskSize());
+ (int) (size / SizeConverter.BYTES_IN_GB) -
domain.getAvailableDiskSize());
if (xmlRpcStruct.containsKey("alerts")) {
Object[] rawAlerts = (Object[]) xmlRpcStruct.get("alerts");
Set<VdcBllErrors> alerts = new
HashSet<VdcBllErrors>(rawAlerts.length);
diff --git
a/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/GetVGListVDSCommand.java
b/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/GetVGListVDSCommand.java
index 7be468c..a1c92cc 100644
---
a/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/GetVGListVDSCommand.java
+++
b/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/GetVGListVDSCommand.java
@@ -5,6 +5,7 @@
import org.ovirt.engine.core.common.businessentities.StorageType;
import org.ovirt.engine.core.common.businessentities.StorageDomain;
import org.ovirt.engine.core.common.utils.EnumUtils;
+import org.ovirt.engine.core.common.utils.SizeConverter;
import org.ovirt.engine.core.common.vdscommands.VdsIdVDSCommandParametersBase;
import org.ovirt.engine.core.compat.Guid;
import org.ovirt.engine.core.vdsbroker.irsbroker.IrsBrokerCommand;
@@ -43,11 +44,11 @@
sDomain.setStorage(vg.get("vgUUID").toString());
Long size = IrsBrokerCommand.AssignLongValue(vg, "vgfree");
if (size != null) {
- sDomain.setAvailableDiskSize((int) (size /
IrsBrokerCommand.BYTES_TO_GB));
+ sDomain.setAvailableDiskSize((int) (size /
SizeConverter.BYTES_IN_GB));
}
size = IrsBrokerCommand.AssignLongValue(vg, "vgsize");
if (size != null && sDomain.getAvailableDiskSize() != null) {
- sDomain.setUsedDiskSize((int) (size /
IrsBrokerCommand.BYTES_TO_GB)
+ sDomain.setUsedDiskSize((int) (size /
SizeConverter.BYTES_IN_GB)
- sDomain.getAvailableDiskSize());
}
if (vg.containsKey("vgtype")) {
--
To view, visit http://gerrit.ovirt.org/21314
To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I0a3cede172aebab1182dca0ceec901be8553e6ae
Gerrit-PatchSet: 1
Gerrit-Project: ovirt-engine
Gerrit-Branch: master
Gerrit-Owner: Sergey Gotliv <sgot...@redhat.com>
_______________________________________________
Engine-patches mailing list
Engine-patches@ovirt.org
http://lists.ovirt.org/mailman/listinfo/engine-patches
