Daniel Erez has uploaded a new change for review.
Change subject: restapi: missing disks link in SD VMs resource
......................................................................
restapi: missing disks link in SD VMs resource
Added missing 'disks' link for vms/templates under an export
storage domain resource (i.e. on locations [1] and [2]).
[1] /api/storagedomains/{storagedomain:id}/vms
[2] /api/storagedomains/{storagedomain:id}/templates
Change-Id: Ic8b7fe696f66eb02f2d402985e845f746ccb2095
Bug-Url: https://bugzilla.redhat.com/1130182
Signed-off-by: Daniel Erez <[email protected]>
---
M
backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/AbstractBackendStorageDomainContentsResource.java
M
backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendStorageDomainTemplatesResource.java
M
backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendStorageDomainVmsResource.java
3 files changed, 14 insertions(+), 2 deletions(-)
git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/18/31918/1
diff --git
a/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/AbstractBackendStorageDomainContentsResource.java
b/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/AbstractBackendStorageDomainContentsResource.java
index 79deb51..53e2087 100644
---
a/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/AbstractBackendStorageDomainContentsResource.java
+++
b/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/AbstractBackendStorageDomainContentsResource.java
@@ -32,6 +32,14 @@
this.storageDomainId = storageDomainId;
}
+ public AbstractBackendStorageDomainContentsResource(Guid storageDomainId,
+ Class<R> modelType,
+ Class<Q> entityType,
+ String...
subCollections) {
+ super(modelType, entityType, subCollections);
+ this.storageDomainId = storageDomainId;
+ }
+
protected Guid getDataCenterId(Action action) {
return getStoragePoolId(action);
}
diff --git
a/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendStorageDomainTemplatesResource.java
b/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendStorageDomainTemplatesResource.java
index caf1373..6563279 100644
---
a/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendStorageDomainTemplatesResource.java
+++
b/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendStorageDomainTemplatesResource.java
@@ -26,8 +26,10 @@
extends AbstractBackendStorageDomainContentsResource<Templates, Template,
VmTemplate>
implements RemovableStorageDomainContentsResource<Templates, Template> {
+ static final String[] SUB_COLLECTIONS = { "disks" };
+
public BackendStorageDomainTemplatesResource(Guid storageDomainId) {
- super(storageDomainId, Template.class, VmTemplate.class);
+ super(storageDomainId, Template.class, VmTemplate.class,
SUB_COLLECTIONS);
}
@Override
diff --git
a/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendStorageDomainVmsResource.java
b/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendStorageDomainVmsResource.java
index af4e5cd..9fb2b96 100644
---
a/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendStorageDomainVmsResource.java
+++
b/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendStorageDomainVmsResource.java
@@ -22,8 +22,10 @@
extends AbstractBackendStorageDomainContentsResource<VMs, VM,
org.ovirt.engine.core.common.businessentities.VM>
implements RemovableStorageDomainContentsResource<VMs, VM> {
+ static final String[] SUB_COLLECTIONS = { "disks" };
+
public BackendStorageDomainVmsResource(Guid storageDomainId) {
- super(storageDomainId, VM.class,
org.ovirt.engine.core.common.businessentities.VM.class);
+ super(storageDomainId, VM.class,
org.ovirt.engine.core.common.businessentities.VM.class, SUB_COLLECTIONS);
}
@Override
--
To view, visit http://gerrit.ovirt.org/31918
To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ic8b7fe696f66eb02f2d402985e845f746ccb2095
Gerrit-PatchSet: 1
Gerrit-Project: ovirt-engine
Gerrit-Branch: ovirt-engine-3.5
Gerrit-Owner: Daniel Erez <[email protected]>
_______________________________________________
Engine-patches mailing list
[email protected]
http://lists.ovirt.org/mailman/listinfo/engine-patches
