[Engine-patches] Change in ovirt-engine[master]: core: fix a utils method to detect compat level lower than 3...

[rgolan]

Roy Golan has uploaded a new change for review.

Change subject: core: fix a utils method to detect compat level lower than 3.1
......................................................................

core: fix a utils method to detect compat level lower than 3.1

Change-Id: Ie9b8325bb1999af689a167709f2a8c3d3855e84e
Signed-off-by: Roy Golan <rgo...@redhat.com>
---
M 
backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/utils/VmDeviceCommonUtils.java
A 
backend/manager/modules/common/src/test/java/org/ovirt/engine/core/common/utils/VmDeviceCommonUtilsTest.java
2 files changed, 24 insertions(+), 1 deletion(-)


  git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/49/8349/1

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 7fa4584..531d9ed 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
@@ -248,8 +248,14 @@
         return ret;
     }
 
+    /**
+     * "old" level is considered anything lower than 3.1 at the moment
+     *
+     * @param version
+     * @return
+     */
     public static boolean isOldClusterVersion(Version version) {
-        return (!(version.getMajor() >= 3 && version.getMinor() >= 1));
+        return (version.compareTo(Version.v3_1) < 0);
     }
 
     public static boolean isInWhiteList(String type, String device) {
diff --git 
a/backend/manager/modules/common/src/test/java/org/ovirt/engine/core/common/utils/VmDeviceCommonUtilsTest.java
 
b/backend/manager/modules/common/src/test/java/org/ovirt/engine/core/common/utils/VmDeviceCommonUtilsTest.java
new file mode 100644
index 0000000..f3c8ae3
--- /dev/null
+++ 
b/backend/manager/modules/common/src/test/java/org/ovirt/engine/core/common/utils/VmDeviceCommonUtilsTest.java
@@ -0,0 +1,17 @@
+package org.ovirt.engine.core.common.utils;
+
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
+
+import org.junit.Test;
+import org.ovirt.engine.core.compat.Version;
+
+public class VmDeviceCommonUtilsTest {
+
+    @Test
+    public void isOldClusterLevel() {
+        assertTrue(VmDeviceCommonUtils.isOldClusterVersion(Version.v3_0));
+        assertFalse(VmDeviceCommonUtils.isOldClusterVersion(Version.v3_1));
+        assertFalse(VmDeviceCommonUtils.isOldClusterVersion(new 
Version("4.0")));
+    }
+}


--
To view, visit http://gerrit.ovirt.org/8349
To unsubscribe, visit http://gerrit.ovirt.org/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ie9b8325bb1999af689a167709f2a8c3d3855e84e
Gerrit-PatchSet: 1
Gerrit-Project: ovirt-engine
Gerrit-Branch: master
Gerrit-Owner: Roy Golan <rgo...@redhat.com>
_______________________________________________
Engine-patches mailing list
Engine-patches@ovirt.org
http://lists.ovirt.org/mailman/listinfo/engine-patches