Lior Vernia has uploaded a new change for review. Change subject: engine: NetworkClusterValidator refactoring ......................................................................
engine: NetworkClusterValidator refactoring Refactored some code related to NetworkClusterValidator, specifically so that it can extend NetworkValidator and later be possibly used more widely for network validation on the cluster level. Change-Id: Id405292de1233fe8fc546e47baa92f644d591638 Signed-off-by: Lior Vernia <[email protected]> --- M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/cluster/AttachNetworkToVdsGroupCommand.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/cluster/NetworkClusterValidator.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/cluster/UpdateNetworkOnClusterCommand.java M backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/network/cluster/NetworkClusterValidatorTest.java 4 files changed, 24 insertions(+), 14 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/49/11949/1 diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/cluster/AttachNetworkToVdsGroupCommand.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/cluster/AttachNetworkToVdsGroupCommand.java index 12c879b..7db0833 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/cluster/AttachNetworkToVdsGroupCommand.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/cluster/AttachNetworkToVdsGroupCommand.java @@ -60,10 +60,10 @@ @Override protected boolean canDoAction() { - NetworkClusterValidator validator = new NetworkClusterValidator(getNetworkCluster()); + NetworkClusterValidator validator = new NetworkClusterValidator(getNetwork(), getNetworkCluster()); return vdsGroupExists() && changesAreClusterCompatible() && logicalNetworkExists() && (!NetworkUtils.isManagementNetwork(getNetwork()) - || validate(validator.managementNetworkAttachment(getNetworkName()))); + || validate(validator.managementNetworkAttachment())); } private boolean logicalNetworkExists() { diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/cluster/NetworkClusterValidator.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/cluster/NetworkClusterValidator.java index c028c74..2a84b90 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/cluster/NetworkClusterValidator.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/cluster/NetworkClusterValidator.java @@ -1,30 +1,31 @@ package org.ovirt.engine.core.bll.network.cluster; import org.ovirt.engine.core.bll.ValidationResult; +import org.ovirt.engine.core.bll.validator.NetworkValidator; +import org.ovirt.engine.core.common.businessentities.network.Network; import org.ovirt.engine.core.common.businessentities.network.NetworkCluster; import org.ovirt.engine.core.dal.VdcBllMessages; /** * Validator class for {@link NetworkCluster} instances. */ -public class NetworkClusterValidator { +public class NetworkClusterValidator extends NetworkValidator { protected static final String NETWORK_NAME_REPLACEMENT = "$NetworkName %s"; - private NetworkCluster networkCluster; + protected NetworkCluster networkCluster; - public NetworkClusterValidator(NetworkCluster networkCluster) { + public NetworkClusterValidator(Network network, NetworkCluster networkCluster) { + super(network); this.networkCluster = networkCluster; } /** * Make sure the management network attachment is valid: The network must be required. * - * @param networkName - * The network's name. * @return Error iff the management network attachment is not valid. */ - public ValidationResult managementNetworkAttachment(String networkName) { + public ValidationResult managementNetworkAttachment() { return networkCluster.isRequired() ? ValidationResult.VALID : new ValidationResult(VdcBllMessages.ACTION_TYPE_FAILED_MANAGEMENT_NETWORK_REQUIRED, - String.format(NETWORK_NAME_REPLACEMENT, networkName)); + String.format(NETWORK_NAME_REPLACEMENT, network.getName())); } } diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/cluster/UpdateNetworkOnClusterCommand.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/cluster/UpdateNetworkOnClusterCommand.java index 2fd5d16..e3fa444 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/cluster/UpdateNetworkOnClusterCommand.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/cluster/UpdateNetworkOnClusterCommand.java @@ -66,10 +66,10 @@ @Override protected boolean canDoAction() { - NetworkClusterValidator validator = new NetworkClusterValidator(getNetworkCluster()); + NetworkClusterValidator validator = new NetworkClusterValidator(getNetwork(), getNetworkCluster()); return validate(networkClusterAttachmentExists()) && (!NetworkUtils.isManagementNetwork(getNetwork()) - || validate(validator.managementNetworkAttachment(getNetworkName()))); + || validate(validator.managementNetworkAttachment())); } private ValidationResult networkClusterAttachmentExists() { diff --git a/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/network/cluster/NetworkClusterValidatorTest.java b/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/network/cluster/NetworkClusterValidatorTest.java index c0942cf..8bccdbd 100644 --- a/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/network/cluster/NetworkClusterValidatorTest.java +++ b/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/network/cluster/NetworkClusterValidatorTest.java @@ -2,8 +2,10 @@ import static org.junit.Assert.assertEquals; +import org.junit.Before; import org.junit.Test; import org.ovirt.engine.core.bll.ValidationResult; +import org.ovirt.engine.core.common.businessentities.network.Network; import org.ovirt.engine.core.common.businessentities.network.NetworkCluster; import org.ovirt.engine.core.dal.VdcBllMessages; import org.ovirt.engine.core.utils.RandomUtils; @@ -16,15 +18,22 @@ private static final String NETWORK_NAME_REPLACEMENT = String.format( NetworkClusterValidator.NETWORK_NAME_REPLACEMENT, NETWORK_NAME); + private Network network = new Network(); + private NetworkCluster networkCluster = new NetworkCluster(); - private NetworkClusterValidator validator = new NetworkClusterValidator(networkCluster); + private NetworkClusterValidator validator = new NetworkClusterValidator(network, networkCluster); + + @Before + public void setup() { + network.setName(NETWORK_NAME); + } @Test public void managementNetworkAttachmentValid() throws Exception { networkCluster.setRequired(true); - assertEquals(ValidationResult.VALID, validator.managementNetworkAttachment(NETWORK_NAME)); + assertEquals(ValidationResult.VALID, validator.managementNetworkAttachment()); } @Test @@ -32,6 +41,6 @@ networkCluster.setRequired(false); assertEquals(new ValidationResult(VdcBllMessages.ACTION_TYPE_FAILED_MANAGEMENT_NETWORK_REQUIRED, NETWORK_NAME_REPLACEMENT), - validator.managementNetworkAttachment(NETWORK_NAME)); + validator.managementNetworkAttachment()); } } -- To view, visit http://gerrit.ovirt.org/11949 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Id405292de1233fe8fc546e47baa92f644d591638 Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Lior Vernia <[email protected]> _______________________________________________ Engine-patches mailing list [email protected] http://lists.ovirt.org/mailman/listinfo/engine-patches
