Mike Kolesnik has uploaded a new change for review.
Change subject: engine: Remove unused parameters
......................................................................
engine: Remove unused parameters
Remove currVlans which is unused since change with id
Icc7ddba57644f7133107e4a09884d659fa6eb20f
Change-Id: Icc6cae182107afbce0a7d6201c88b5d669272e49
Signed-off-by: Mike Kolesnik <mkole...@redhat.com>
---
M
backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/VdsBrokerObjectsBuilder.java
1 file changed, 4 insertions(+), 26 deletions(-)
git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/34/27234/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 683e6b0..4946552 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
@@ -1015,11 +1015,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);
@@ -1031,10 +1031,7 @@
}
private static void addHostNetworksAndUpdateInterfaces(VDS vds,
- Map<String, Object> xmlRpcStruct,
- Map<String, Integer> currVlans) {
-
- Map<String, Integer> networkVlans = new HashMap<String, Integer>();
+ Map<String, Object> xmlRpcStruct) {
// Networks collection (name point to list of nics or bonds)
Map<String, Object> networks = (Map<String, Object>)
xmlRpcStruct.get(VdsProperties.NETWORKS);
@@ -1050,8 +1047,6 @@
for (VdsNetworkInterface iface : interfaces) {
updateNetworkDetailsInInterface(iface,
- currVlans,
- networkVlans,
network,
vds,
net);
@@ -1193,13 +1188,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>();
-
- // vlans
+ private static void addHostVlanDevices(VDS vds, Map<String, Object>
xmlRpcStruct) {
Map<String, Object> vlans = (Map<String, Object>)
xmlRpcStruct.get(VdsProperties.NETWORK_VLANS);
if (vlans != null) {
for (Entry<String, Object> entry : vlans.entrySet()) {
@@ -1217,7 +1207,6 @@
String[] names = vlanDeviceName.split("[.]", -1);
String vlan = names[1];
iface.setVlanId(Integer.parseInt(vlan));
- currVlans.put(vlanDeviceName, iface.getVlanId());
}
Map<String, Object> vlan = (Map<String, Object>)
entry.getValue();
@@ -1233,7 +1222,6 @@
vds.getInterfaces().add(iface);
}
}
- return currVlans;
}
/**
@@ -1298,28 +1286,18 @@
*
* @param iface
* The interface to update.
- * @param currVlans
- * Used for checking the VLANs later.
- * @param networkVlans
- * Used for checking the VLANs later.
* @param network
* Network struct to get details from.
* @param net
* 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/27234
To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Icc6cae182107afbce0a7d6201c88b5d669272e49
Gerrit-PatchSet: 1
Gerrit-Project: ovirt-engine
Gerrit-Branch: master
Gerrit-Owner: Mike Kolesnik <mkole...@redhat.com>
_______________________________________________
Engine-patches mailing list
Engine-patches@ovirt.org
http://lists.ovirt.org/mailman/listinfo/engine-patches
