Ravi Nori has uploaded a new change for review. Change subject: restapi : GET: /api/vms/xxx/reporteddevices returns yaml not xml(#915036) ......................................................................
restapi : GET: /api/vms/xxx/reporteddevices returns yaml not xml(#915036) Api returns yaml for /api/vms/xxx/reporteddevices and /api/hosts/xxx/hooks This patch fixes the return type for reporteddevices and hooks. Change-Id: I90ff2099da3afd0713bf4a1e48c348c313c4e1ff Bug-Url: https://bugzilla.redhat.com/show_bug.cgi?id=915036 Signed-off-by: Ravi Nori <rn...@redhat.com> --- M backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendHostHookResource.java M backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendHostHooksResource.java M backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendVmReportedDeviceResource.java M backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendVmReportedDevicesResource.java 4 files changed, 0 insertions(+), 10 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/98/12698/1 diff --git a/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendHostHookResource.java b/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendHostHookResource.java index 5a1637f..743b8d9 100644 --- a/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendHostHookResource.java +++ b/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendHostHookResource.java @@ -1,7 +1,5 @@ package org.ovirt.engine.api.restapi.resource; -import javax.ws.rs.GET; - import org.ovirt.engine.api.model.Hook; import org.ovirt.engine.api.model.Hooks; import org.ovirt.engine.api.resource.HostHookResource; @@ -17,7 +15,6 @@ } @Override - @GET public Hook get() { Hooks hooks = parent.list(); return getHook(hooks); diff --git a/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendHostHooksResource.java b/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendHostHooksResource.java index 424cb96..0ac732b 100644 --- a/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendHostHooksResource.java +++ b/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendHostHooksResource.java @@ -2,7 +2,6 @@ import java.util.HashMap; -import javax.ws.rs.GET; import javax.ws.rs.Path; import javax.ws.rs.PathParam; import javax.ws.rs.core.Response; @@ -25,7 +24,6 @@ private String hostId; @Override - @GET public Hooks list() { @SuppressWarnings("unchecked") HashMap<String, HashMap<String, HashMap<String, String>>> hooksMap = diff --git a/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendVmReportedDeviceResource.java b/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendVmReportedDeviceResource.java index fc9039d..e520f20 100644 --- a/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendVmReportedDeviceResource.java +++ b/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendVmReportedDeviceResource.java @@ -1,7 +1,5 @@ package org.ovirt.engine.api.restapi.resource; -import javax.ws.rs.GET; - import org.ovirt.engine.api.model.ReportedDevice; import org.ovirt.engine.api.resource.VmReportedDeviceResource; import org.ovirt.engine.core.common.businessentities.VmGuestAgentInterface; @@ -15,7 +13,6 @@ this.parent = vmDevicesResource; } - @GET @Override public ReportedDevice get() { return parent.lookupReportedDevice(asGuid(id)); diff --git a/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendVmReportedDevicesResource.java b/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendVmReportedDevicesResource.java index d72dd03..bfa47d1 100644 --- a/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendVmReportedDevicesResource.java +++ b/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendVmReportedDevicesResource.java @@ -2,7 +2,6 @@ import java.util.List; -import javax.ws.rs.GET; import javax.ws.rs.Path; import javax.ws.rs.PathParam; import javax.ws.rs.core.Response; @@ -39,7 +38,6 @@ } @Override - @GET public ReportedDevices list() { ReportedDevices model = new ReportedDevices(); for (VmGuestAgentInterface device : getCollection()) { -- To view, visit http://gerrit.ovirt.org/12698 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I90ff2099da3afd0713bf4a1e48c348c313c4e1ff Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Ravi Nori <rn...@redhat.com> _______________________________________________ Engine-patches mailing list Engine-patches@ovirt.org http://lists.ovirt.org/mailman/listinfo/engine-patches
