Alona Kaplan has uploaded a new change for review.
Change subject: engine: Refactor 'validate(..)' calls of
AddVmTemplateInterfaceCommand
......................................................................
engine: Refactor 'validate(..)' calls of AddVmTemplateInterfaceCommand
Change-Id: I157a8143fff50e78224c2ce9c9863e5ae6422d80
Signed-off-by: Alona Kaplan <alkap...@redhat.com>
---
M
backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/template/AddVmTemplateInterfaceCommand.java
1 file changed, 5 insertions(+), 7 deletions(-)
git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/58/39558/1
diff --git
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/template/AddVmTemplateInterfaceCommand.java
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/template/AddVmTemplateInterfaceCommand.java
index 2bea3c8..ea6e378 100644
---
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/template/AddVmTemplateInterfaceCommand.java
+++
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/template/AddVmTemplateInterfaceCommand.java
@@ -83,13 +83,11 @@
Version clusterCompatibilityVersion =
getVdsGroup().getCompatibilityVersion();
VmNicValidator nicValidator = new
VmNicValidator(getParameters().getInterface(), clusterCompatibilityVersion,
getVmTemplate().getOsId());
- if (!validate(nicValidator.linkedCorrectly())
- || !validate(nicValidator.isCompatibleWithOs())
- || !validate(nicValidator.emptyNetworkValid())
- ||
!validate(nicValidator.profileValid(getVmTemplate().getVdsGroupId()))
- || !validate(nicValidator.typeMatchesProfile())) {
- return false;
- }
+ return validate(nicValidator.linkedCorrectly())
+ && validate(nicValidator.isCompatibleWithOs())
+ && validate(nicValidator.emptyNetworkValid())
+ &&
validate(nicValidator.profileValid(getVmTemplate().getVdsGroupId()))
+ && validate(nicValidator.typeMatchesProfile());
}
return true;
--
To view, visit https://gerrit.ovirt.org/39558
To unsubscribe, visit https://gerrit.ovirt.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I157a8143fff50e78224c2ce9c9863e5ae6422d80
Gerrit-PatchSet: 1
Gerrit-Project: ovirt-engine
Gerrit-Branch: master
Gerrit-Owner: Alona Kaplan <alkap...@redhat.com>
_______________________________________________
Engine-patches mailing list
Engine-patches@ovirt.org
http://lists.ovirt.org/mailman/listinfo/engine-patches
