Yair Zaslavsky has uploaded a new change for review. Change subject: aaa: API changes required for namespace support ......................................................................
aaa: API changes required for namespace support Topic: AAA Change-Id: Ibf322468bd703aa3d14fc3c11a88f2e548e7f73c Signed-off-by: Yair Zaslavsky <[email protected]> --- 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/GroupMapper.java M backend/manager/modules/restapi/types/src/main/java/org/ovirt/engine/api/restapi/types/UserMapper.java 3 files changed, 12 insertions(+), 0 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/62/28262/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 771c12f..154e9a3 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 @@ -1728,6 +1728,7 @@ <xs:element name="domain_entry_id" type="xs:string" minOccurs="0" maxOccurs="1"/> <xs:element name="department" type="xs:string" minOccurs="0" maxOccurs="1"/> <xs:element name="logged_in" type="xs:boolean" minOccurs="0" maxOccurs="1"/> + <xs:element name="namespace" type="xs:string" minOccurs="0" maxOccurs="1"/> <xs:element name="last_name" type="xs:string" minOccurs="0" maxOccurs="1"/> <!-- generally name@domain --> <xs:element name="user_name" type="xs:string" minOccurs="0" maxOccurs="1"/> @@ -1796,6 +1797,7 @@ <xs:sequence> <xs:element ref="domain" minOccurs="0"/> <xs:element name="domain_entry_id" type="xs:string" minOccurs="0" maxOccurs="1"/> + <xs:element name="namespace" type="xs:string" minOccurs="0" maxOccurs="1"/> <!-- used only to represent the initial role assignments for a new group, therafter modification of role assignments are only supported via the rel="roles" sub-collection --> diff --git a/backend/manager/modules/restapi/types/src/main/java/org/ovirt/engine/api/restapi/types/GroupMapper.java b/backend/manager/modules/restapi/types/src/main/java/org/ovirt/engine/api/restapi/types/GroupMapper.java index 3f7ed97..cde715b 100644 --- a/backend/manager/modules/restapi/types/src/main/java/org/ovirt/engine/api/restapi/types/GroupMapper.java +++ b/backend/manager/modules/restapi/types/src/main/java/org/ovirt/engine/api/restapi/types/GroupMapper.java @@ -22,6 +22,7 @@ model.setDomain(dom); } model.setDomainEntryId(DirectoryEntryIdUtils.encode(entity.getExternalId())); + model.setNamespace(entity.getNamespace()); return model; } @@ -35,6 +36,7 @@ model.setDomain(dom); } model.setId(DirectoryEntryIdUtils.encode(entity.getId())); + model.setNamespace(entity.getNamespace()); return model; } @@ -57,6 +59,9 @@ if (model.isSetDomainEntryId()) { entity.setExternalId(DirectoryEntryIdUtils.decode(model.getDomainEntryId())); } + if (model.isSetNamespace()) { + entity.setNamespace(model.getNamespace()); + } return entity; } diff --git a/backend/manager/modules/restapi/types/src/main/java/org/ovirt/engine/api/restapi/types/UserMapper.java b/backend/manager/modules/restapi/types/src/main/java/org/ovirt/engine/api/restapi/types/UserMapper.java index 10aadc9..c4bc780 100644 --- a/backend/manager/modules/restapi/types/src/main/java/org/ovirt/engine/api/restapi/types/UserMapper.java +++ b/backend/manager/modules/restapi/types/src/main/java/org/ovirt/engine/api/restapi/types/UserMapper.java @@ -24,6 +24,7 @@ model.setEmail(entity.getEmail()); model.setDepartment(entity.getDepartment()); model.setDomainEntryId(DirectoryEntryIdUtils.encode(entity.getExternalId())); + model.setNamespace(entity.getNamespace()); if (entity.getGroupNames() != null && entity.getGroupNames().trim().length() > 0) { model.setGroups(new Groups()); for (String name : entity.getGroupNames().split(",")) { @@ -49,6 +50,7 @@ model.setLastName(entity.getLastName()); model.setEmail(entity.getEmail()); model.setDepartment(entity.getDepartment()); + model.setNamespace(entity.getNamespace()); if (entity.getGroups() != null) { model.setGroups(new Groups()); for (DirectoryGroup directoryGroup : entity.getGroups()) { @@ -84,6 +86,9 @@ if (model.isSetDomainEntryId()) { entity.setExternalId(DirectoryEntryIdUtils.decode(model.getDomainEntryId())); } + if (model.isSetNamespace()) { + entity.setNamespace(model.getNamespace()); + } return entity; } -- To view, visit http://gerrit.ovirt.org/28262 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ibf322468bd703aa3d14fc3c11a88f2e548e7f73c Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Yair Zaslavsky <[email protected]> _______________________________________________ Engine-patches mailing list [email protected] http://lists.ovirt.org/mailman/listinfo/engine-patches
