Moti Asayag has uploaded a new change for review. Change subject: engine: Lay foundation for method refactor ......................................................................
engine: Lay foundation for method refactor Extracts the clusterNetworks into an argument, so auditNetworkCompliance would be pulled out of this method. Change-Id: I3907cde04cc5c90d47958871b177f5aa61e83ae1 Signed-off-by: Moti Asayag <masa...@redhat.com> --- M backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/HostNetworkTopologyPersisterImpl.java 1 file changed, 4 insertions(+), 5 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/64/34564/1 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 f352245..b168037 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 @@ -49,17 +49,16 @@ List<VdsNetworkInterface> userConfiguredNics) { List<VdsNetworkInterface> dbIfaces = DbFacade.getInstance().getInterfaceDao().getAllInterfacesForVds(host.getId()); + List<Network> clusterNetworks = DbFacade.getInstance().getNetworkDao().getAllForCluster(host.getVdsGroupId()); persistTopology(host.getInterfaces(), dbIfaces, userConfiguredNics); - return enforceNetworkCompliance(host, skipManagementNetwork, dbIfaces); + return enforceNetworkCompliance(host, skipManagementNetwork, dbIfaces, clusterNetworks); } private NonOperationalReason enforceNetworkCompliance(VDS host, boolean skipManagementNetwork, - List<VdsNetworkInterface> dbIfaces) { + List<VdsNetworkInterface> dbIfaces, + List<Network> clusterNetworks) { if (host.getStatus() != VDSStatus.Maintenance) { - - List<Network> clusterNetworks = DbFacade.getInstance().getNetworkDao() - .getAllForCluster(host.getVdsGroupId()); if (skipManagementNetwork) { skipManagementNetworkCheck(host.getInterfaces(), clusterNetworks); } -- To view, visit http://gerrit.ovirt.org/34564 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I3907cde04cc5c90d47958871b177f5aa61e83ae1 Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Moti Asayag <masa...@redhat.com> _______________________________________________ Engine-patches mailing list Engine-patches@ovirt.org http://lists.ovirt.org/mailman/listinfo/engine-patches