Muli Salem has posted comments on this change.
Change subject: engine: Moving Duplicate Code to Base Class
......................................................................
Patch Set 2: (7 inline comments)
....................................................
File
backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/vm/AbstractVmInterfaceCommand.java
Line 77: ? new
ValidationResult(VdcBllMessages.NETWORK_MAC_ADDRESS_IN_USE)
Line 78: : ValidationResult.VALID;
Line 79: }
Line 80:
Line 81: protected ValidationResult validMacAddress() {
Done
Line 82: return
Pattern.matches(ValidationUtils.INVALID_NULLABLE_MAC_ADDRESS, getMacAddress())
Line 83: ? new
ValidationResult(VdcBllMessages.NETWORK_INVALID_MAC_ADDRESS)
Line 84: : ValidationResult.VALID;
Line 85: }
Line 89: getReturnValue().getCanDoActionMessages());
Line 90: }
Line 91:
Line 92: protected boolean pciAndIdeWithinLimit(VmStatic vm,
List<VmNetworkInterface> allInterfaces, List<Disk> allDisks) {
Line 93: return !checkPciAndIdeLimit(vm.getNumOfMonitors(),
allInterfaces, allDisks,
Done
Line 94: getReturnValue().getCanDoActionMessages());
Line 95: }
Line 96:
Line 97: protected ValidationResult vmTemplateEmpty() {
Line 100: : ValidationResult.VALID;
Line 101: }
Line 102:
Line 103: protected Network getNetworkFromDb(Guid vdsGroupId) {
Line 104: List<Network> networks =
getNetworkDAO().getAllForCluster(vdsGroupId);
Done
Line 105: for (Network network : networks) {
Line 106: if (network.getName().equals(getNetworkName())) {
Line 107: return network;
Line 108: }
....................................................
File
backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/vm/AddVmInterfaceCommand.java
Line 37
Line 38
Line 39
Line 40
Line 41
Done
....................................................
File
backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/vm/UpdateVmInterfaceCommand.java
Line 33: import org.ovirt.engine.core.utils.linq.Predicate;
Line 34: import org.ovirt.engine.core.utils.transaction.TransactionMethod;
Line 35: import org.ovirt.engine.core.utils.transaction.TransactionSupport;
Line 36:
Line 37: @NonTransactiveCommandAttribute(forceCompensation = true)
Done
Line 38: @CustomLogFields({ @CustomLogField("NetworkName"),
@CustomLogField("InterfaceName") })
Line 39: public class UpdateVmInterfaceCommand<T extends
AddVmInterfaceParameters> extends AbstractVmInterfaceCommand<T> {
Line 40:
Line 41: private static final long serialVersionUID = -2404956975945588597L;
Line 158: return false;
Line 159: }
Line 160:
Line 161: if (!StringUtils.equals(oldIface.getName(),
getInterfaceName())) {
Line 162: if (!uniqueInterfaceName(interfaces)) {
Done
Line 163: return false;
Line 164: }
Line 165: }
Line 166:
Line 199: }
Line 200:
Line 201: macShouldBeChanged =
!StringUtils.equals(oldIface.getMacAddress(), getMacAddress());
Line 202: if (macShouldBeChanged) {
Line 203: if (!validate(validMacAddress()) ||
!validate(macAvailable())) {
Done
Line 204: return false;
Line 205: }
Line 206: }
Line 207: return true;
--
To view, visit http://gerrit.ovirt.org/11362
To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: comment
Gerrit-Change-Id: I3b07249bc2e554e2a420792fd100781dff748958
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