Shahar Havivi has uploaded a new change for review. Change subject: restapi: set domain for vm-init ......................................................................
restapi: set domain for vm-init Wrong check for setting domain for VM Change-Id: Ia3ee9738b4003b1e094d59a21313f6f84e73ce7f Bug-Url: https://bugzilla.redhat.com/show_bug.cgi?id=1069201 Signed-off-by: Shahar Havivi <shah...@redhat.com> --- M backend/manager/modules/restapi/types/src/main/java/org/ovirt/engine/api/restapi/types/VmMapper.java 1 file changed, 2 insertions(+), 1 deletion(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/73/25373/1 diff --git a/backend/manager/modules/restapi/types/src/main/java/org/ovirt/engine/api/restapi/types/VmMapper.java b/backend/manager/modules/restapi/types/src/main/java/org/ovirt/engine/api/restapi/types/VmMapper.java index ddd0fd0..a6cf6c6 100644 --- a/backend/manager/modules/restapi/types/src/main/java/org/ovirt/engine/api/restapi/types/VmMapper.java +++ b/backend/manager/modules/restapi/types/src/main/java/org/ovirt/engine/api/restapi/types/VmMapper.java @@ -295,7 +295,8 @@ if (staticVm.getVmInit() == null) { staticVm.setVmInit(new VmInit()); } - if (staticVm.getVmInit().getDomain() == null) { + // We don't want to override the domain if it set via the Initialization object + if (!vm.isSetInitialization() || !vm.getInitialization().isSetDomain()) { staticVm.getVmInit().setDomain(vm.getDomain().getName()); } } -- To view, visit http://gerrit.ovirt.org/25373 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ia3ee9738b4003b1e094d59a21313f6f84e73ce7f Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Shahar Havivi <shav...@redhat.com> _______________________________________________ Engine-patches mailing list Engine-patches@ovirt.org http://lists.ovirt.org/mailman/listinfo/engine-patches
