Eliraz Levi has uploaded a new change for review. Change subject: engine:slave's mac in Broker, to lower case ......................................................................
engine:slave's mac in Broker, to lower case slave's mac in older vdsm versions, is in upper case, resulting slave's mac is saved and repressent in upper case Change-Id: Ibfebc2aea4bc3605253bfb072fc4ad19c0fd2270 Bug-Url: https://bugzilla.redhat.com/1132422 Signed-off-by: Eliraz Levi <el...@redhat.com> --- M backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/VdsBrokerObjectsBuilder.java 1 file changed, 5 insertions(+), 2 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/85/32885/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 4a16c47..d9e74a8 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 @@ -1435,8 +1435,11 @@ iface.setSubnet((String) nic.get("netmask")); iface.setMacAddress((String) nic.get("hwaddr")); // if we get "permhwaddr", we are a part of a bond and we use that as the mac address - if (nic.get("permhwaddr") != null) { - iface.setMacAddress((String) nic.get("permhwaddr")); + String mac = (String) nic.get("permhwaddr"); + if (mac != null) { + //TODO remove when the minimal supported vdsm version is >=3.6 + // in older VDSM version, slave's Mac is in upper case + iface.setMacAddress(mac.toLowerCase()); } if (StringUtils.isNotBlank((String) nic.get(VdsProperties.MTU))) { iface.setMtu(Integer.parseInt((String) nic.get(VdsProperties.MTU))); -- To view, visit http://gerrit.ovirt.org/32885 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ibfebc2aea4bc3605253bfb072fc4ad19c0fd2270 Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: ovirt-engine-3.5 Gerrit-Owner: Eliraz Levi <el...@redhat.com> _______________________________________________ Engine-patches mailing list Engine-patches@ovirt.org http://lists.ovirt.org/mailman/listinfo/engine-patches
