Alona Kaplan has uploaded a new change for review. Change subject: engine: Read "vlanid" and "interface" from VLAN information ......................................................................
engine: Read "vlanid" and "interface" from VLAN information Accept vlan devices identified by any name [2] If vsdm reports vlanid as an independent field the engine should use it instead of deducting it from vlan name. Change-Id: I282c2db9a0fd023ac39fac157ce1c0178800d3af Bug-Url: https://bugzilla.redhat.com/999975 Signed-off-by: Alona Kaplan <[email protected]> --- M backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/VdsBrokerObjectsBuilder.java M backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/VdsProperties.java 2 files changed, 15 insertions(+), 6 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/06/26606/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 5136adc..d15e94e 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 @@ -1200,14 +1200,21 @@ iface.setName(vlanDeviceName); iface.setVdsId(vds.getId()); - if (vlanDeviceName.contains(".")) { - 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(); + + if (vlan.get(VdsProperties.VLAN_ID) != null) { + iface.setVlanId((Integer) vlan.get(VdsProperties.VLAN_ID)); + iface.setBaseInterface((String) vlan.get(VdsProperties.BASE_INTERFACE)); + } else { + if (vlanDeviceName.contains(".")) { + String[] names = vlanDeviceName.split("[.]", -1); + String vlanId = names[1]; + iface.setVlanId(Integer.parseInt(vlanId)); + iface.setBaseInterface(names[0]); + } } - Map<String, Object> vlan = (Map<String, Object>) entry.getValue(); + currVlans.put(vlanDeviceName, iface.getVlanId()); iface.setAddress((String) vlan.get("addr")); iface.setSubnet((String) vlan.get("netmask")); diff --git a/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/VdsProperties.java b/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/VdsProperties.java index 26d8cf2..c35e6be3 100644 --- a/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/VdsProperties.java +++ b/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/VdsProperties.java @@ -84,6 +84,8 @@ public static final String BOOT_PROTOCOL = "BOOTPROTO"; public static final String STP = "STP"; public static final String MTU = "mtu"; + public static final String VLAN_ID = "vlanid"; + public static final String BASE_INTERFACE = "iface"; public static final String BONDING_OPTIONS = "BONDING_OPTS"; public static final String DHCP = "dhcp"; public static final String FORCE = "force"; -- To view, visit http://gerrit.ovirt.org/26606 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I282c2db9a0fd023ac39fac157ce1c0178800d3af 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
