Moti Asayag has submitted this change and it was merged.
Change subject: engine: error message improvement for detach network
......................................................................
engine: error message improvement for detach network
Simplify and format the detach network validation error message,
keeping it consistent.
Error format:
Cannot setup Networks. The following Logical Network: 'vmnet0'
is being used by the following VM(s): 'VM0, VM1' . Please stop
the VM(s) and try again.
This patch reverts several commits and adds minor improvements:
commit d83af7e2d39871b530a70b4441a5314bdba9fa2a.
commit ca61d275e72716f963ef55905b6b91aea6d952d7.
commit d8ec15e955aa75457b183ee1becbe34d80b05252.
Bug-Url:
https://bugzilla.redhat.com/1294354
Change-Id: Ia321e89368d09d3502a645c449d434dadbb5f2ef
Signed-off-by: Edward Haas <edwardh(a)redhat.com>
---
M
backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/host/HostSetupNetworksValidator.java
D
backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/validator/network/DetachNetworkUsedByVmValidator.java
M
backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/network/host/HostSetupNetworksValidatorTest.java
D
backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/validator/network/DetachNetworkUsedByVmValidatorTest.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/frontend/src/main/resources/org/ovirt/engine/ui/frontend/AppErrors.properties
M
frontend/webadmin/modules/userportal-gwtp/src/main/resources/org/ovirt/engine/ui/frontend/AppErrors.properties
M
frontend/webadmin/modules/webadmin/src/main/resources/org/ovirt/engine/ui/frontend/AppErrors.properties
10 files changed, 68 insertions(+), 155 deletions(-)
Approvals:
Marcin Mirecki: Looks good to me, but someone else must approve
Jenkins CI: Passed CI tests
Moti Asayag: Looks good to me, approved
Edward Haas: Verified
--
To view, visit
https://gerrit.ovirt.org/54967
To unsubscribe, visit
https://gerrit.ovirt.org/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ia321e89368d09d3502a645c449d434dadbb5f2ef
Gerrit-PatchSet: 6
Gerrit-Project: ovirt-engine
Gerrit-Branch: master
Gerrit-Owner: Edward Haas <edwardh(a)redhat.com>
Gerrit-Reviewer: Alona Kaplan <alkaplan(a)redhat.com>
Gerrit-Reviewer: Dan Kenigsberg <danken(a)redhat.com>
Gerrit-Reviewer: Edward Haas <edwardh(a)redhat.com>
Gerrit-Reviewer: Jenkins CI
Gerrit-Reviewer: Marcin Mirecki <mmirecki(a)redhat.com>
Gerrit-Reviewer: Martin Mucha <mmucha(a)redhat.com>
Gerrit-Reviewer: Moti Asayag <masayag(a)redhat.com>
Gerrit-Reviewer: Yevgeny Zaspitsky <yzaspits(a)redhat.com>
Gerrit-Reviewer: gerrit-hooks <automation(a)ovirt.org>