Change in ovirt-engine[ovirt-engine-4.0.2]: restapi: Fix V3 VM and template disks collection links

oourfali at redhat.com oourfali at redhat.com
Tue Jul 26 08:22:59 UTC 2016


Oved Ourfali has submitted this change and it was merged.

Change subject: restapi: Fix V3 VM and template disks collection links
......................................................................


restapi: Fix V3 VM and template disks collection links

The "disks" collection has been replaced by "diskattachments" in version
4 of the API. As a result the V3 links for the "disks" collectin can't
be reliably calculated. This patch changes the V3 layer so that it
discards the links calculated by V4 and replaces them with the correct
ones.

Change-Id: Id01803427188b1b4a3fe008a0545468980241e8f
Bug-Url: https://bugzilla.redhat.com/1358860
Signed-off-by: Juan Hernandez <juan.hernandez at redhat.com>
(cherry picked from commit 8993ba46f25231e43e3ab56e1afc6c49c09ac1cd)
(cherry picked from commit 26c0fad4b7ac0f13326030b119bff6b3de965cdf)
---
A backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/v3/helpers/V3LinkHelper.java
M backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/v3/helpers/V3TemplateHelper.java
M backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/v3/helpers/V3VmHelper.java
M backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/v3/servers/V3TemplateDiskServer.java
M backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/v3/servers/V3TemplateDisksServer.java
M backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/v3/servers/V3TemplateServer.java
M backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/v3/servers/V3TemplatesServer.java
M backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/v3/servers/V3VmDiskServer.java
M backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/v3/servers/V3VmDisksServer.java
M backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/v3/servers/V3VmServer.java
M backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/v3/servers/V3VmsServer.java
11 files changed, 190 insertions(+), 87 deletions(-)

Approvals:
  Juan Hernandez: Verified; Looks good to me, approved
  Jenkins CI: Passed CI tests



-- 
To view, visit https://gerrit.ovirt.org/61372
To unsubscribe, visit https://gerrit.ovirt.org/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: Id01803427188b1b4a3fe008a0545468980241e8f
Gerrit-PatchSet: 1
Gerrit-Project: ovirt-engine
Gerrit-Branch: ovirt-engine-4.0.2
Gerrit-Owner: Juan Hernandez <juan.hernandez at redhat.com>
Gerrit-Reviewer: Jenkins CI
Gerrit-Reviewer: Juan Hernandez <juan.hernandez at redhat.com>
Gerrit-Reviewer: Oved Ourfali <oourfali at redhat.com>
Gerrit-Reviewer: Piotr Kliczewski <piotr.kliczewski at gmail.com>
Gerrit-Reviewer: gerrit-hooks <automation at ovirt.org>



More information about the Engine-commits mailing list