Alona Kaplan has uploaded a new change for review. Change subject: engine: remove unnecessary parameters from VBOB ......................................................................
engine: remove unnecessary parameters from VBOB currVlan and networkVlan are passed and initilaized through some methods in VBOB. But they are not actually used anywhere. Change-Id: I252f1e789a346d045afdf32d638c163abcbe03c1 Signed-off-by: Alona Kaplan <[email protected]> --- M backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/VdsBrokerObjectsBuilder.java 1 file changed, 4 insertions(+), 20 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/07/26607/1 diff --git a/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/VdsBrokerObjectsBuilder.java b/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/VdsBrokerObjectsBuilder.java index d15e94e..e5522d5 100644 --- a/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/VdsBrokerObjectsBuilder.java +++ b/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/VdsBrokerObjectsBuilder.java @@ -1002,11 +1002,11 @@ addHostNetworkInterfaces(vds, xmlRpcStruct); - Map<String, Integer> currVlans = addHostVlanDevices(vds, xmlRpcStruct); + addHostVlanDevices(vds, xmlRpcStruct); addHostBondDevices(vds, xmlRpcStruct); - addHostNetworksAndUpdateInterfaces(vds, xmlRpcStruct, currVlans); + addHostNetworksAndUpdateInterfaces(vds, xmlRpcStruct); // set bonding options setBondingOptions(vds, oldInterfaces); @@ -1018,8 +1018,7 @@ } private static void addHostNetworksAndUpdateInterfaces(VDS vds, - Map<String, Object> xmlRpcStruct, - Map<String, Integer> currVlans) { + Map<String, Object> xmlRpcStruct) { Map<String, Integer> networkVlans = new HashMap<String, Integer>(); @@ -1037,8 +1036,6 @@ for (VdsNetworkInterface iface : interfaces) { updateNetworkDetailsInInterface(iface, - currVlans, - networkVlans, network, vds, net); @@ -1180,12 +1177,8 @@ * The host to update * @param xmlRpcStruct * a map contains pairs of vlan device name and vlan data - * @return a map of the added vlan device names and their vlan tag */ - private static Map<String, Integer> addHostVlanDevices(VDS vds, Map<String, Object> xmlRpcStruct) { - // interface to vlan map - Map<String, Integer> currVlans = new HashMap<String, Integer>(); - + private static void addHostVlanDevices(VDS vds, Map<String, Object> xmlRpcStruct) { // vlans Map<String, Object> vlans = (Map<String, Object>) xmlRpcStruct.get(VdsProperties.NETWORK_VLANS); if (vlans != null) { @@ -1214,8 +1207,6 @@ } } - currVlans.put(vlanDeviceName, iface.getVlanId()); - iface.setAddress((String) vlan.get("addr")); iface.setSubnet((String) vlan.get("netmask")); if (StringUtils.isNotBlank((String) vlan.get(VdsProperties.MTU))) { @@ -1227,7 +1218,6 @@ vds.getInterfaces().add(iface); } } - return currVlans; } /** @@ -1302,18 +1292,12 @@ * Network to get details from. */ private static void updateNetworkDetailsInInterface(VdsNetworkInterface iface, - Map<String, Integer> currVlans, - Map<String, Integer> networkVlans, Map<String, Object> network, VDS host, Network net) { if (iface != null) { iface.setNetworkName(net.getName()); - - if (currVlans.containsKey(iface.getName())) { - networkVlans.put(net.getName(), currVlans.get(iface.getName())); - } // set the management ip if (StringUtils.equals(iface.getNetworkName(), NetworkUtils.getEngineNetwork())) { -- To view, visit http://gerrit.ovirt.org/26607 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I252f1e789a346d045afdf32d638c163abcbe03c1 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
