Tal Nisan has submitted this change and it was merged.
Change subject: engine: Can't assign ip for a network attached to the same nic as
mgmt
......................................................................
engine: Can't assign ip for a network attached to the same nic as mgmt
The validation that caused this wrong blocking is
'networkIpAddressWasSameAsHostnameAndChanged()'.
Comparing the code of the validation in the old setup network command
to the new one, shows that besides the bug in the title, the old logic
was changed by mistake.
After rethinking about this validation we came to conclusion that the
old and the new validations block cases that may be permitted by the vdsm.
So we decided, for now, to remove the engine level validation. In case of
a real problem, the vdsm will perform a rollback.
Change-Id: Ia965a98c0a466d77238f45254f95e008145befcc
Bug-Url:
https://bugzilla.redhat.com/1340702
Signed-off-by: Alona Kaplan <alkaplan(a)redhat.com>
---
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/validator/NetworkAttachmentValidator.java
M
backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/validator/NetworkAttachmentValidatorTest.java
M
frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/hosts/HostSetupNetworksModel.java
M
frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/hosts/NetworkAttachmentModel.java
M
frontend/webadmin/modules/uicompat/src/main/java/org/ovirt/engine/ui/uicompat/UIConstants.java
M
frontend/webadmin/modules/uicompat/src/main/resources/org/ovirt/engine/ui/uicompat/UIConstants.properties
7 files changed, 2 insertions(+), 175 deletions(-)
Approvals:
Alona Kaplan: Verified
Jenkins CI: Passed CI tests
Moti Asayag: Looks good to me, approved
--
To view, visit
https://gerrit.ovirt.org/58658
To unsubscribe, visit
https://gerrit.ovirt.org/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ia965a98c0a466d77238f45254f95e008145befcc
Gerrit-PatchSet: 2
Gerrit-Project: ovirt-engine
Gerrit-Branch: ovirt-engine-4.0
Gerrit-Owner: Alona Kaplan <alkaplan(a)redhat.com>
Gerrit-Reviewer: Alona Kaplan <alkaplan(a)redhat.com>
Gerrit-Reviewer: Jenkins CI
Gerrit-Reviewer: Moti Asayag <masayag(a)redhat.com>
Gerrit-Reviewer: Tal Nisan <tnisan(a)redhat.com>
Gerrit-Reviewer: gerrit-hooks <automation(a)ovirt.org>