Alona Kaplan has uploaded a new change for review. Change subject: engine: Fix unit tests that were broken by multiple gateways ......................................................................
engine: Fix unit tests that were broken by multiple gateways Multiple gateways feature broke two unit test. 1. In SetupNetworkHelper gateway validation now checks the ConfigValues.MultipleGatewaysSupported- a mock was added to fix the test. 2. Gateway validation was removed from NetworkInterfaceValidator- to fix the test I removed the case that was testing this validation. Change-Id: I1d453ea1efe736dd16dea9b793d784bee4225af8 Signed-off-by: Alona Kaplan <[email protected]> --- M backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/SetupNetworksParametersTest.java M backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/network/host/SetupNetworksHelperTest.java 2 files changed, 9 insertions(+), 8 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/93/15493/1 diff --git a/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/SetupNetworksParametersTest.java b/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/SetupNetworksParametersTest.java index e0e1d7a..0cfb457 100644 --- a/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/SetupNetworksParametersTest.java +++ b/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/SetupNetworksParametersTest.java @@ -1,6 +1,5 @@ package org.ovirt.engine.core.bll; -import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertTrue; import static org.ovirt.engine.core.common.businessentities.network.NetworkBootProtocol.STATIC_IP; import static org.ovirt.engine.core.utils.MockConfigRule.mockConfig; @@ -29,13 +28,9 @@ VdsNetworkInterface nic = new VdsNetworkInterface(); params.setInterfaces(Arrays.asList(nic)); - nic.setNetworkName("otherThenMgmtNetwork"); - nic.setGateway("1.1.1.1"); - Validator validator = ValidationUtils.getValidator(); - assertFalse(validator.validate(params).isEmpty()); - + nic.setNetworkName("netName"); nic.setGateway(""); nic.setBootProtocol(STATIC_IP); nic.setAddress("1.1.1.1"); diff --git a/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/network/host/SetupNetworksHelperTest.java b/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/network/host/SetupNetworksHelperTest.java index 61911ec..9aaaaad 100644 --- a/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/network/host/SetupNetworksHelperTest.java +++ b/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/network/host/SetupNetworksHelperTest.java @@ -30,6 +30,7 @@ import org.ovirt.engine.core.common.config.ConfigValues; import org.ovirt.engine.core.common.errors.VdcBllMessages; import org.ovirt.engine.core.compat.Guid; +import org.ovirt.engine.core.compat.Version; import org.ovirt.engine.core.dal.dbbroker.DbFacade; import org.ovirt.engine.core.dao.VdsDAO; import org.ovirt.engine.core.dao.network.InterfaceDao; @@ -45,7 +46,8 @@ @Rule public static MockConfigRule mcr = new MockConfigRule(mockConfig(ConfigValues.ManagementNetwork, - MANAGEMENT_NETWORK_NAME)); + MANAGEMENT_NETWORK_NAME), + mockConfig(ConfigValues.MultipleGatewaysSupported, Version.v3_3.toString(), true)); @Mock private NetworkDao networkDAO; @@ -172,7 +174,11 @@ mockExistingIfaces(nic); nic.setGateway(RandomUtils.instance().nextString(10)); - SetupNetworksHelper helper = createHelper(createParametersForNics(nic)); + VDS vds = mock(VDS.class); + when(vds.getId()).thenReturn(Guid.Empty); + when(vds.getVdsGroupCompatibilityVersion()).thenReturn(Version.v3_3); + + SetupNetworksHelper helper = createHelper(createParametersForNics(nic), vds); validateAndAssertNetworkModified(helper, net); } -- To view, visit http://gerrit.ovirt.org/15493 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I1d453ea1efe736dd16dea9b793d784bee4225af8 Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Alona Kaplan <[email protected]> _______________________________________________ Engine-patches mailing list [email protected] http://lists.ovirt.org/mailman/listinfo/engine-patches
