Moti Asayag has posted comments on this change. Change subject: engine: Ignore 'cfg' entries for cluster version >= 3.6 ......................................................................
Patch Set 13: (5 comments) https://gerrit.ovirt.org/#/c/36343/13/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/CfgBootProtocolResolver.java File backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/CfgBootProtocolResolver.java: Line 6: import org.ovirt.engine.core.common.businessentities.network.VdsNetworkInterface; Line 7: Line 8: public class CfgBootProtocolResolver extends BootProtocolResolver { Line 9: Line 10: String bootProtocol; private ? Line 11: Line 12: public CfgBootProtocolResolver(Map<String, Object> entry, VdsNetworkInterface iface, VDS host) { Line 13: super((Map<String, Object>) entry.get("cfg"), iface, host); Line 14: } https://gerrit.ovirt.org/#/c/36343/13/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/NoCfgBootProtocolResolver.java File backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/NoCfgBootProtocolResolver.java: Line 6: import org.ovirt.engine.core.common.businessentities.network.VdsNetworkInterface; Line 7: Line 8: public class NoCfgBootProtocolResolver extends BootProtocolResolver { Line 9: Line 10: String ipAddress; private ? Line 11: Boolean isDhcp; Line 12: Line 13: public NoCfgBootProtocolResolver(Map<String, Object> entry, VdsNetworkInterface iface, VDS host) { Line 14: super(entry, iface, host); Line 7: Line 8: public class NoCfgBootProtocolResolver extends BootProtocolResolver { Line 9: Line 10: String ipAddress; Line 11: Boolean isDhcp; private ? Line 12: Line 13: public NoCfgBootProtocolResolver(Map<String, Object> entry, VdsNetworkInterface iface, VDS host) { Line 14: super(entry, iface, host); Line 15: ipAddress = iface.getAddress(); Line 16: } Line 17: Line 18: private Boolean isDhcp() { Line 19: if (isDhcp == null) { Line 20: isDhcp = (Boolean) entry.get("dhcpv4"); is it expected no to be null ? meaning will vdsm always report the 'dhcpv4' element for cluster level >= 3.6 ? and is it expected not to be null ? (either true/false) Line 21: } Line 22: return isDhcp; Line 23: } Line 24: https://gerrit.ovirt.org/#/c/36343/13/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/VdsBrokerObjectsBuilder.java File backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/VdsBrokerObjectsBuilder.java: Line 1592: addBondDeviceToHost(vds, iface, (Object[]) bond.get("slaves")); Line 1593: } Line 1594: Line 1595: Object bondOptions = null; Line 1596: if (FeatureSupported.cfgEntriesDeprecated(vds.getVdsGroupCompatibilityVersion())) { this can be evaluated once outside of the for loop Line 1597: bondOptions = bond.get("opts"); Line 1598: } else { Line 1599: Map<String, Object> config = (Map<String, Object>) bond.get("cfg"); Line 1600: bondOptions = (config == null) ? null : config.get("BONDING_OPTS"); -- To view, visit https://gerrit.ovirt.org/36343 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: If434111561aefab3d5d358a97331bcf3159f3484 Gerrit-PatchSet: 13 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Lior Vernia <lver...@redhat.com> Gerrit-Reviewer: Alona Kaplan <alkap...@redhat.com> Gerrit-Reviewer: Dan Kenigsberg <dan...@redhat.com> Gerrit-Reviewer: Eli Mesika <emes...@redhat.com> Gerrit-Reviewer: Eliraz Levi <el...@redhat.com> Gerrit-Reviewer: Lior Vernia <lver...@redhat.com> Gerrit-Reviewer: Moti Asayag <masa...@redhat.com> Gerrit-Reviewer: Ondřej Svoboda <osvob...@redhat.com> Gerrit-Reviewer: automat...@ovirt.org Gerrit-Reviewer: oVirt Jenkins CI Server Gerrit-HasComments: Yes _______________________________________________ Engine-patches mailing list Engine-patches@ovirt.org http://lists.ovirt.org/mailman/listinfo/engine-patches
