Omer Frenkel has submitted this change and it was merged. Change subject: engine: nullify EmulatedMachine field only on cluster level change ...................................................................... engine: nullify EmulatedMachine field only on cluster level change It was reset all the time because the getParameters().getVdsGroup().getEmulatedMachine() was always null because the FE has no notion of the emulated machine. The setting to null done in this patch is not really neccesary because it is null anyway - done only to make it explicit and to be deffensive in case the FE starts to be aware of the emulated machine in the future. Change-Id: I8ffb180cfcd56c50b9bc228c0043e6fd5fee1c58 Bug-Url: https://bugzilla.redhat.com/show_bug.cgi?id=1004695 Signed-off-by: Tomas Jelinek <tjelinek(a)redhat.com&gt; Signed-off-by: Roy Golan <rgolan(a)redhat.com&gt; --- M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/AddVdsGroupCommand.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/UpdateVdsGroupCommand.java M backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/VDSGroup.java M backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/VdsGroupDAO.java M backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/VdsGroupDAODbFacadeImpl.java M backend/manager/modules/dal/src/test/java/org/ovirt/engine/core/dao/VdsGroupDAOTest.java M backend/manager/modules/dal/src/test/resources/fixtures.xml M backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/VirtMonitoringStrategy.java M frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/Cloner.java A packaging/dbscripts/upgrade/03_03_0870_add_detect_emulated_machine_to_cluster.sql M packaging/dbscripts/vds_groups_sp.sql 11 files changed, 106 insertions(+), 18 deletions(-) Approvals: Omer Frenkel: Verified; Looks good to me, approved -- To view, visit http://gerrit.ovirt.org/18898 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I8ffb180cfcd56c50b9bc228c0043e6fd5fee1c58 Gerrit-PatchSet: 8 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Tomas Jelinek <tjelinek(a)redhat.com&gt; Gerrit-Reviewer: Arik Hadas <ahadas(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: oVirt Jenkins CI Server