Change in ovirt-engine[master]: engine: added spice proxy to vds and vm_static
tjelinek at redhat.com
tjelinek at redhat.com
Wed Dec 18 13:30:51 UTC 2013
Tomas Jelinek has submitted this change and it was merged.
Change subject: engine: added spice proxy to vds and vm_static
......................................................................
engine: added spice proxy to vds and vm_static
This patch adds the spice_proxy field to vds and to
vm_pools.
The meaning of this field is to give the possibility to override the
SpiceProxyDefault configuration from vdc_options on two different levels
(cluster and pool).
Change-Id: I5dd4f5ef908464d75af6911eedf2dd053d07cb9e
Bug-Url: https://bugzilla.redhat.com/show_bug.cgi?id=974076
Signed-off-by: Tomas Jelinek <tjelinek at redhat.com>
---
M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/AddVmPoolCommand.java
M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/AddVmPoolWithVmsCommand.java
M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/UpdateVmPoolWithVmsCommand.java
M backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/BusinessEntitiesDefinitions.java
M backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/VDSGroup.java
M backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/VM.java
M backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/VmPool.java
M backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/utils/ValidationUtils.java
A backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/validation/UriConstraint.java
A backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/validation/annotation/ValidUri.java
M backend/manager/modules/common/src/test/java/org/ovirt/engine/core/common/utils/ValidationUtilsTest.java
M backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/VdsGroupDAODbFacadeImpl.java
M backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/VmDAODbFacadeImpl.java
M backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/VmPoolDAODbFacadeImpl.java
M backend/manager/modules/dal/src/main/resources/bundles/AppErrors.properties
M backend/manager/modules/dal/src/test/resources/fixtures.xml
M frontend/webadmin/modules/frontend/src/main/java/org/ovirt/engine/ui/frontend/AppErrors.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/create_views.sql
A packaging/dbscripts/upgrade/03_04_0290_add_spice_proxy_to_vds_groups_and_vm_pools.sql
M packaging/dbscripts/vds_groups_sp.sql
M packaging/dbscripts/vm_pools_sp.sql
23 files changed, 208 insertions(+), 26 deletions(-)
Approvals:
Tomas Jelinek: Verified; Looks good to me, approved
--
To view, visit http://gerrit.ovirt.org/21518
To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I5dd4f5ef908464d75af6911eedf2dd053d07cb9e
Gerrit-PatchSet: 10
Gerrit-Project: ovirt-engine
Gerrit-Branch: master
Gerrit-Owner: Tomas Jelinek <tjelinek at redhat.com>
Gerrit-Reviewer: Eli Mesika <elimesika at gmail.com>
Gerrit-Reviewer: Omer Frenkel <ofrenkel at redhat.com>
Gerrit-Reviewer: Tomas Jelinek <tjelinek at redhat.com>
Gerrit-Reviewer: oVirt Jenkins CI Server
More information about the Engine-commits
mailing list