Moti Asayag has uploaded a new change for review. Change subject: engine: Reorder network actions when changing host cluster ......................................................................
engine: Reorder network actions when changing host cluster When moving host between clusters, there is a need to first clear all the labeled networks originated in the source cluster. Second, to add all of the labeled networks according to the target cluster attachment. The reason for it is to deallocate assigned interfaces which where assigned with networks of the source cluster. Change-Id: I1ea644edbe7e3d314d4d1baf8a45b52d7a5a8f95 Bug-Url: https://bugzilla.redhat.com/1064953 Signed-off-by: Moti Asayag <[email protected]> --- M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/ChangeVDSClusterCommand.java 1 file changed, 10 insertions(+), 10 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/18/24518/1 diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/ChangeVDSClusterCommand.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/ChangeVDSClusterCommand.java index a5dcb98..205286d 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/ChangeVDSClusterCommand.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/ChangeVDSClusterCommand.java @@ -410,6 +410,16 @@ } for (String label : nic.getLabels()) { + // remove labeled networks originated in source cluster but not assigned to target cluster + List<Network> sourceLabeledNetworks = sourceNetworksByLabel.get(label); + if (sourceLabeledNetworks != null) { + for (Network net : sourceLabeledNetworks) { + if (configuredNetworkNotAssignedToCluster(targetNetworksByName, nicsByNetwork, net)) { + removeNetworkFromParameters(params, nic, net); + } + } + } + // configure networks by target cluster assignment List<Network> targetLabeledNetworks = targetNetworksByLabel.get(label); if (targetLabeledNetworks != null) { @@ -418,16 +428,6 @@ && !nicsByNetwork.containsKey(net.getName())) { configureNetwork(nic, params.getInterfaces(), net); } else if (configuredNetworkNotAssignedToCluster(targetNetworksByName, nicsByNetwork, net)) { - removeNetworkFromParameters(params, nic, net); - } - } - } - - // remove labeled networks originated in source cluster but not assigned to target cluster - List<Network> sourceLabeledNetworks = sourceNetworksByLabel.get(label); - if (sourceLabeledNetworks != null) { - for (Network net : sourceLabeledNetworks) { - if (configuredNetworkNotAssignedToCluster(targetNetworksByName, nicsByNetwork, net)) { removeNetworkFromParameters(params, nic, net); } } -- To view, visit http://gerrit.ovirt.org/24518 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I1ea644edbe7e3d314d4d1baf8a45b52d7a5a8f95 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
