Change in ovirt-engine[master]: engine: Allow a VM trunk network be mixed with VLAN tagged ones

[alkaplan at redhat.com]

Alona Kaplan has submitted this change and it was merged.

Change subject: engine: Allow a VM trunk network be mixed with VLAN tagged ones
......................................................................


engine: Allow a VM trunk network be mixed with VLAN tagged ones

Allow a VM trunk network be mixed with VLAN tagged ones.
The new permissive validation is supported for a 3.6+ hosts only.

The patch includes refactoring that allows sharing the same validation
code between the legacy flow and the new network attachements flavor.

Change-Id: I3f0b52ad6bb91947848cb03d516b2b014f876769
Bug-Url: https://bugzilla.redhat.com/1227865
Signed-off-by: Yevgeny Zaspitsky <yzaspits at redhat.com>
---
M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/host/HostSetupNetworksCommand.java
M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/host/HostSetupNetworksValidator.java
M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/host/SetupNetworksCommand.java
M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/host/SetupNetworksHelper.java
M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/validator/NetworkAttachmentsValidator.java
A backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/validator/network/LegacyNetworkExclusivenessValidator.java
A backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/validator/network/NetworkExclusivenessValidator.java
A backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/validator/network/NetworkExclusivenessValidatorResolver.java
A backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/validator/network/NetworkType.java
A backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/validator/network/UntaggedNetworkPredicate.java
A backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/validator/network/VlanUntaggedNetworkExclusivenessValidator.java
M backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/network/host/HostSetupNetworksValidatorTest.java
M backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/network/host/SetupNetworksHelperTest.java
M backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/validator/NetworkAttachmentsValidatorTest.java
A backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/validator/network/LegacyNetworkExclusivenessValidatorTest.java
A backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/validator/network/NetworkExclusivenessValidatorResolverTest.java
A backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/validator/network/UntaggedNetworkPredicateTest.java
A backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/validator/network/VlanUntaggedNetworkExclusivenessValidatorTest.java
M backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/FeatureSupported.java
M backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/config/ConfigValues.java
M backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/errors/EngineMessage.java
M backend/manager/modules/dal/src/main/resources/bundles/AppErrors.properties
M frontend/webadmin/modules/frontend/src/main/java/org/ovirt/engine/ui/frontend/AppErrors.java
M frontend/webadmin/modules/webadmin/src/main/resources/org/ovirt/engine/ui/frontend/AppErrors.properties
M packaging/dbscripts/upgrade/pre_upgrade/0000_config.sql
25 files changed, 673 insertions(+), 123 deletions(-)

Approvals:
  Eli Mesika: Looks good to me, but someone else must approve
  Alona Kaplan: Looks good to me, approved; Passed CI tests
  Yevgeny Zaspitsky: Verified



-- 
To view, visit https://gerrit.ovirt.org/40784
To unsubscribe, visit https://gerrit.ovirt.org/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I3f0b52ad6bb91947848cb03d516b2b014f876769
Gerrit-PatchSet: 22
Gerrit-Project: ovirt-engine
Gerrit-Branch: master
Gerrit-Owner: Yevgeny Zaspitsky <yzaspits at redhat.com>
Gerrit-Reviewer: Alona Kaplan <alkaplan at redhat.com>
Gerrit-Reviewer: Eli Mesika <emesika at redhat.com>
Gerrit-Reviewer: Jenkins CI
Gerrit-Reviewer: Moti Asayag <masayag at redhat.com>
Gerrit-Reviewer: Yevgeny Zaspitsky <yzaspits at redhat.com>
Gerrit-Reviewer: automation at ovirt.org