Roy Golan has uploaded a new change for review. Change subject: core: WIP libosinfo refactor for REST part ......................................................................
core: WIP libosinfo refactor for REST part Change-Id: Ib0c833ed7bfc8a009e1510a00615ef5a27050593 Signed-off-by: Roy Golan <[email protected]> --- M backend/manager/modules/restapi/jaxrs/pom.xml M backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendVmResource.java M backend/manager/modules/restapi/types/src/main/java/org/ovirt/engine/api/restapi/types/VmMapper.java 3 files changed, 8 insertions(+), 2 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/61/9061/1 diff --git a/backend/manager/modules/restapi/jaxrs/pom.xml b/backend/manager/modules/restapi/jaxrs/pom.xml index 2fbbadc..02bebc4 100644 --- a/backend/manager/modules/restapi/jaxrs/pom.xml +++ b/backend/manager/modules/restapi/jaxrs/pom.xml @@ -94,6 +94,11 @@ <scope>test</scope> </dependency> + <dependency> + <groupId>org.ovirt.engine.core.libosinfo</groupId> + <artifactId>libosinfo-service</artifactId> + <version>3.1.0</version> + </dependency> </dependencies> </project> diff --git a/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendVmResource.java b/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendVmResource.java index 9c10298..f84571e 100644 --- a/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendVmResource.java +++ b/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendVmResource.java @@ -63,6 +63,7 @@ import org.ovirt.engine.core.common.queries.VdcQueryReturnValue; import org.ovirt.engine.core.common.queries.VdcQueryType; import org.ovirt.engine.core.compat.Guid; +import org.ovirt.engine.core.services.libosinfo.OsHelper; public class BackendVmResource extends AbstractBackendActionableResource<VM, org.ovirt.engine.core.common.businessentities.VM> implements @@ -236,7 +237,7 @@ VdcQueryType.GetVmByVmId, new GetVmByVmIdParameters(guid), "VM"); - if(vm.getvm_os().isWindows() && vm.getIsFirstRun()) { + if (OsHelper.isWindows(vm.getvm_os().name()) && vm.getIsFirstRun()) { params.setReinitialize(true); } return params; 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 8bd7f88..a088a16 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 @@ -281,7 +281,7 @@ entity.getkernel_params() != null) { OperatingSystem os = new OperatingSystem(); if (entity.getvm_os() != null) { - OsType osType = VmMapper.map(entity.getos(), null); + OsType osType = VmMapper.map(entity.getvm_os(), null); if (osType != null) { os.setType(osType.value()); } -- To view, visit http://gerrit.ovirt.org/9061 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ib0c833ed7bfc8a009e1510a00615ef5a27050593 Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Roy Golan <[email protected]> _______________________________________________ Engine-patches mailing list [email protected] http://lists.ovirt.org/mailman/listinfo/engine-patches
