Moti Asayag has uploaded a new change for review. Change subject: engine: Attached network to host for unused labeled network ......................................................................
engine: Attached network to host for unused labeled network The engine should support configuring a labeled network on hosts, if the network was already labeled, but never configured on any host. Change-Id: I646dd1901b2e75b1b6bebc5562c9cc2e8377425d Bug-Url: https://bugzilla.redhat.com/1074258 Signed-off-by: Moti Asayag <[email protected]> --- M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/dc/UpdateNetworkCommand.java 1 file changed, 19 insertions(+), 13 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/18/25618/1 diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/dc/UpdateNetworkCommand.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/dc/UpdateNetworkCommand.java index 6e20ff0..653117c 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/dc/UpdateNetworkCommand.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/dc/UpdateNetworkCommand.java @@ -303,18 +303,6 @@ } - private boolean labelChanged() { - return !Objects.equals(getNetwork().getLabel(), getOldNetwork().getLabel()); - } - - private boolean labelAdded() { - return !NetworkUtils.isLabeled(getOldNetwork()) && NetworkUtils.isLabeled(getNetwork()); - } - - private boolean labelRemoved() { - return NetworkUtils.isLabeled(getOldNetwork()) && !NetworkUtils.isLabeled(getNetwork()); - } - private class SyncNetworkParametersBuilder extends NetworkParametersBuilder{ private ArrayList<VdcActionParametersBase> buildParameters(Network network, Network oldNetwork) { @@ -329,7 +317,7 @@ } // add network to labeled interfaces and sync network on the rest - if (labelAdded()) { + if (labelAdded() || labelRenamed()) { List<VdsNetworkInterface> labeledNics = getLabeledNics(network); Map<Guid, VdsNetworkInterface> hostToNic = mapHostToNic(nics); List<VdsNetworkInterface> nicsForAdd = new ArrayList<>(); @@ -439,5 +427,23 @@ parameters.add(setupNetworkParams); } } + + private boolean labelChanged() { + return !Objects.equals(getNetwork().getLabel(), getOldNetwork().getLabel()); + } + + private boolean labelAdded() { + return !NetworkUtils.isLabeled(getOldNetwork()) && NetworkUtils.isLabeled(getNetwork()); + } + + private boolean labelRemoved() { + return NetworkUtils.isLabeled(getOldNetwork()) && !NetworkUtils.isLabeled(getNetwork()); + } + + private boolean labelRenamed() { + return NetworkUtils.isLabeled(getOldNetwork()) && NetworkUtils.isLabeled(getNetwork()) + && !getOldNetwork().getLabel().equals(getNetwork().getLabel()); + } + } } -- To view, visit http://gerrit.ovirt.org/25618 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I646dd1901b2e75b1b6bebc5562c9cc2e8377425d 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
