Moti Asayag has uploaded a new change for review.
Change subject: restapi: Add "permissions" sub-collections to vnic profiles
......................................................................
restapi: Add "permissions" sub-collections to vnic profiles
The "permissions" sub-collections is added to vnic profiles
under the networks top collection:
api/networks/{network:id}/vnicprofiles
api/networks/{network:id}/vnicprofiles/{profile:id}/permissions
api/networks/{network:id}/vnicprofiles/{profile:id}/permissions/{permission:id}
Change-Id: I02573ec87a40c7e017a24f334083044b051613ac
Bug-Url: https://bugzilla.redhat.com/1014985
Signed-off-by: Moti Asayag <[email protected]>
---
M
backend/manager/modules/restapi/interface/definition/src/main/java/org/ovirt/engine/api/resource/AssignedVnicProfileResource.java
M
backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/AbstractBackendVnicProfileResource.java
M
backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/AbstractBackendVnicProfilesResource.java
M
backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendAssignedVnicProfileResource.java
M
backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendAssignedVnicProfilesResource.java
M
backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendVnicProfileResource.java
M
backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendVnicProfilesResource.java
7 files changed, 30 insertions(+), 19 deletions(-)
git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/76/20776/1
diff --git
a/backend/manager/modules/restapi/interface/definition/src/main/java/org/ovirt/engine/api/resource/AssignedVnicProfileResource.java
b/backend/manager/modules/restapi/interface/definition/src/main/java/org/ovirt/engine/api/resource/AssignedVnicProfileResource.java
index 5095fa4..82b4612 100644
---
a/backend/manager/modules/restapi/interface/definition/src/main/java/org/ovirt/engine/api/resource/AssignedVnicProfileResource.java
+++
b/backend/manager/modules/restapi/interface/definition/src/main/java/org/ovirt/engine/api/resource/AssignedVnicProfileResource.java
@@ -17,6 +17,7 @@
package org.ovirt.engine.api.resource;
import javax.ws.rs.GET;
+import javax.ws.rs.Path;
import javax.ws.rs.Produces;
import org.jboss.resteasy.annotations.providers.jaxb.Formatted;
@@ -28,4 +29,7 @@
@GET
@Formatted
public VnicProfile get();
+
+ @Path("permissions")
+ public AssignedPermissionsResource getPermissionsResource();
}
diff --git
a/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/AbstractBackendVnicProfileResource.java
b/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/AbstractBackendVnicProfileResource.java
index 9f63f84..295033a 100644
---
a/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/AbstractBackendVnicProfileResource.java
+++
b/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/AbstractBackendVnicProfileResource.java
@@ -1,22 +1,33 @@
package org.ovirt.engine.api.restapi.resource;
import org.ovirt.engine.api.model.VnicProfile;
+import org.ovirt.engine.api.resource.AssignedPermissionsResource;
+import org.ovirt.engine.core.common.VdcObjectType;
+import org.ovirt.engine.core.common.queries.GetPermissionsForObjectParameters;
import org.ovirt.engine.core.common.queries.IdQueryParameters;
import org.ovirt.engine.core.common.queries.VdcQueryType;
public abstract class AbstractBackendVnicProfileResource
extends AbstractBackendSubResource<VnicProfile,
org.ovirt.engine.core.common.businessentities.network.VnicProfile> {
- protected AbstractBackendVnicProfileResource(String id, String...
subCollections) {
+ protected AbstractBackendVnicProfileResource(String id) {
super(id, VnicProfile.class,
org.ovirt.engine.core.common.businessentities.network.VnicProfile.class,
- subCollections);
+ AbstractBackendVnicProfilesResource.SUB_COLLECTIONS);
}
protected VnicProfile get() {
return performGet(VdcQueryType.GetVnicProfileById, new
IdQueryParameters(guid));
}
+ protected AssignedPermissionsResource getPermissionsResource() {
+ return inject(new BackendAssignedPermissionsResource(guid,
+ VdcQueryType.GetPermissionsForObject,
+ new GetPermissionsForObjectParameters(guid),
+ VnicProfile.class,
+ VdcObjectType.VnicProfile));
+ }
+
@Override
protected VnicProfile doPopulate(VnicProfile model,
org.ovirt.engine.core.common.businessentities.network.VnicProfile
entity) {
diff --git
a/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/AbstractBackendVnicProfilesResource.java
b/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/AbstractBackendVnicProfilesResource.java
index e7f5257..c0cda15 100644
---
a/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/AbstractBackendVnicProfilesResource.java
+++
b/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/AbstractBackendVnicProfilesResource.java
@@ -15,10 +15,12 @@
public abstract class AbstractBackendVnicProfilesResource
extends AbstractBackendCollectionResource<VnicProfile,
org.ovirt.engine.core.common.businessentities.network.VnicProfile> {
- public AbstractBackendVnicProfilesResource(String... subCollections) {
+ static final String[] SUB_COLLECTIONS = { "permissions" };
+
+ public AbstractBackendVnicProfilesResource() {
super(VnicProfile.class,
org.ovirt.engine.core.common.businessentities.network.VnicProfile.class,
- subCollections);
+ SUB_COLLECTIONS);
}
protected VnicProfiles
mapCollection(List<org.ovirt.engine.core.common.businessentities.network.VnicProfile>
entities) {
diff --git
a/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendAssignedVnicProfileResource.java
b/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendAssignedVnicProfileResource.java
index 5b1bb2a..f65091c 100644
---
a/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendAssignedVnicProfileResource.java
+++
b/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendAssignedVnicProfileResource.java
@@ -1,6 +1,7 @@
package org.ovirt.engine.api.restapi.resource;
import org.ovirt.engine.api.model.VnicProfile;
+import org.ovirt.engine.api.resource.AssignedPermissionsResource;
import org.ovirt.engine.api.resource.AssignedVnicProfileResource;
public class BackendAssignedVnicProfileResource extends
AbstractBackendVnicProfileResource implements AssignedVnicProfileResource {
@@ -31,4 +32,9 @@
org.ovirt.engine.core.common.businessentities.network.VnicProfile
entity) {
return model;
}
+
+ @Override
+ public AssignedPermissionsResource getPermissionsResource() {
+ return super.getPermissionsResource();
+ }
}
diff --git
a/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendAssignedVnicProfilesResource.java
b/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendAssignedVnicProfilesResource.java
index 1bbf53f..558768f 100644
---
a/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendAssignedVnicProfilesResource.java
+++
b/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendAssignedVnicProfilesResource.java
@@ -18,6 +18,7 @@
private String networkId;
public BackendAssignedVnicProfilesResource(String networkId) {
+ super();
this.networkId = networkId;
}
diff --git
a/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendVnicProfileResource.java
b/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendVnicProfileResource.java
index 74bdb53..b2a006b 100644
---
a/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendVnicProfileResource.java
+++
b/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendVnicProfileResource.java
@@ -1,14 +1,11 @@
package org.ovirt.engine.api.restapi.resource;
-
import org.ovirt.engine.api.model.VnicProfile;
import org.ovirt.engine.api.resource.AssignedPermissionsResource;
import org.ovirt.engine.api.resource.VnicProfileResource;
-import org.ovirt.engine.core.common.VdcObjectType;
import org.ovirt.engine.core.common.action.VdcActionParametersBase;
import org.ovirt.engine.core.common.action.VdcActionType;
import org.ovirt.engine.core.common.action.VnicProfileParameters;
-import org.ovirt.engine.core.common.queries.GetPermissionsForObjectParameters;
import org.ovirt.engine.core.common.queries.IdQueryParameters;
import org.ovirt.engine.core.common.queries.VdcQueryType;
import org.ovirt.engine.core.compat.Guid;
@@ -16,7 +13,7 @@
public class BackendVnicProfileResource extends
AbstractBackendVnicProfileResource implements VnicProfileResource {
protected BackendVnicProfileResource(String id) {
- super(id, BackendVnicProfilesResource.SUB_COLLECTIONS);
+ super(id);
}
@Override
@@ -34,11 +31,7 @@
@Override
public AssignedPermissionsResource getPermissionsResource() {
- return inject(new BackendAssignedPermissionsResource(guid,
- VdcQueryType.GetPermissionsForObject,
- new GetPermissionsForObjectParameters(guid),
- VnicProfile.class,
- VdcObjectType.VnicProfile));
+ return super.getPermissionsResource();
}
protected class UpdateParametersProvider
diff --git
a/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendVnicProfilesResource.java
b/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendVnicProfilesResource.java
index d257841..079755d 100644
---
a/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendVnicProfilesResource.java
+++
b/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendVnicProfilesResource.java
@@ -14,12 +14,6 @@
public class BackendVnicProfilesResource extends
AbstractBackendVnicProfilesResource implements VnicProfilesResource {
- static final String[] SUB_COLLECTIONS = { "permissions" };
-
- public BackendVnicProfilesResource() {
- super(SUB_COLLECTIONS);
- }
-
@Override
public VnicProfiles list() {
return performList();
--
To view, visit http://gerrit.ovirt.org/20776
To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I02573ec87a40c7e017a24f334083044b051613ac
Gerrit-PatchSet: 1
Gerrit-Project: ovirt-engine
Gerrit-Branch: ovirt-engine-3.3
Gerrit-Owner: Moti Asayag <[email protected]>
_______________________________________________
Engine-patches mailing list
[email protected]
http://lists.ovirt.org/mailman/listinfo/engine-patches
