Muli Salem has uploaded a new change for review. Change subject: core: Refactor SetupNetworksVdsCommand ......................................................................
core: Refactor SetupNetworksVdsCommand This patch refactors the block of code that generate networks that were modified. for sending to Vdsm. Change-Id: Ic12d9c601dad77f77808bbec46271ea675509530 Bug-Url: https://bugzilla.redhat.com/909678 Signed-off-by: Muli Salem <[email protected]> --- M backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/SetupNetworksVDSCommand.java 1 file changed, 37 insertions(+), 31 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/59/12059/1 diff --git a/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/SetupNetworksVDSCommand.java b/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/SetupNetworksVDSCommand.java index 035b014..c9ec21a 100644 --- a/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/SetupNetworksVDSCommand.java +++ b/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/SetupNetworksVDSCommand.java @@ -32,45 +32,36 @@ private XmlRpcStruct generateNetworks() { XmlRpcStruct networks = new XmlRpcStruct(); - - for (Network net : getParameters().getNetworks()) { - Map<String, String> opts = new HashMap<String, String>(); - VdsNetworkInterface i = findNetworkInterface(net.getName(), getParameters().getInterfaces(), - getParameters().getBonds()); - - Boolean bonded = isVlan(net) - ? findInterfaceByName(NetworkUtils.StripVlan(i.getName())).getBonded() - : i.getBonded(); + String ifaceNameWithoutVlan; + Boolean bonded; + Map<String, String> opts; + VdsNetworkInterface iface; + for (Network network : getParameters().getNetworks()) { + opts = new HashMap<String, String>(); + iface = findNetworkInterface(network.getName(), getParameters().getInterfaces(), getParameters().getBonds()); + ifaceNameWithoutVlan = NetworkUtils.StripVlan(iface.getName()); + bonded = isVlan(network) + ? findInterfaceByName(ifaceNameWithoutVlan).getBonded() + : iface.getBonded(); String type = (bonded != null && bonded) ? "bonding" : "nic"; - opts.put(type, NetworkUtils.StripVlan(i.getName())); - if (isVlan(net)) { - opts.put("vlan", net.getVlanId().toString()); + opts.put(type, ifaceNameWithoutVlan); + if (isVlan(network)) { + opts.put("vlan", network.getVlanId().toString()); } // TODO: add bootproto to network object - if (i.getBootProtocol() != null) { - switch (i.getBootProtocol()) { - case DHCP: - opts.put(BOOT_PROTOCOL, DHCP_BOOT_PROTOCOL); - break; - case STATIC_IP: - putIfNotEmpty(opts, "ipaddr", i.getAddress()); - putIfNotEmpty(opts, "netmask", i.getSubnet()); - putIfNotEmpty(opts, "gateway", i.getGateway()); - break; - } + addBootProtocol(opts, iface); + + if (network.getMtu() != 0) { + opts.put("mtu", String.valueOf(network.getMtu())); } - if (net.getMtu() != 0) { - opts.put("mtu", String.valueOf(net.getMtu())); + opts.put("bridged", Boolean.toString(network.isVmNetwork())); + if (network.isVmNetwork()) { + opts.put(VdsProperties.STP, network.getStp() ? "yes" : "no"); } - opts.put("bridged", Boolean.toString(net.isVmNetwork())); - if (net.isVmNetwork()) { - opts.put(VdsProperties.STP, net.getStp() ? "yes" : "no"); - } - - networks.add(net.getName(), opts); + networks.add(network.getName(), opts); } for (String net : getParameters().getRemovedNetworks()) { @@ -80,6 +71,21 @@ return networks; } + private void addBootProtocol(Map<String, String> opts, VdsNetworkInterface iface) { + if (iface.getBootProtocol() != null) { + switch (iface.getBootProtocol()) { + case DHCP: + opts.put(BOOT_PROTOCOL, DHCP_BOOT_PROTOCOL); + break; + case STATIC_IP: + putIfNotEmpty(opts, "ipaddr", iface.getAddress()); + putIfNotEmpty(opts, "netmask", iface.getSubnet()); + putIfNotEmpty(opts, "gateway", iface.getGateway()); + break; + } + } + } + private static boolean isVlan(Network net) { return net.getVlanId() != null; } -- To view, visit http://gerrit.ovirt.org/12059 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ic12d9c601dad77f77808bbec46271ea675509530 Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Muli Salem <[email protected]> _______________________________________________ Engine-patches mailing list [email protected] http://lists.ovirt.org/mailman/listinfo/engine-patches
