Lior Vernia has uploaded a new change for review. Change subject: engine: Code needs to run once, remove from loop ......................................................................
engine: Code needs to run once, remove from loop There was some code inside SetupNetworksVDSCommand that didn't require being inside the iteration of networks, extracted it out of the loop. Change-Id: I8778a6e08dc696353af95bd2be67fdb31f7f2882 Signed-off-by: Lior Vernia <[email protected]> --- M backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/SetupNetworksVDSCommand.java 1 file changed, 17 insertions(+), 9 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/30/34130/1 diff --git a/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/SetupNetworksVDSCommand.java b/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/SetupNetworksVDSCommand.java index fbdc16b..df14d2f 100644 --- a/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/SetupNetworksVDSCommand.java +++ b/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/SetupNetworksVDSCommand.java @@ -42,6 +42,21 @@ private Map<String, Object> generateNetworks() { Map<String, Object> networks = new HashMap<String, Object>(); NetworkQoSDao qosDao = getDbFacade().getNetworkQosDao(); + VDS host = getDbFacade().getVdsDao().get(getParameters().getVdsId()); + + boolean hostNetworkQosSupported = FeatureSupported.hostNetworkQos(host.getVdsGroupCompatibilityVersion()); + + Set<Version> supportedClusterVersionsSet = host.getSupportedClusterVersionsSet(); + boolean supportedClusterVersionsAvailable = + supportedClusterVersionsSet != null && supportedClusterVersionsSet.isEmpty(); + if (!supportedClusterVersionsAvailable) { + log.warnFormat("Host {0} ({1}) doesn't contain Supported Cluster Versions, therefore 'defaultRoute'" + + " will not be sent via the SetupNetworks", host.getName(), host.getId()); + } + boolean defaultRouteSupported = + supportedClusterVersionsAvailable + && FeatureSupported.defaultRoute(Collections.max(supportedClusterVersionsSet)); + for (Network network : getParameters().getNetworks()) { Map<String, Object> opts = new HashMap<String, Object>(); VdsNetworkInterface iface = @@ -69,20 +84,13 @@ opts.put(VdsProperties.STP, network.getStp() ? "yes" : "no"); } - VDS host = getDbFacade().getVdsDao().get(getParameters().getVdsId()); - Version version = host.getVdsGroupCompatibilityVersion(); - if (qosConfiguredOnInterface(iface, network) - && FeatureSupported.hostNetworkQos(version)) { + if (hostNetworkQosSupported && qosConfiguredOnInterface(iface, network)) { NetworkQosMapper qosMapper = new NetworkQosMapper(opts, VdsProperties.HOST_QOS_INBOUND, VdsProperties.HOST_QOS_OUTBOUND); qosMapper.serialize(iface.isQosOverridden() ? iface.getQos() : qosDao.get(network.getQosId())); } - Set<Version> supportedClusterVersionsSet = host.getSupportedClusterVersionsSet(); - if (supportedClusterVersionsSet == null || supportedClusterVersionsSet.isEmpty()) { - log.warnFormat("Host {0} ({1}) doesn't contain Supported Cluster Versions, therefore 'defaultRoute'" - + " will not be sent via the SetupNetworks", host.getName(), host.getId()); - } else if (FeatureSupported.defaultRoute(Collections.max(supportedClusterVersionsSet)) + if (defaultRouteSupported && NetworkUtils.isManagementNetwork(network) && (iface.getBootProtocol() == NetworkBootProtocol.DHCP || (iface.getBootProtocol() == NetworkBootProtocol.STATIC_IP -- To view, visit http://gerrit.ovirt.org/34130 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I8778a6e08dc696353af95bd2be67fdb31f7f2882 Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Lior Vernia <[email protected]> _______________________________________________ Engine-patches mailing list [email protected] http://lists.ovirt.org/mailman/listinfo/engine-patches
