Juan Hernandez has uploaded a new change for review. Change subject: Revert "restapi : Create user API fails in SDK & CLI fails" ......................................................................
Revert "restapi : Create user API fails in SDK & CLI fails" This reverts commit 072cd7f069539649e22ad6d47853dd9055d74d02. The reason for reverting it is that it introduces a NPE in the generation of the links for "job" entities. A better way to solve the original issue is to fix it in the Python SDK: http://gerrit.ovirt.org/32044 Change-Id: Id11acede0350989a2921f32f955e17404bd595c1 Bug-Url: https://bugzilla.redhat.com/1134233 Related-To: https://bugzilla.redhat.com/1122589 Signed-off-by: Juan Hernandez <juan.hernan...@redhat.com> (cherry picked from commit 731562fe2a26ae921fc6aa61b2f76c4dbaaa9cc8) --- M backend/manager/modules/restapi/interface/definition/src/main/resources/api.xsd M backend/manager/modules/restapi/types/src/main/java/org/ovirt/engine/api/restapi/types/JobMapper.java 2 files changed, 3 insertions(+), 10 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/12/32412/1 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 b2f02d3..1973439 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 @@ -1925,13 +1925,6 @@ </xs:complexContent> </xs:complexType> - <xs:complexType name="JobOwner"> - <xs:complexContent> - <xs:extension base="User"> - </xs:extension> - </xs:complexContent> - </xs:complexType> - <xs:complexType name="Users"> <xs:complexContent> <xs:extension base="BaseResources"> @@ -4477,7 +4470,7 @@ <xs:extension base="BaseResource"> <xs:sequence> <xs:element ref="status" minOccurs="0" maxOccurs="1"/> - <xs:element name="owner" type="JobOwner" minOccurs="0" maxOccurs="1"/> + <xs:element name="owner" type="User" minOccurs="0" maxOccurs="1"/> <xs:element name="start_time" type="xs:dateTime" minOccurs="0" maxOccurs="1"/> <xs:element name="end_time" type="xs:dateTime" minOccurs="0" maxOccurs="1"/> <xs:element name="last_updated" type="xs:dateTime" minOccurs="0" maxOccurs="1"/> diff --git a/backend/manager/modules/restapi/types/src/main/java/org/ovirt/engine/api/restapi/types/JobMapper.java b/backend/manager/modules/restapi/types/src/main/java/org/ovirt/engine/api/restapi/types/JobMapper.java index 8c2816f..e04cb32 100644 --- a/backend/manager/modules/restapi/types/src/main/java/org/ovirt/engine/api/restapi/types/JobMapper.java +++ b/backend/manager/modules/restapi/types/src/main/java/org/ovirt/engine/api/restapi/types/JobMapper.java @@ -4,8 +4,8 @@ import java.util.Calendar; import org.ovirt.engine.api.model.Job; -import org.ovirt.engine.api.model.JobOwner; import org.ovirt.engine.api.model.Status; +import org.ovirt.engine.api.model.User; import org.ovirt.engine.api.restapi.utils.GuidUtils; import org.ovirt.engine.core.common.job.JobExecutionStatus; @@ -19,7 +19,7 @@ model.setDescription(entity.getDescription()); model.setStatus(map(entity.getStatus(), null)); if (entity.getOwnerId() != null) { - JobOwner user = new JobOwner(); + User user = new User(); user.setId(entity.getOwnerId().toString()); model.setOwner(user); } -- To view, visit http://gerrit.ovirt.org/32412 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Id11acede0350989a2921f32f955e17404bd595c1 Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: ovirt-engine-3.5 Gerrit-Owner: Juan Hernandez <juan.hernan...@redhat.com> _______________________________________________ Engine-patches mailing list Engine-patches@ovirt.org http://lists.ovirt.org/mailman/listinfo/engine-patches
