-
Notifications
You must be signed in to change notification settings - Fork 270
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
restapi: incorrect href for parent href
If User send REST API request for ovirt-engine/api/disks/{diskid}/disksnapshots?include_active&include_template he will get this incorrect href back <parent href="/ovirt-engine/api/disks/{diskid}" id="{parentid}"/>. Now it will get correct output that will look like this <parent href="/ovirt-engine/api/disks/{diskid}/disksnapshots/{parentid}" id="{parentid}"/>. Bug-Url: https://bugzilla.redhat.com/2013697 Signed-off-by: Artiom Divak <adivak@redhat.com>
- Loading branch information
1 parent
995f4a0
commit 3faeb4c
Showing
3 changed files
with
39 additions
and
4 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
12 changes: 12 additions & 0 deletions
12
...pi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/utils/DiskResourceUtils.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,11 +1,23 @@ | ||
package org.ovirt.engine.api.restapi.resource.utils; | ||
|
||
import java.util.List; | ||
|
||
import org.ovirt.engine.api.model.Disk; | ||
import org.ovirt.engine.api.model.DiskSnapshot; | ||
import org.ovirt.engine.api.restapi.types.Mapper; | ||
|
||
public class DiskResourceUtils { | ||
|
||
public static boolean isLunDisk(Disk disk) { | ||
return disk.isSetLunStorage() && disk.getLunStorage().isSetLogicalUnits() && | ||
disk.getLunStorage().getLogicalUnits().isSetLogicalUnits(); | ||
} | ||
|
||
public static org.ovirt.engine.core.common.businessentities.storage.Disk getDiskIdFromDiskSnapshotId | ||
(List<org.ovirt.engine.core.common.businessentities.storage.Disk> entities, DiskSnapshot diskSnapshot, | ||
Mapper<org.ovirt.engine.core.common.businessentities.storage.Disk, DiskSnapshot> mapper) { | ||
return entities.stream().filter(tempDisk -> diskSnapshot.getParent().getId().equals(mapper | ||
.map(tempDisk, null).getId())).findFirst().orElse(null); | ||
} | ||
|
||
} |