Moti Asayag has uploaded a new change for review. Change subject: core: Improve unit-tests for MTU differences(#852052) ......................................................................
core: Improve unit-tests for MTU differences(#852052) The patch improves MTU differences tests. Change-Id: Ibf2ee87d2d95f814898edd06ca3a3c37309c34ab Signed-off-by: Moti Asayag <[email protected]> --- M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/SetupNetworksHelper.java M backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/SetupNetworksHelperTest.java M backend/manager/modules/utils/src/main/java/org/ovirt/engine/core/utils/NetworkUtils.java 3 files changed, 34 insertions(+), 19 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/28/7728/1 diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/SetupNetworksHelper.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/SetupNetworksHelper.java index 04cf641..e1b1d05 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/SetupNetworksHelper.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/SetupNetworksHelper.java @@ -113,7 +113,7 @@ for (Network net : networksOnInterface) { checkedNetworks.add(net.getName()); if (net.getMtu() != network.getMtu() - && (NetworkUtils.isNonVmNetworkWithNoVlan(network) || NetworkUtils.isNonVmNetworkWithNoVlan(net))) { + && (NetworkUtils.isNonVmNonVlanNetwork(network) || NetworkUtils.isNonVmNonVlanNetwork(net))) { mtuMismatched = true; } } diff --git a/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/SetupNetworksHelperTest.java b/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/SetupNetworksHelperTest.java index adeac63..6784f34 100644 --- a/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/SetupNetworksHelperTest.java +++ b/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/SetupNetworksHelperTest.java @@ -827,8 +827,7 @@ mockExistingNetworks(net, newNet); VdsNetworkInterface nic = createNic("nic0", null); - VdsNetworkInterface nicWithVlan = createVlan(nic.getName(), net.getvlan_id(), net.getName()); - nicWithVlan.setMtu(net.getMtu()); + VdsNetworkInterface nicWithVlan = createVlanSyncedWithNetwork(nic.getName(), net); mockExistingIfaces(nic, nicWithVlan); nic.setNetworkName(newNet.getName()); @@ -900,8 +899,7 @@ SetupNetworksHelper helper = createHelper( createParametersForNics(nic, createVlan(nic.getName(), newNet.getvlan_id(), newNet.getName()))); - validateAndExpectViolation(helper, VdcBllMessages.NETWORK_MTU_DIFFERENCES, - String.format("[%s(%d), %s(%d)]", net.getName(), net.getMtu(), newNet.getName(), newNet.getMtu())); + validateAndExpectMtuValidation(helper, net, newNet); } /** @@ -930,15 +928,13 @@ mockExistingNetworks(net, newNet); VdsNetworkInterface nic = createNic("nic0", null); - VdsNetworkInterface nicWithVlan = createVlan(nic.getName(), net.getvlan_id(), net.getName()); - nicWithVlan.setMtu(net.getMtu()); + VdsNetworkInterface nicWithVlan = createVlanSyncedWithNetwork(nic.getName(), net); mockExistingIfaces(nic, nicWithVlan); nic.setNetworkName(newNet.getName()); SetupNetworksHelper helper = createHelper(createParametersForNics(nic, nicWithVlan)); - validateAndExpectViolation(helper, VdcBllMessages.NETWORK_MTU_DIFFERENCES, - String.format("[%s(%d), %s(%d)]", newNet.getName(), newNet.getMtu(), net.getName(), net.getMtu())); + validateAndExpectMtuValidation(helper, newNet, net); } /** @@ -966,15 +962,13 @@ mockExistingNetworks(net, newNet); VdsNetworkInterface nic = createNic("nic0", null); - VdsNetworkInterface nicWithVlan = createVlan(nic.getName(), net.getvlan_id(), net.getName()); - nicWithVlan.setMtu(net.getMtu()); + VdsNetworkInterface nicWithVlan = createVlanSyncedWithNetwork(nic.getName(), net); mockExistingIfaces(nic, nicWithVlan); nic.setNetworkName(newNet.getName()); SetupNetworksHelper helper = createHelper(createParametersForNics(nic, nicWithVlan)); - validateAndExpectViolation(helper, VdcBllMessages.NETWORK_MTU_DIFFERENCES, - String.format("[%s(%s), %s(%d)]", newNet.getName(), "default", net.getName(), net.getMtu())); + validateAndExpectMtuValidation(helper, newNet, net); } /** @@ -993,7 +987,7 @@ * </pre> */ @Test - public void nonVmLanWithDifferentMTUAddedToNic() { + public void nonVmVlanWithDifferentMTUAddedToNic() { Network net = createNetwork("vlanVmMtu9000"); net.setvlan_id(100); net.setMtu(9000); @@ -1004,8 +998,7 @@ mockExistingNetworks(net, newNet); VdsNetworkInterface nic = createNic("nic0", null); - VdsNetworkInterface nicWithVlan = createVlan(nic.getName(), net.getvlan_id(), net.getName()); - nicWithVlan.setMtu(net.getMtu()); + VdsNetworkInterface nicWithVlan = createVlanSyncedWithNetwork(nic.getName(), net); mockExistingIfaces(nic, nicWithVlan); VdsNetworkInterface nicWithNonVmVlan = createVlan(nic.getName(), newNet.getvlan_id(), newNet.getName()); @@ -1048,8 +1041,16 @@ SetupNetworksHelper helper = createHelper( createParametersForNics(nic, createVlan(nic.getName(), newNet.getvlan_id(), newNet.getName()))); + validateAndExpectMtuValidation(helper, net, newNet); + } + + private void validateAndExpectMtuValidation(SetupNetworksHelper helper, Network net1, Network net2) { validateAndExpectViolation(helper, VdcBllMessages.NETWORK_MTU_DIFFERENCES, - String.format("[%s(%d), %s(%d)]", net.getName(), net.getMtu(), newNet.getName(), newNet.getMtu())); + String.format("[%s(%s), %s(%d)]", + net1.getName(), + net1.getMtu() == 0 ? "default" : net1.getMtu(), + net2.getName(), + net2.getMtu())); } /* --- Tests for General Violations --- */ @@ -1228,6 +1229,20 @@ } /** + * @param nicName + * The name of the NIC. + * @param network + * The network that the NIC is in sync with. Can't be <code>null</code>. + * @return {@link VdsNetworkInterface} representing a vlan NIC with the given parameters. + */ + private VdsNetworkInterface createVlanSyncedWithNetwork(String nicName, Network network) { + VdsNetworkInterface nic = createVlan(nicName, network.getvlan_id(), network.getName()); + nic.setBridged(network.isVmNetwork()); + nic.setMtu(network.getMtu()); + return nic; + } + + /** * @param name * The name of the bond. * @param networkName diff --git a/backend/manager/modules/utils/src/main/java/org/ovirt/engine/core/utils/NetworkUtils.java b/backend/manager/modules/utils/src/main/java/org/ovirt/engine/core/utils/NetworkUtils.java index f681153..2356f9b 100644 --- a/backend/manager/modules/utils/src/main/java/org/ovirt/engine/core/utils/NetworkUtils.java +++ b/backend/manager/modules/utils/src/main/java/org/ovirt/engine/core/utils/NetworkUtils.java @@ -178,7 +178,7 @@ * @param network * The network to check */ - public static boolean isNonVmNetworkWithNoVlan(Network network) { - return !network.isVmNetwork() && (network.getvlan_id() == null || network.getvlan_id() == 0); + public static boolean isNonVmNonVlanNetwork(Network network) { + return !network.isVmNetwork() && network.getvlan_id() == null; } } -- To view, visit http://gerrit.ovirt.org/7728 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ibf2ee87d2d95f814898edd06ca3a3c37309c34ab Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Moti Asayag <[email protected]> _______________________________________________ Engine-patches mailing list [email protected] http://lists.ovirt.org/mailman/listinfo/engine-patches
