Change in ovirt-engine[ovirt-engine-4.0]: restapi: Check watchdog model and action before mapping

[tnisan at redhat.com]

Tal Nisan has submitted this change and it was merged.

Change subject: restapi: Check watchdog model and action before mapping
......................................................................


restapi: Check watchdog model and action before mapping

This patch changes the API so that watchdog model and action attributes
are checked before trying to map them, as otherwise the mapping produces
NPEs.

Change-Id: Ie7f188500df909f8c123fb90e7dd4c46a7c0787a
Bug-Url: https://bugzilla.redhat.com/1338502
Signed-off-by: Juan Hernandez <juan.hernandez at redhat.com>
(cherry picked from commit 63d4ffcda24f312eb67ca311a976aa428c1fba04)
---
M backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendInstanceTypeWatchdogResource.java
M backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendInstanceTypeWatchdogsResource.java
M backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendTemplateWatchdogResource.java
M backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendTemplateWatchdogsResource.java
M backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendVmWatchdogResource.java
M backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendVmWatchdogsResource.java
6 files changed, 54 insertions(+), 12 deletions(-)

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



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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ie7f188500df909f8c123fb90e7dd4c46a7c0787a
Gerrit-PatchSet: 2
Gerrit-Project: ovirt-engine
Gerrit-Branch: ovirt-engine-4.0
Gerrit-Owner: Juan Hernandez <juan.hernandez at redhat.com>
Gerrit-Reviewer: Jenkins CI
Gerrit-Reviewer: Juan Hernandez <juan.hernandez at redhat.com>
Gerrit-Reviewer: Tal Nisan <tnisan at redhat.com>
Gerrit-Reviewer: gerrit-hooks <automation at ovirt.org>