Moti Asayag has uploaded a new change for review. Change subject: engine: Print correct message for network used by templates ......................................................................
engine: Print correct message for network used by templates Change-Id: Ic398609b1133665217cb5e59dacbfb30ea78eeb3 Bug-Url: https://bugzilla.redhat.com/1058030 Signed-off-by: Moti Asayag <masa...@redhat.com> --- M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/dc/UpdateNetworkCommand.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/validator/NetworkValidator.java 2 files changed, 3 insertions(+), 4 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/97/24997/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 dc17142..6e20ff0 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 @@ -218,7 +218,7 @@ public ValidationResult nonVmNetworkNotUsedByVms(Network updatedNetwork) { if (networkChangedToNonVmNetwork(updatedNetwork)) { - return networkNotUsed(getVms(), VdcBllMessages.VAR__ENTITIES__VMS); + return networkNotUsedByVms(); } return ValidationResult.VALID; @@ -249,7 +249,7 @@ public ValidationResult nonVmNetworkNotUsedByTemplates(Network updatedNetwork) { if (networkChangedToNonVmNetwork(updatedNetwork)) { - return networkNotUsed(getTemplates(), VdcBllMessages.VAR__ENTITIES__VMS); + return networkNotUsedByTemplates(); } return ValidationResult.VALID; diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/validator/NetworkValidator.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/validator/NetworkValidator.java index b94edae..9eac8a1 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/validator/NetworkValidator.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/validator/NetworkValidator.java @@ -175,8 +175,7 @@ * @return An error iff the network is in use by any templates. */ public ValidationResult networkNotUsedByTemplates() { - return networkNotUsed(getTemplates(), - VdcBllMessages.VAR__ENTITIES__VM_TEMPLATES); + return networkNotUsed(getTemplates(), VdcBllMessages.VAR__ENTITIES__VM_TEMPLATES); } /** -- To view, visit http://gerrit.ovirt.org/24997 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ic398609b1133665217cb5e59dacbfb30ea78eeb3 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
