Moti Asayag has uploaded a new change for review. Change subject: engine: Rename methods to reflect their purpose ......................................................................
engine: Rename methods to reflect their purpose Change-Id: I65883b6b1e70c9fb0ad88670a2e7ff0a16c5ea79 Signed-off-by: Moti Asayag <[email protected]> --- M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/dc/NetworkCommon.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/dc/RemoveNetworkCommand.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/dc/UpdateNetworkCommand.java 3 files changed, 6 insertions(+), 6 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/49/10749/1 diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/dc/NetworkCommon.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/dc/NetworkCommon.java index d8e4e8a..8d95b74 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/dc/NetworkCommon.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/dc/NetworkCommon.java @@ -114,7 +114,7 @@ : ValidationResult.VALID; } - protected ValidationResult networkNotUsedByRunningVm() { + protected ValidationResult networkNotUsedByVms() { String networkName = getNetworkName(); for (NetworkCluster clusterAttachment : getClusterAttachments()) { List<VmStatic> vms = @@ -134,7 +134,7 @@ return clusterAttachments; } - protected ValidationResult networkNotUsedByHost(final Network network) { + protected ValidationResult networkNotUsedByHosts(final Network network) { List<VDS> hostsWithNetwork = getVdsDAO().getAllForNetwork(network.getId()); if (hostsWithNetwork.isEmpty()) { return ValidationResult.VALID; diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/dc/RemoveNetworkCommand.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/dc/RemoveNetworkCommand.java index ebae8fc..6b7f6f6 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/dc/RemoveNetworkCommand.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/dc/RemoveNetworkCommand.java @@ -33,9 +33,9 @@ protected boolean canDoAction() { return validate(networkExists(geRemovedtNetwork())) && validate(notManagementNetwork()) - && validate(networkNotUsedByRunningVm()) + && validate(networkNotUsedByVms()) && validate(networkNotUsedByTemplates(geRemovedtNetwork())) - && validate(networkNotUsedByHost(geRemovedtNetwork())); + && validate(networkNotUsedByHosts(geRemovedtNetwork())); } @Override 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 99192b4..721e457 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 @@ -50,8 +50,8 @@ && validate(networkExists(getOldNetwork())) && validate(notChangingManagementNetworkName()) && validate(networkNameNotUsed()) - && validate(networkNotUsedByRunningVm()) - && validate(networkNotUsedByHost(getOldNetwork())); + && validate(networkNotUsedByVms()) + && validate(networkNotUsedByHosts(getOldNetwork())); } @Override -- To view, visit http://gerrit.ovirt.org/10749 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I65883b6b1e70c9fb0ad88670a2e7ff0a16c5ea79 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
