Moti Asayag has uploaded a new change for review. Change subject: engine: Verify network is VM network by scheduler ......................................................................
engine: Verify network is VM network by scheduler The scheduler (VdsSelector) should verify the host contains the networks required by the VM and those networks are configured as VM networks on both the logical network definition and on the host. Change-Id: I2adfe6b65146d5c780538c1b4ac6d86b56256331 Signed-off-by: Moti Asayag <[email protected]> --- M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/VdsSelector.java 1 file changed, 3 insertions(+), 2 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/21/13021/1 diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/VdsSelector.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/VdsSelector.java index 4f221c7..4bee739 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/VdsSelector.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/VdsSelector.java @@ -421,7 +421,7 @@ found = true; } else { for (final VdsNetworkInterface vdsIf : allInterfacesForVds) { - if (!networkRequiredOnVds(vmIf, networksByName, onlyRequiredNetworks) + if (vdsIf.isBridged() && !networkRequiredOnVds(vmIf, networksByName, onlyRequiredNetworks) || StringUtils.equals(vmIf.getNetworkName(), vdsIf.getNetworkName())) { found = true; break; @@ -446,7 +446,8 @@ if (!vmIface.isPlugged()) { networkRequiredOnVds = false; } else if (onlyRequiredNetworks) { - networkRequiredOnVds = networksByName.get(vmIface.getNetworkName()).getCluster().isRequired(); + Network network = networksByName.get(vmIface.getNetworkName()); + networkRequiredOnVds = network.getCluster().isRequired() && network.isVmNetwork(); } return networkRequiredOnVds; } -- To view, visit http://gerrit.ovirt.org/13021 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I2adfe6b65146d5c780538c1b4ac6d86b56256331 Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Moti Asayag <[email protected]> _______________________________________________ Engine-patches mailing list [email protected] http://lists.ovirt.org/mailman/listinfo/engine-patches
