Ori Liel has uploaded a new change for review.
Change subject: restapi: Add Href To Host Hooks
......................................................................
restapi: Add Href To Host Hooks
Change-Id: I3fbc218d1fb143173fda5dc15988dfa6cd6b285f
Signed-off-by: Ori Liel <ol...@redhat.com>
---
M
backend/manager/modules/restapi/interface/common/jaxrs/src/main/java/org/ovirt/engine/api/common/util/LinkHelper.java
M
backend/manager/modules/restapi/interface/definition/src/main/resources/api.xsd
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/BackendHostsResource.java
M
backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/BackendHostHookResourceTest.java
M
backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/BackendHostHooksResourceTest.java
6 files changed, 24 insertions(+), 5 deletions(-)
git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/50/11250/1
diff --git
a/backend/manager/modules/restapi/interface/common/jaxrs/src/main/java/org/ovirt/engine/api/common/util/LinkHelper.java
b/backend/manager/modules/restapi/interface/common/jaxrs/src/main/java/org/ovirt/engine/api/common/util/LinkHelper.java
index 77527ea..8af3ed1 100644
---
a/backend/manager/modules/restapi/interface/common/jaxrs/src/main/java/org/ovirt/engine/api/common/util/LinkHelper.java
+++
b/backend/manager/modules/restapi/interface/common/jaxrs/src/main/java/org/ovirt/engine/api/common/util/LinkHelper.java
@@ -33,6 +33,7 @@
import org.ovirt.engine.api.model.Cluster;
import org.ovirt.engine.api.model.DataCenter;
import org.ovirt.engine.api.model.DetailedLink;
+import org.ovirt.engine.api.model.Hook;
import org.ovirt.engine.api.model.ReportedDevice;
import org.ovirt.engine.api.model.Disk;
import org.ovirt.engine.api.model.Domain;
@@ -95,6 +96,8 @@
import org.ovirt.engine.api.resource.FilesResource;
import org.ovirt.engine.api.resource.GroupResource;
import org.ovirt.engine.api.resource.GroupsResource;
+import org.ovirt.engine.api.resource.HostHookResource;
+import org.ovirt.engine.api.resource.HostHooksResource;
import org.ovirt.engine.api.resource.HostNicResource;
import org.ovirt.engine.api.resource.HostNicsResource;
import org.ovirt.engine.api.resource.HostResource;
@@ -211,6 +214,9 @@
map = new ParentToCollectionMap(HostNicResource.class,
HostNicsResource.class, Host.class);
TYPES.put(HostNIC.class, map);
+ map = new ParentToCollectionMap(HostHookResource.class,
HostHooksResource.class, Host.class);
+ TYPES.put(Hook.class, map);
+
map = new ParentToCollectionMap(FileResource.class,
FilesResource.class, StorageDomain.class);
TYPES.put(File.class, map);
diff --git
a/backend/manager/modules/restapi/interface/definition/src/main/resources/api.xsd
b/backend/manager/modules/restapi/interface/definition/src/main/resources/api.xsd
index 1ef89ba..707808d 100644
---
a/backend/manager/modules/restapi/interface/definition/src/main/resources/api.xsd
+++
b/backend/manager/modules/restapi/interface/definition/src/main/resources/api.xsd
@@ -1611,6 +1611,7 @@
<xs:sequence>
<xs:element name="event_name" type="xs:string" minOccurs="0"/>
<xs:element name="md5" type="xs:string" minOccurs="0"/>
+ <xs:element ref="host" minOccurs="0"/>
</xs:sequence>
</xs:extension>
</xs:complexContent>
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 68773a3..424cb96 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
@@ -9,6 +9,7 @@
import org.ovirt.engine.api.model.Hook;
import org.ovirt.engine.api.model.Hooks;
+import org.ovirt.engine.api.model.Host;
import org.ovirt.engine.api.resource.HostHookResource;
import org.ovirt.engine.api.resource.HostHooksResource;
import org.ovirt.engine.core.common.queries.GetVdsHooksByIdParameters;
@@ -34,7 +35,10 @@
}
private Hooks mapCollection(HashMap<String, HashMap<String,
HashMap<String, String>>> hooksMap) {
- Hooks hooks = mappingLocator.getMapper(HashMap.class,
Hooks.class).map(hooksMap, null);
+ Hooks hooks = getMapper(HashMap.class, Hooks.class).map(hooksMap,
null);
+ for (Hook hook : hooks.getHooks()) {
+ addLinks(hook);
+ }
return hooks;
}
@@ -45,9 +49,11 @@
}
@Override
- protected Response performRemove(String id) {
- // not in use
- return null;
+ protected Hook addParents(Hook model) {
+ Host host = new Host();
+ host.setId(hostId);
+ model.setHost(host);
+ return super.addParents(model);
}
@Override
@@ -55,4 +61,8 @@
return model;
}
+ @Override
+ protected Response performRemove(String id) {
+ return null;
+ }
}
diff --git
a/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendHostsResource.java
b/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendHostsResource.java
index 47c0fdd..36d95a7 100644
---
a/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendHostsResource.java
+++
b/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendHostsResource.java
@@ -33,7 +33,7 @@
public class BackendHostsResource extends
AbstractBackendCollectionResource<Host, VDS> implements
HostsResource {
- static final String[] SUB_COLLECTIONS = { "storage", "nics", "tags",
"permissions", "statistics" };
+ static final String[] SUB_COLLECTIONS = { "storage", "nics", "tags",
"permissions", "statistics", "hooks" };
static final String GLUSTERONLY_MODE_COLLECTIONS_TO_HIDE = "storage";
public BackendHostsResource() {
diff --git
a/backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/BackendHostHookResourceTest.java
b/backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/BackendHostHookResourceTest.java
index 375f826..0af6227 100644
---
a/backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/BackendHostHookResourceTest.java
+++
b/backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/BackendHostHookResourceTest.java
@@ -42,6 +42,7 @@
*/
@Test
public void testGet() {
+ setUriInfo(setUpBasicUriExpectations());
resource.setParent(getCollectionResourceMock());
control.replay();
Hook hook = resource.get();
diff --git
a/backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/BackendHostHooksResourceTest.java
b/backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/BackendHostHooksResourceTest.java
index 203528c..57a3981 100644
---
a/backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/BackendHostHooksResourceTest.java
+++
b/backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/BackendHostHooksResourceTest.java
@@ -52,6 +52,7 @@
@Test
public void testList() throws Exception {
+ resource.setUriInfo(setUpBasicUriExpectations());
setUpGetEntityExpectations(VdcQueryType.GetVdsHooksById2,
GetVdsHooksByIdParameters.class,
new String[] { "VdsId" },
--
To view, visit http://gerrit.ovirt.org/11250
To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I3fbc218d1fb143173fda5dc15988dfa6cd6b285f
Gerrit-PatchSet: 1
Gerrit-Project: ovirt-engine
Gerrit-Branch: engine_3.2
Gerrit-Owner: Ori Liel <ol...@redhat.com>
_______________________________________________
Engine-patches mailing list
Engine-patches@ovirt.org
http://lists.ovirt.org/mailman/listinfo/engine-patches
