Tomas Jelinek has submitted this change and it was merged. Change subject: core: added support for version check for remote-viewer ...................................................................... core: added support for version check for remote-viewer Added 2 new fields to the vdc_options also accessible using engine-config tool: RemoteViewerSupportedVersions and RemoteViewerNewerVersionUrl. - RemoteViewerSupportedVersions: list of supported versions for OS. Format: <os1>:<minimal version supported1>;<os2>:<minimal version supported2> example: linux:3.0;windows:2.5 - RemoteViewerNewerVersionUrl: when the version check fals, this url is shown to the user by remote-viewer. It supports the following formats: + free text (e.g. http://some.url) + ${engine_base_url}: a variable replaced by the url on which engine is running (e.g. http://localhost:8080) + ${console_client_resources_url}: replaced by the value of the "obrand.common.console_client_resources_url" of the branding resource. If defined as absolute path, used. If defined as a relative path, it is concatinated with the engine base url. + any combination of the above (e.g. ${engine_base_url}/my/custom/address) Change-Id: I4f99a1b41b193a172d10257a910675c6058b037b Bug-Url: https://bugzilla.redhat.com/1228275 Signed-off-by: Tomas Jelinek <tjelinek@redhat.com> --- M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/ConfigureConsoleOptionsQuery.java M backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/ConfigureConsoleOptionsQueryTest.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/console/ConsoleDescriptorGenerator.java M backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/console/ConsoleOptions.java M backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/queries/ConfigurationValues.java M backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/queries/ConfigureConsoleOptionsParams.java A backend/manager/tools/src/main/java/org/ovirt/engine/core/config/entity/helper/RemoteViewerSupportedVersionsValueHelper.java A backend/manager/tools/src/test/java/org/ovirt/engine/core/config/entity/helper/RemoteViewerSupportedVersionsValueHelperTest.java M packaging/dbscripts/upgrade/pre_upgrade/0000_config.sql M packaging/etc/engine-config/engine-config.properties 11 files changed, 294 insertions(+), 1 deletion(-) Approvals: Tomas Jelinek: Verified Eli Mesika: Looks good to me, but someone else must approve Jenkins CI: Verified Arik Hadas: Looks good to me, approved -- To view, visit https://gerrit.ovirt.org/41879 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I4f99a1b41b193a172d10257a910675c6058b037b Gerrit-PatchSet: 9 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Tomas Jelinek <tjelinek@redhat.com> Gerrit-Reviewer: Arik Hadas <ahadas@redhat.com> Gerrit-Reviewer: Eli Mesika <emesika@redhat.com> Gerrit-Reviewer: Jenkins CI Gerrit-Reviewer: Omer Frenkel <ofrenkel@redhat.com> Gerrit-Reviewer: Tomas Jelinek <tjelinek@redhat.com> Gerrit-Reviewer: automation@ovirt.org