Attachment 943345 Details for Bug 1148706 – Proposed patch to fix the issue

[patch] Proposed patch to fix the issue

f.patch (text/plain), 2.75 KB, created by Juan Hernández on 2014-10-02 11:18:37 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Juan Hernández

Created: 2014-10-02 11:18:37 UTC

Size: 2.75 KB

patch

obsolete

>diff --git a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/VmBase.java b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/VmBase.java
>index b1ada38..b0d64ea 100644
>--- a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/VmBase.java
>+++ b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/VmBase.java
>@@ -14,6 +14,7 @@ import org.codehaus.jackson.annotate.JsonIgnore;
> import org.ovirt.engine.core.common.businessentities.OvfExportOnlyField.ExportOption;
> import org.ovirt.engine.core.common.businessentities.network.VmNetworkInterface;
> import org.ovirt.engine.core.common.config.ConfigValues;
>+import org.ovirt.engine.core.common.osinfo.OsRepository;
> import org.ovirt.engine.core.common.utils.ObjectUtils;
> import org.ovirt.engine.core.common.utils.ValidationUtils;
> import org.ovirt.engine.core.common.validation.annotation.IntegerContainedInConfigValueList;
>@@ -52,7 +53,7 @@ public class VmBase extends IVdcQueryable implements BusinessEntity<Guid>, Namea
> 
>     @CopyOnNewVersion
>     @EditableField
>-    private int osId;
>+    private int osId = OsRepository.AUTO_SELECT_OS;
> 
>     private Date creationDate;
> 
>diff --git a/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendVmsResource.java b/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendVmsResource.java
>index af6c6f6..d280b49 100644
>--- a/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendVmsResource.java
>+++ b/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendVmsResource.java
>@@ -51,7 +51,6 @@ import org.ovirt.engine.core.common.businessentities.VmPayload;
> import org.ovirt.engine.core.common.businessentities.VmStatic;
> import org.ovirt.engine.core.common.businessentities.VmTemplate;
> import org.ovirt.engine.core.common.interfaces.SearchType;
>-import org.ovirt.engine.core.common.osinfo.OsRepository;
> import org.ovirt.engine.core.common.queries.GetVmFromConfigurationQueryParameters;
> import org.ovirt.engine.core.common.queries.GetVmOvfByVmIdParameters;
> import org.ovirt.engine.core.common.queries.GetVmTemplateParameters;
>@@ -111,10 +110,6 @@ public class BackendVmsResource extends
> 
>                 VDSGroup cluster = lookupCluster(staticVm.getVdsGroupId());
> 
>-                if (Guid.Empty.equals(templateId) && !vm.isSetOs()) {
>-                    staticVm.setOsId(OsRepository.AUTO_SELECT_OS);
>-                }
>-
>                 if (Guid.Empty.equals(templateId) && !vm.isSetDisplay()) {
>                     staticVm.setDefaultDisplayType(null);
>                 }

Actions: View | Diff

Attachments on bug 1148706: 943345