Eli Mesika has posted comments on this change. Change subject: core: Host's Compatibility Version doesn't match the Cluster's Compatibility Version ......................................................................
Patch Set 2: (5 comments) http://gerrit.ovirt.org/#/c/26061/2/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/HandleVdsVersionCommandTest.java File backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/HandleVdsVersionCommandTest.java: Line 47: private VDS vds; Line 48: Line 49: @ClassRule Line 50: public static final MockConfigRule mcr = new MockConfigRule( Line 51: mockConfig(ConfigValues.VdcVersion, "general", "3.4")); see please my patch http://gerrit.ovirt.org/#/c/26145/3/backend/manager/modules/compat/src/main/java/org/ovirt/engine/core/compat/Version.java,cm The idea is not to have those value as fixed values, rather , we can take them from he Version class Line 52: Line 53: @Test Line 54: public void supportedVdsm() { Line 55: mockVds(Version.ALL); Line 83: command.executeCommand(); Line 84: assertTrue(command.getSucceeded()); Line 85: Mockito.verify(command, Mockito.times(1)) Line 86: .reportNonOperationReason(NonOperationalReason.VERSION_INCOMPATIBLE_WITH_CLUSTER, Line 87: "3.4", same Line 88: new Version(vds.getVersion().getMajor(), vds.getVersion().getMinor()).toString()); Line 89: } Line 90: Line 91: protected HandleVdsVersionCommand<VdsActionParameters> createCommand() { Line 106: vds = Mockito.mock(VDS.class); Line 107: HashSet<Version> supportedVersions = new HashSet<>(); Line 108: supportedVersions.addAll(versions); Line 109: doReturn(supportedVersions).when(vds).getSupportedENGINESVersionsSet(); Line 110: doReturn(new RpmVersion("libvirt-0.9.10-21.el6_3.4", "libvirt-", true)).when(vds).getVersion(); same Line 111: doReturn("34").when(vds).getSupportedEngines(); Line 112: doReturn("34").when(vds).getSupportedClusterLevels(); Line 113: doReturn(supportedVersions).when(vds).getSupportedClusterVersionsSet(); Line 114: Line 107: HashSet<Version> supportedVersions = new HashSet<>(); Line 108: supportedVersions.addAll(versions); Line 109: doReturn(supportedVersions).when(vds).getSupportedENGINESVersionsSet(); Line 110: doReturn(new RpmVersion("libvirt-0.9.10-21.el6_3.4", "libvirt-", true)).when(vds).getVersion(); Line 111: doReturn("34").when(vds).getSupportedEngines(); same Line 112: doReturn("34").when(vds).getSupportedClusterLevels(); Line 113: doReturn(supportedVersions).when(vds).getSupportedClusterVersionsSet(); Line 114: Line 115: doReturn(vdsDao).when(command).getVdsDAO(); Line 108: supportedVersions.addAll(versions); Line 109: doReturn(supportedVersions).when(vds).getSupportedENGINESVersionsSet(); Line 110: doReturn(new RpmVersion("libvirt-0.9.10-21.el6_3.4", "libvirt-", true)).when(vds).getVersion(); Line 111: doReturn("34").when(vds).getSupportedEngines(); Line 112: doReturn("34").when(vds).getSupportedClusterLevels(); same Line 113: doReturn(supportedVersions).when(vds).getSupportedClusterVersionsSet(); Line 114: Line 115: doReturn(vdsDao).when(command).getVdsDAO(); Line 116: when(vdsDao.get(Mockito.any(Guid.class))).thenReturn(vds); -- To view, visit http://gerrit.ovirt.org/26061 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I1a899462ce3d74f3b1570a23c10ce38aeae1a18e Gerrit-PatchSet: 2 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Liran Zelkha <[email protected]> Gerrit-Reviewer: Barak Azulay <[email protected]> Gerrit-Reviewer: Dan Kenigsberg <[email protected]> Gerrit-Reviewer: Eli Mesika <[email protected]> Gerrit-Reviewer: Liran Zelkha <[email protected]> Gerrit-Reviewer: Yaniv Bronhaim <[email protected]> Gerrit-Reviewer: [email protected] Gerrit-Reviewer: oVirt Jenkins CI Server Gerrit-HasComments: Yes _______________________________________________ Engine-patches mailing list [email protected] http://lists.ovirt.org/mailman/listinfo/engine-patches
