Yevgeny Zaspitsky has uploaded a new change for review.
Change subject: engine: make SetupNetworksVDSCommand use ManagementNetworkUtil
......................................................................
engine: make SetupNetworksVDSCommand use ManagementNetworkUtil
Make SetupNetworksVDSCommand use ManagementNetworkUtil
instead of NetworkUtils.
Change-Id: Iaea8e36d556243836a124fa410f42b712f509ecd
Signed-off-by: Yevgeny Zaspitsky <yzasp...@redhat.com>
---
M
backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/SetupNetworksVDSCommand.java
1 file changed, 7 insertions(+), 1 deletion(-)
git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/90/34190/13
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..ee40ea2 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
@@ -7,7 +7,10 @@
import java.util.Map;
import java.util.Set;
+import javax.inject.Inject;
+
import org.apache.commons.lang.StringUtils;
+import org.ovirt.engine.core.bll.network.cluster.ManagementNetworkUtil;
import org.ovirt.engine.core.common.FeatureSupported;
import org.ovirt.engine.core.common.businessentities.VDS;
import org.ovirt.engine.core.common.businessentities.network.Network;
@@ -29,6 +32,9 @@
private static final String DEFAULT_ROUTE = "defaultRoute";
private static final Map<String, String> REMOVE_OBJ =
Collections.singletonMap("remove", Boolean.TRUE.toString());
private static final Log log =
LogFactory.getLog(SetupNetworksVDSCommand.class);
+
+ @Inject
+ private ManagementNetworkUtil managementNetworkUtil;
public SetupNetworksVDSCommand(T parameters) {
super(parameters);
@@ -83,7 +89,7 @@
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))
- && NetworkUtils.isManagementNetwork(network)
+ &&
managementNetworkUtil.isManagementNetwork(network.getId(), host.getVdsGroupId())
&& (iface.getBootProtocol() == NetworkBootProtocol.DHCP
|| (iface.getBootProtocol() ==
NetworkBootProtocol.STATIC_IP
&& StringUtils.isNotEmpty(iface.getGateway())))) {
--
To view, visit http://gerrit.ovirt.org/34190
To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Iaea8e36d556243836a124fa410f42b712f509ecd
Gerrit-PatchSet: 13
Gerrit-Project: ovirt-engine
Gerrit-Branch: master
Gerrit-Owner: Yevgeny Zaspitsky <yzasp...@redhat.com>
Gerrit-Reviewer: Alona Kaplan <alkap...@redhat.com>
Gerrit-Reviewer: automat...@ovirt.org
Gerrit-Reviewer: oVirt Jenkins CI Server
_______________________________________________
Engine-patches mailing list
Engine-patches@ovirt.org
http://lists.ovirt.org/mailman/listinfo/engine-patches
