Moti Asayag has posted comments on this change.
Change subject: engine: Prevent networks with different MTU (#852052)
......................................................................
Patch Set 1: (7 inline comments)
....................................................
File
backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/SetupNetworksHelper.java
Line 123:
Line 124: private void reportMTUDifferences(List<Network> ifaceNetworks) {
Line 125: List<String> mtuDiffNetworks = new ArrayList<String>();
Line 126: for (Network net : ifaceNetworks) {
Line 127: mtuDiffNetworks.add(String.format("%s(%d)",
net.getName(), net.getMtu()));
Done
Line 128: }
Line 129: addViolation(VdcBllMessages.NETWORK_MTU_DIFFERENCES,
Line 130: String.format("[%s]",
StringUtils.join(mtuDiffNetworks, ", ")));
Line 131: }
Line 141: String nameWithoutVlanId =
NetworkUtils.StripVlan(iface.getName());
Line 142: List<Network> networks = new ArrayList<Network>();
Line 143: for (VdsNetworkInterface tmp : params.getInterfaces()) {
Line 144: if
(NetworkUtils.StripVlan(tmp.getName()).equals(nameWithoutVlanId) &&
tmp.getNetworkName() != null) {
Line 145: if
(existingClusterNetworks.containsKey(tmp.getNetworkName())) {
Done
Line 146:
networks.add(existingClusterNetworks.get(tmp.getNetworkName()));
Line 147: }
Line 148: }
Line 149: }
Line 142: List<Network> networks = new ArrayList<Network>();
Line 143: for (VdsNetworkInterface tmp : params.getInterfaces()) {
Line 144: if
(NetworkUtils.StripVlan(tmp.getName()).equals(nameWithoutVlanId) &&
tmp.getNetworkName() != null) {
Line 145: if
(existingClusterNetworks.containsKey(tmp.getNetworkName())) {
Line 146:
networks.add(existingClusterNetworks.get(tmp.getNetworkName()));
Done
Line 147: }
Line 148: }
Line 149: }
Line 150: return networks;
....................................................
File
backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/SetupNetworksHelperTest.java
Line 658: public void networkWithTheSameMTUAddedToNic() {
Line 659: Network net = createNetwork("nonVmMtu9000");
Line 660: net.setVmNetwork(false);
Line 661: net.setMtu(9000);
Line 662: Network newNet = createNetwork("vLanVmMtu9000");
Done
Line 663: newNet.setMtu(9000);
Line 664: mockExistingNetworks(net, newNet);
Line 665:
Line 666: VdsNetworkInterface nic = createNic("nic0", net.getName());
Line 662: Network newNet = createNetwork("vLanVmMtu9000");
Line 663: newNet.setMtu(9000);
Line 664: mockExistingNetworks(net, newNet);
Line 665:
Line 666: VdsNetworkInterface nic = createNic("nic0", net.getName());
Done
Line 667: nic.setBridged(false);
Line 668: mockExistingIfaces(nic);
Line 669:
Line 670: SetupNetworksHelper helper = createHelper(
Line 673: validateAndExpectNoViolations(helper);
Line 674: }
Line 675:
Line 676: @Test
Line 677: public void networkWithDifferentMTUAddedToNic() {
Done
Line 678: Network net = createNetwork("nonVmMtu5000");
Line 679: net.setVmNetwork(false);
Line 680: net.setMtu(5000);
Line 681: Network newNet = createNetwork("vLanVmMtu9000");
Line 691:
Line 692: validateAndExpectViolation(helper,
VdcBllMessages.NETWORK_MTU_DIFFERENCES,
Line 693: String.format("[%s(%d), %s(%d)]", net.getName(),
net.getMtu(), newNet.getName(), newNet.getMtu()));
Line 694: }
Line 695:
Done
Line 696: /* --- Tests for General Violations --- */
Line 697:
Line 698: @Test
Line 699: public void violationAppearsTwice() {
--
To view, visit http://gerrit.ovirt.org/7661
To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: comment
Gerrit-Change-Id: I69f5c5f515d782c0311fd7fe458408ed634c1c83
Gerrit-PatchSet: 1
Gerrit-Project: ovirt-engine
Gerrit-Branch: master
Gerrit-Owner: Moti Asayag <[email protected]>
Gerrit-Reviewer: Livnat Peer <[email protected]>
Gerrit-Reviewer: Mike Kolesnik <[email protected]>
Gerrit-Reviewer: Moti Asayag <[email protected]>
Gerrit-Reviewer: Muli Salem <[email protected]>
_______________________________________________
Engine-patches mailing list
[email protected]
http://lists.ovirt.org/mailman/listinfo/engine-patches
