[Engine-patches] Change in ovirt-engine[master]: engine: change HostNetworkTopologyPersister to use Managemen...

[yzaspits]

Yevgeny Zaspitsky has uploaded a new change for review.

Change subject: engine: change HostNetworkTopologyPersister to use 
ManagementNetworkUtil
......................................................................

engine: change HostNetworkTopologyPersister to use ManagementNetworkUtil

Change HostNetworkTopologyPersister to use ManagementNetworkUtil
instead of NetworkUtils.isManagementNetwork.

Change-Id: I1dfc34a6789f9ec06c1760c1417df801886bf166
Signed-off-by: Yevgeny Zaspitsky <yzasp...@redhat.com>
---
M 
backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/HostNetworkTopologyPersisterImpl.java
1 file changed, 9 insertions(+), 4 deletions(-)


  git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/88/34188/13

diff --git 
a/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/HostNetworkTopologyPersisterImpl.java
 
b/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/HostNetworkTopologyPersisterImpl.java
index e7821da..082b27f 100644
--- 
a/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/HostNetworkTopologyPersisterImpl.java
+++ 
b/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/HostNetworkTopologyPersisterImpl.java
@@ -15,6 +15,7 @@
 
 import org.apache.commons.lang.StringUtils;
 import org.apache.commons.lang.Validate;
+import org.ovirt.engine.core.bll.network.cluster.ManagementNetworkUtil;
 import org.ovirt.engine.core.common.AuditLogType;
 import org.ovirt.engine.core.common.businessentities.Entities;
 import org.ovirt.engine.core.common.businessentities.NonOperationalReason;
@@ -44,24 +45,28 @@
     private final NetworkDao networkDao;
     private final NetworkQoSDao networkQoSDao;
     private final ResourceManager resourceManager;
+    private final ManagementNetworkUtil managementNetworkUtil;
 
     @Inject
     HostNetworkTopologyPersisterImpl(VmDynamicDAO vmDynamicDao,
                                      InterfaceDao interfaceDao,
                                      NetworkDao networkDao,
                                      NetworkQoSDao networkQoSDao,
-                                     ResourceManager resourceManager) {
+                                     ResourceManager resourceManager,
+                                     ManagementNetworkUtil 
managementNetworkUtil) {
         Validate.notNull(networkDao, "networkDao can not be null");
         Validate.notNull(interfaceDao, "interfaceDao can not be null");
         Validate.notNull(vmDynamicDao, "vmDynamicDao can not be null");
         Validate.notNull(networkQoSDao, "networkQoSDao can not be null");
         Validate.notNull(resourceManager, "resourceManager can not be null");
+        Validate.notNull(managementNetworkUtil, "managementNetworkUtil can not 
be null");
 
         this.vmDynamicDao = vmDynamicDao;
         this.interfaceDao = interfaceDao;
         this.networkDao = networkDao;
         this.networkQoSDao = networkQoSDao;
         this.resourceManager = resourceManager;
+        this.managementNetworkUtil = managementNetworkUtil;
     }
 
     @Override
@@ -144,7 +149,7 @@
                                           Collection<VdsNetworkInterface> 
engineInterfaces) {
 
         if (isVmRunningOnHost(host.getId())) {
-            final Network engineDisplayNetwork = 
findDisplayNetwork(engineHostNetworks);
+            final Network engineDisplayNetwork = 
findDisplayNetwork(host.getVdsGroupId(), engineHostNetworks);
 
             if (engineDisplayNetwork == null) {
                 return;
@@ -185,13 +190,13 @@
         return networks;
     }
 
-    private Network findDisplayNetwork(Collection<Network> networks) {
+    private Network findDisplayNetwork(Guid clusterId, Collection<Network> 
networks) {
         Network managementNetwork = null;
         for (Network network : networks) {
             if (network.getCluster().isDisplay()) {
                 return network;
             }
-            if (NetworkUtils.isManagementNetwork(network)) {
+            if (managementNetworkUtil.isManagementNetwork(network.getId(), 
clusterId)) {
                 managementNetwork = network;
             }
         }


-- 
To view, visit http://gerrit.ovirt.org/34188
To unsubscribe, visit http://gerrit.ovirt.org/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I1dfc34a6789f9ec06c1760c1417df801886bf166
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