Lior Vernia has submitted this change and it was merged. Change subject: webadmin: Allow custom properties on NIC without network ...................................................................... webadmin: Allow custom properties on NIC without network Previously a validation failed the Setup Networks command when a NIC had no network but had custom properties configured, which blocked removal of networks with custom properties. Now canDoAction() doesn't block this, but the custom properties are ignored (similarly to boot protocol) in case no network is configured on the NIC. Similar changes have been made to the QoS settings, which would cause the same problems. Change-Id: Ibded6b7b7ffe9be960d522bd63cbf9db08b18d6e Bug-Url: https://bugzilla.redhat.com/1119019 Signed-off-by: Lior Vernia <lvernia@redhat.com> --- M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/host/SetupNetworksHelper.java M backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/network/host/SetupNetworksHelperTest.java M backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/errors/VdcBllMessages.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 6 files changed, 42 insertions(+), 31 deletions(-) Approvals: Lior Vernia: Verified; Looks good to me, approved -- To view, visit http://gerrit.ovirt.org/30108 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ibded6b7b7ffe9be960d522bd63cbf9db08b18d6e Gerrit-PatchSet: 7 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Lior Vernia <lvernia@redhat.com> Gerrit-Reviewer: Lior Vernia <lvernia@redhat.com> Gerrit-Reviewer: Martin Mucha <mmucha@redhat.com> Gerrit-Reviewer: Moti Asayag <masayag@redhat.com> Gerrit-Reviewer: Yevgeny Zaspitsky <yzaspits@redhat.com> Gerrit-Reviewer: automation@ovirt.org Gerrit-Reviewer: oVirt Jenkins CI Server