Martin Peřina has uploaded a new change for review. Change subject: core: Unifies testing devices are disks ......................................................................
core: Unifies testing devices are disks Utilizes VmDeviceCommonUtils.isDisk() on all places where testing if device is a disk. Change-Id: Id2678f10e4ef8911e3d59bb9bae69a6eba822895 Signed-off-by: Martin Perina <[email protected]> --- M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/utils/VmDeviceUtils.java M backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/utils/VmDeviceCommonUtils.java M backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/VdsUpdateRunTimeInfo.java 3 files changed, 3 insertions(+), 6 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/58/18158/1 diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/utils/VmDeviceUtils.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/utils/VmDeviceUtils.java index 9c2a237..0504038 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/utils/VmDeviceUtils.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/utils/VmDeviceUtils.java @@ -977,8 +977,7 @@ } private static boolean isDiskOrInterface(VmDevice vmDevice) { - return(vmDevice.getDevice().equals(VmDeviceType.DISK.getName()) - && vmDevice.getType() == VmDeviceGeneralType.DISK) || + return VmDeviceCommonUtils.isDisk(vmDevice) || (vmDevice.getDevice().equals(VmDeviceType.BRIDGE.getName()) && vmDevice.getType() == VmDeviceGeneralType.INTERFACE); } diff --git a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/utils/VmDeviceCommonUtils.java b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/utils/VmDeviceCommonUtils.java index c766b9f..4ea0eee 100644 --- a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/utils/VmDeviceCommonUtils.java +++ b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/utils/VmDeviceCommonUtils.java @@ -181,9 +181,7 @@ int bootOrder, boolean isOldCluster) { for (VmDevice device : devices) { - if (device.getType() == VmDeviceGeneralType.DISK - && device.getDevice().equals( - VmDeviceType.DISK.getName())) { + if (isDisk(device)) { Guid id = device.getDeviceId(); if (id != null && !id.equals(Guid.Empty)) { // gets the image disk 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 5a56b2e..1e4884a 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 @@ -1209,7 +1209,7 @@ } private boolean devicePluggable(VmDevice device) { - return (VmDeviceType.DISK.getName().equals(device.getDevice()) && VmDeviceGeneralType.DISK == device.getType()) + return VmDeviceCommonUtils.isDisk(device) || (VmDeviceType.BRIDGE.getName().equals(device.getDevice()) && VmDeviceGeneralType.INTERFACE == device.getType()); } -- To view, visit http://gerrit.ovirt.org/18158 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Id2678f10e4ef8911e3d59bb9bae69a6eba822895 Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Martin Peřina <[email protected]> _______________________________________________ Engine-patches mailing list [email protected] http://lists.ovirt.org/mailman/listinfo/engine-patches
