Muli Salem has posted comments on this change.
Change subject: engine: Network Command Validation
......................................................................
Patch Set 2: (7 inline comments)
....................................................
File
backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/dc/AddNetworkCommand.java
Line 121: : new
ValidationResult(VdcBllMessages.NETWORK_NAME_ALREADY_EXISTS);
Line 122: }
Line 123:
Line 124: private Network getNetworkByName(List<Network> networks) {
Line 125: return LinqUtils.firstOrNull(networks, new
Predicate<Network>() {
Will be done in next patch.
Line 126: @Override
Line 127: public boolean eval(Network network) {
Line 128: return network.getname().equals(getNetworkName());
Line 129: }
....................................................
File
backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/dc/NetworkCommon.java
Line 75: ? ValidationResult.VALID
Line 76: : new
ValidationResult(VdcBllMessages.NETWORK_CLUSTER_NETWORK_IN_USE);
Line 77: }
Line 78:
Line 79: protected ValidationResult networkNameStartsWithoutBond() {
Done
Line 80: return getNetworkName().toLowerCase().startsWith("bond")
Line 81: ? new
ValidationResult(VdcBllMessages.NETWORK_CANNOT_CONTAIN_BOND_NAME)
Line 82: : ValidationResult.VALID;
Line 83: }
....................................................
File
backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/dc/UpdateNetworkCommand.java
Line 99: return super.getValidationGroups();
Line 100: }
Line 101:
Line 102: private Network getNetworkById(List<Network> networks) {
Line 103: return LinqUtils.firstOrNull(networks, new
Predicate<Network>() {
Will be done in next patch.
Line 104: @Override
Line 105: public boolean eval(Network network) {
Line 106: return network.getId().equals(getNetwork().getId());
Line 107: }
Line 120: : ValidationResult.VALID;
Line 121: }
Line 122:
Line 123: private ValidationResult networkNameNotUsed(List<Network>
networks) {
Line 124: Network networkWithSameName = LinqUtils.firstOrNull(networks,
new Predicate<Network>() {
Will be done in next patch.
Line 125: @Override
Line 126: public boolean eval(Network network) {
Line 127: return network.getname().trim().toLowerCase()
Line 128: .equals(getNetworkName().trim().toLowerCase())
Line 144: }
Line 145: }
Line 146: return ValidationResult.VALID;
Line 147: }
Line 148:
Although it is called notDefaultNetwork, it actually means - not changing name
of default network. We need to add a different validation for
RemoveNetworkCommand.
Line 149: private ValidationResult notDefaultNetwork(Network oldNetwork) {
Line 150: String defaultNetwork = Config.<String>
GetValue(ConfigValues.ManagementNetwork);
Line 151: return oldNetwork.getname().equals(defaultNetwork) &&
Line 152: !getNetworkName().equals(defaultNetwork)
Line 145: }
Line 146: return ValidationResult.VALID;
Line 147: }
Line 148:
Line 149: private ValidationResult notDefaultNetwork(Network oldNetwork) {
Done
Line 150: String defaultNetwork = Config.<String>
GetValue(ConfigValues.ManagementNetwork);
Line 151: return oldNetwork.getname().equals(defaultNetwork) &&
Line 152: !getNetworkName().equals(defaultNetwork)
Line 153: ? new
ValidationResult(VdcBllMessages.NETWORK_CAN_NOT_REMOVE_DEFAULT_NETWORK)
Line 147: }
Line 148:
Line 149: private ValidationResult notDefaultNetwork(Network oldNetwork) {
Line 150: String defaultNetwork = Config.<String>
GetValue(ConfigValues.ManagementNetwork);
Line 151: return oldNetwork.getname().equals(defaultNetwork) &&
Done
Line 152: !getNetworkName().equals(defaultNetwork)
Line 153: ? new
ValidationResult(VdcBllMessages.NETWORK_CAN_NOT_REMOVE_DEFAULT_NETWORK)
Line 154: : ValidationResult.VALID;
Line 155: }
--
To view, visit http://gerrit.ovirt.org/10542
To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: comment
Gerrit-Change-Id: I4bb5bafd2029b3a8729bcf78d359804c6f587ff7
Gerrit-PatchSet: 2
Gerrit-Project: ovirt-engine
Gerrit-Branch: master
Gerrit-Owner: Muli Salem <[email protected]>
Gerrit-Reviewer: Mike Kolesnik <[email protected]>
Gerrit-Reviewer: Moti Asayag <[email protected]>
Gerrit-Reviewer: Muli Salem <[email protected]>
_______________________________________________
Engine-patches mailing list
[email protected]
http://lists.ovirt.org/mailman/listinfo/engine-patches
