Tomas Jelinek has submitted this change and it was merged. Change subject: backend: Enable configuration of VM serial number ...................................................................... backend: Enable configuration of VM serial number Added hierarchical configuration of serial numbers for VMs. The configuration "policy" is represented by a set of two properties: enum SerialNumberPolicy { HostId, VmId, Custom } and String customSerialNumber (used only in conjunction with the "Custom" policy.) * HostId policy means that no value should be passed to VDSM during the run of the Vm and thus forcing VDSM to fall back to the legacy mode when it will use HostUUID as Vm's serial number. * VmId policy means the VmUUID will be used as serial number giving user the ability to depend on the value of serial number between consecutive runs. * Custom policy means user can provide arbitrary string as serial number specified in the "customSerialNumber" property. This two values can be found in Vm, Template, Cluster and lastly in engine-config. In Vm, Template and Cluster the serialNumberPolicy is allowed to be set to 'null' meaning that default from higher entity will be used. The hierarchy is: VM -> Cluster -> engine-config Bug-Url: https://bugzilla.redhat.com/show_bug.cgi?id=918138 Change-Id: Ife7eb050ccf59603b905d16fd72e77521d4579df Signed-off-by: Martin Betak <mbetak(a)redhat.com&gt; --- M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/AddVmTemplateCommand.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/businessentities/BusinessEntitiesDefinitions.java A backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/HasSerialNumberPolicy.java A backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/SerialNumberPolicy.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/VmBase.java M backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/VmTemplate.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/VdcBllMessages.java M backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/queries/ConfigurationValues.java A backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/validation/SerialNumberPolicyValidator.java A backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/validation/annotation/ValidSerialNumberPolicy.java M backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dal/dbbroker/AbstractVmRowMapper.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/VmStaticDAODbFacadeImpl.java M backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/VmTemplateDAODbFacadeImpl.java M backend/manager/modules/dal/src/main/resources/bundles/AppErrors.properties M backend/manager/modules/dal/src/test/resources/fixtures.xml M backend/manager/modules/utils/src/main/java/org/ovirt/engine/core/utils/ovf/OvfReader.java M backend/manager/modules/utils/src/main/java/org/ovirt/engine/core/utils/ovf/OvfWriter.java M backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/CreateVDSCommand.java M backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/VdsProperties.java M backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/VmInfoBuilderBase.java A backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/VmSerialNumberBuilder.java A backend/manager/modules/vdsbroker/src/test/java/org/ovirt/engine/core/vdsbroker/vdsbroker/VmSerialNumberBuilderTest.java M frontend/webadmin/modules/frontend/src/main/java/org/ovirt/engine/ui/frontend/AppErrors.java M frontend/webadmin/modules/gwt-common/src/main/resources/org/ovirt/engine/core/Common.gwt.xml M frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/Cloner.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_05_0110_add_vm_serial_number_policy.sql M packaging/dbscripts/upgrade/pre_upgrade/0000_config.sql M packaging/dbscripts/vds_groups_sp.sql M packaging/dbscripts/vm_templates_sp.sql M packaging/dbscripts/vms_sp.sql M packaging/etc/engine-config/engine-config.properties 40 files changed, 626 insertions(+), 38 deletions(-) Approvals: Tomas Jelinek: Looks good to me, approved Martin Betak: Verified -- To view, visit http://gerrit.ovirt.org/25099 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ife7eb050ccf59603b905d16fd72e77521d4579df Gerrit-PatchSet: 9 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Martin Betak <mbetak(a)redhat.com&gt; Gerrit-Reviewer: Arik Hadas <ahadas(a)redhat.com&gt; Gerrit-Reviewer: Martin Betak <mbetak(a)redhat.com&gt; Gerrit-Reviewer: Omer Frenkel <ofrenkel(a)redhat.com&gt; Gerrit-Reviewer: Roy Golan <rgolan(a)redhat.com&gt; Gerrit-Reviewer: Tomas Jelinek <tjelinek(a)redhat.com&gt; Gerrit-Reviewer: automation(a)ovirt.org Gerrit-Reviewer: oVirt Jenkins CI Server