Change in ovirt-engine[master]: core, frontend: allow spice+vnc only on 3.6+ cluster
Tomas Jelinek has submitted this change and it was merged.
Change subject: core,frontend: allow spice+vnc only on 3.6+ cluster
......................................................................
core,frontend: allow spice+vnc only on 3.6+ cluster
Changes:
- do not add the SPICE+VNC option to the dialogs if not allowed
- check on add/edit if more than one graphics are allowed
- check on add new graphics device if it can be added
Change-Id: I4a52ae9f5525578e641e1d039fda048b1f447595
Bug-Url: https://bugzilla.redhat.com/1279524
Signed-off-by: Tomas Jelinek <tjelinek(a)redhat.com>
---
M
backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/AddGraphicsDeviceCommand.java
M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/VmHandler.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/common/src/main/java/org/ovirt/engine/core/common/queries/ConfigurationValues.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/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/ExistingVmModelBehavior.java
M
frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/UnitVmModel.java
M
frontend/webadmin/modules/uicommonweb/src/test/java/org/ovirt/engine/ui/uicommonweb/models/vms/BaseVmModelBehaviorTest.java
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
M packaging/dbscripts/upgrade/pre_upgrade/0000_config.sql
14 files changed, 52 insertions(+), 3 deletions(-)
Approvals:
Tomas Jelinek: Verified
Jenkins CI: Passed CI tests
Martin Betak: Looks good to me, but someone else must approve
Arik Hadas: Looks good to me, approved
--
To view, visit https://gerrit.ovirt.org/48753
To unsubscribe, visit https://gerrit.ovirt.org/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I4a52ae9f5525578e641e1d039fda048b1f447595
Gerrit-PatchSet: 2
Gerrit-Project: ovirt-engine
Gerrit-Branch: master
Gerrit-Owner: Tomas Jelinek <tjelinek(a)redhat.com>
Gerrit-Reviewer: Arik Hadas <ahadas(a)redhat.com>
Gerrit-Reviewer: Jenkins CI
Gerrit-Reviewer: Martin Betak <mbetak(a)redhat.com>
Gerrit-Reviewer: Tomas Jelinek <tjelinek(a)redhat.com>
Gerrit-Reviewer: gerrit-hooks <automation(a)ovirt.org>