Yair Zaslavsky has submitted this change and it was merged. Change subject: 5. core: Change LDAP identifer to ExternalId ...................................................................... 5. core: Change LDAP identifer to ExternalId Currently the LDAP user and group entities are using an UUID as their identifier because we are assuming that the identifier used by the external directory is also an UUID (well, we assume that is something that fits inside the 128 bits of an UUID). This assumption is not correct for all types directories. This patch changes the identifier of these two classes to a plain array of bytes (managed by the ExternalId class) so that the directory can use whatever it is appropiate for it Change-Id: Ib464dfc2353158fccc92922893614a35b5c06081 Signed-off-by: Juan Hernandez <juan.hernandez@redhat.com> Signed-off-by: Yair Zaslavsky <yzaslavs@redhat.com> --- M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/AddEventSubscriptionCommand.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/AddGroupCommand.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/AddPermissionCommand.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/AddUserCommand.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/DbUserCacheManager.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/GetDirectoryGroupByIdQuery.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/GetDirectoryUserByIdQuery.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/LoginBaseCommand.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/RemoveGroupCommand.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/UserCommandBase.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/VmPoolUserCommandBase.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/adbroker/ADGroupContextMapper.java D backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/adbroker/ADLdapGuidEncoder.java A backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/adbroker/ADLdapIdEncoder.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/adbroker/ADUserContextMapper.java D backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/adbroker/DefaultGuidEncoder.java A backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/adbroker/DefaultIdEncoder.java D backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/adbroker/DefaultLdapGuidEncoder.java A backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/adbroker/DefaultLdapIdEncoder.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/adbroker/GroupSearchResult.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/adbroker/IPAGroupContextMapper.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/adbroker/IPAUserContextMapper.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/adbroker/ITDSGroupContextMapper.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/adbroker/ITDSUserContextMapper.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/adbroker/InternalBrokerUtils.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/adbroker/InternalGetAdGroupByGroupIdCommand.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/adbroker/InternalGetAdUserByUserIdCommand.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/adbroker/InternalGetAdUserByUserIdListCommand.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/adbroker/LdapBrokerUtils.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/adbroker/LdapGetAdGroupByGroupIdCommand.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/adbroker/LdapGetAdUserByUserIdCommand.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/adbroker/LdapGetAdUserByUserIdListCommand.java D backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/adbroker/LdapGuidEncoder.java A backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/adbroker/LdapIdEncoder.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/adbroker/LdapQueryExecutionFormatterBase.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/adbroker/LdapQueryMetadata.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/adbroker/LdapQueryMetadataFactoryImpl.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/adbroker/LdapQueryMetadataImpl.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/adbroker/LdapSearchByIdListParameters.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/adbroker/LdapSearchByIdParameters.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/adbroker/LdapSearchByUserIdListParameters.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/adbroker/LdapSearchGroupsByQueryCommand.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/adbroker/MultipleLdapQueryExecutionFormatter.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/adbroker/OpenLdapGroupContextMapper.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/adbroker/OpenLdapUPNLdapQueryExecutionFormatter.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/adbroker/OpenLdapUserContextMapper.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/adbroker/RHDSGroupContextMapper.java R backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/adbroker/RHDSLdapIdEncoder.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/adbroker/RHDSMultipleLdapQueryExecutionFormatter.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/adbroker/RHDSSimpleLdapQueryExecutionFormatter.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/adbroker/RHDSUPNLdapQueryExecutionFormatter.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/adbroker/RHDSUserContextMapper.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/adbroker/SimpleLdapQueryExecutionFormatter.java R backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/adbroker/UsersObjectIdQueryGenerator.java M backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/LdapGroupSearchQueryTest.java M backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/LdapUserSearchQueryTest.java M backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/action/DirectoryIdParameters.java M backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/DbGroup.java M backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/DbUser.java M backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/LdapGroup.java M backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/LdapUser.java M backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/queries/DirectoryIdQueryParameters.java M backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/utils/ExternalId.java M backend/manager/modules/common/src/test/java/org/ovirt/engine/core/common/utils/ExternalIdTest.java M backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendDomainGroupResource.java M backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendDomainGroupsResource.java M backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendDomainUserResource.java M backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendDomainUsersResource.java M backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendGroupsResource.java M backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendUsersResource.java M backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/AbstractBackendBaseTest.java M backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/BackendDomainGroupResourceTest.java M backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/BackendDomainUserResourceTest.java M backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/BackendGroupResourceTest.java M backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/BackendGroupsResourceTest.java M backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/BackendUserResourceTest.java M backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/BackendUsersResourceTest.java M backend/manager/modules/restapi/types/pom.xml M frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/dataprovider/AsyncDataProvider.java M frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/configure/PermissionListModel.java M frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/configure/SystemPermissionListModel.java M frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/users/AdElementListModel.java M frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/users/UserListModel.java M frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/users/UserPortalAdElementListModel.java 84 files changed, 796 insertions(+), 729 deletions(-) Approvals: Yair Zaslavsky: Verified; Looks good to me, approved -- To view, visit http://gerrit.ovirt.org/19482 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ib464dfc2353158fccc92922893614a35b5c06081 Gerrit-PatchSet: 30 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Juan Hernandez <juan.hernandez@redhat.com> Gerrit-Reviewer: David Caro <dcaroest@redhat.com> Gerrit-Reviewer: Juan Hernandez <juan.hernandez@redhat.com> Gerrit-Reviewer: Liran Zelkha <lzelkha@redhat.com> Gerrit-Reviewer: Martin Peřina <mperina@redhat.com> Gerrit-Reviewer: Michael Pasternak <mishka8520@yahoo.com> Gerrit-Reviewer: Ravi Nori <rnori@redhat.com> Gerrit-Reviewer: Yair Zaslavsky <yzaslavs@redhat.com> Gerrit-Reviewer: oVirt Jenkins CI Server