Alon Bar-Lev has uploaded a new change for review.
Change subject: aaa: add namespace for directory entities
......................................................................
aaa: add namespace for directory entities
Topic: AAA
Change-Id: I99b5611d4a05a18b271bde61a9d5be14007fd9a4
Signed-off-by: Alon Bar-Lev <alo...@redhat.com>
---
M
backend/manager/modules/aaa/src/main/java/org/ovirt/engine/core/aaa/AuthzUtils.java
M
backend/manager/modules/builtin-extensions/src/main/java/org/ovirt/engine/extensions/aaa/builtin/internal/InternalAuthz.java
M
backend/manager/modules/builtin-extensions/src/main/java/org/ovirt/engine/extensions/aaa/builtin/kerberosldap/KerberosLdapAuthz.java
M
backend/manager/modules/common/src/main/java/org/ovirt/engine/core/aaa/DirectoryEntry.java
M
backend/manager/modules/common/src/main/java/org/ovirt/engine/core/aaa/DirectoryGroup.java
M
backend/manager/modules/common/src/main/java/org/ovirt/engine/core/aaa/DirectoryUser.java
M
backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/BusinessEntitiesDefinitions.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/LdapUser.java
M
backend/manager/modules/extensions-api-root/extensions-api/src/main/java/org/ovirt/engine/api/extensions/aaa/Authz.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/BackendApiResourceTest.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/BackendGroupsResourceTest.java
M
backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/BackendUsersResourceTest.java
M
frontend/webadmin/modules/gwt-extension/src/main/java/org/ovirt/engine/core/aaa/DirectoryGroup_CustomFieldSerializer.java
M
frontend/webadmin/modules/gwt-extension/src/main/java/org/ovirt/engine/core/aaa/DirectoryUser_CustomFieldSerializer.java
19 files changed, 96 insertions(+), 20 deletions(-)
git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/17/28217/1
diff --git
a/backend/manager/modules/aaa/src/main/java/org/ovirt/engine/core/aaa/AuthzUtils.java
b/backend/manager/modules/aaa/src/main/java/org/ovirt/engine/core/aaa/AuthzUtils.java
index 2ea10b5..330de06 100644
---
a/backend/manager/modules/aaa/src/main/java/org/ovirt/engine/core/aaa/AuthzUtils.java
+++
b/backend/manager/modules/aaa/src/main/java/org/ovirt/engine/core/aaa/AuthzUtils.java
@@ -225,6 +225,7 @@
if (principalRecord != null) {
directoryUser = new DirectoryUser(
extension.getContext().<String>
get(Base.ContextKeys.INSTANCE_NAME),
+ principalRecord.<String>
get(Authz.PrincipalRecord.NAMESPACE),
principalRecord.<String> get(Authz.PrincipalRecord.ID),
principalRecord.<String> get(Authz.PrincipalRecord.NAME)
);
@@ -250,6 +251,7 @@
if (group != null) {
directoryGroup = new DirectoryGroup(
extension.getContext().<String>
get(Base.ContextKeys.INSTANCE_NAME),
+ group.<String> get(Authz.GroupRecord.NAMESPACE),
group.<String> get(Authz.GroupRecord.ID),
group.<String> get(Authz.GroupRecord.NAME)
);
diff --git
a/backend/manager/modules/builtin-extensions/src/main/java/org/ovirt/engine/extensions/aaa/builtin/internal/InternalAuthz.java
b/backend/manager/modules/builtin-extensions/src/main/java/org/ovirt/engine/extensions/aaa/builtin/internal/InternalAuthz.java
index c684b71..fb2c420 100644
---
a/backend/manager/modules/builtin-extensions/src/main/java/org/ovirt/engine/extensions/aaa/builtin/internal/InternalAuthz.java
+++
b/backend/manager/modules/builtin-extensions/src/main/java/org/ovirt/engine/extensions/aaa/builtin/internal/InternalAuthz.java
@@ -15,6 +15,8 @@
*/
public class InternalAuthz implements Extension {
+ private static final String NAMESPACE = "*";
+
private ExtMap context;
private ExtMap adminUser;
@@ -108,11 +110,14 @@
Base.INTERFACE_VERSION_CURRENT
).mput(
Authz.ContextKeys.AVAILABLE_NAMESPACES,
- Arrays.asList("*")
+ Arrays.asList(NAMESPACE)
);
adminUser = new ExtMap().mput(
- Authz.PrincipalRecord.NAME,
- configuration.getProperty("config.authz.user.name")
+ Authz.PrincipalRecord.NAMESPACE,
+ NAMESPACE
+ ).mput(
+ Authz.PrincipalRecord.NAME,
+ configuration.getProperty("config.authz.user.name")
).mput(
Authz.PrincipalRecord.ID,
configuration.getProperty("config.authz.user.id")
diff --git
a/backend/manager/modules/builtin-extensions/src/main/java/org/ovirt/engine/extensions/aaa/builtin/kerberosldap/KerberosLdapAuthz.java
b/backend/manager/modules/builtin-extensions/src/main/java/org/ovirt/engine/extensions/aaa/builtin/kerberosldap/KerberosLdapAuthz.java
index 05d006c..bdf29ec 100644
---
a/backend/manager/modules/builtin-extensions/src/main/java/org/ovirt/engine/extensions/aaa/builtin/kerberosldap/KerberosLdapAuthz.java
+++
b/backend/manager/modules/builtin-extensions/src/main/java/org/ovirt/engine/extensions/aaa/builtin/kerberosldap/KerberosLdapAuthz.java
@@ -28,6 +28,8 @@
private static final Log log = LogFactory.getLog(KerberosLdapAuthz.class);
+ private static final String NAMESPACE = "*";
+
private static final String USERS_QUERY_PREFIX = "(&($USER_ACCOUNT_TYPE)";
private static final String GROUPS_QUERY_PREFIX =
"(&($LDAP_GROUP_CATEGORY)";
@@ -243,15 +245,18 @@
Base.INTERFACE_VERSION_CURRENT
).mput(
Authz.ContextKeys.AVAILABLE_NAMESPACES,
- Arrays.asList("*")
+ Arrays.asList(NAMESPACE)
);
}
private ExtMap mapLdapUser(LdapUser user) {
ExtMap result = new ExtMap();
result.mput(
- Authz.PrincipalRecord.ID,
- user.getUserId()
+ Authz.PrincipalRecord.NAMESPACE,
+ NAMESPACE
+ ).mput(
+ Authz.PrincipalRecord.ID,
+ user.getUserId()
).mput(
Authz.PrincipalRecord.DEPARTMENT,
user.getDepartment()
diff --git
a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/aaa/DirectoryEntry.java
b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/aaa/DirectoryEntry.java
index 514cd2b..8232793 100644
---
a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/aaa/DirectoryEntry.java
+++
b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/aaa/DirectoryEntry.java
@@ -15,7 +15,8 @@
*/
private String directoryName;
- // The values o the attributes:
+ // The values of the attributes:
+ private String namespace;
private String id;
private String name;
private DirectoryEntryStatus status;
@@ -25,14 +26,23 @@
*/
private List<DirectoryGroup> groups;
- public DirectoryEntry(String directoryName, String id, String name) {
+ public DirectoryEntry(String directoryName, String namespace, String id,
String name) {
this.directoryName = directoryName;
+ this.namespace = namespace;
this.id = id;
this.name = name;
this.status = DirectoryEntryStatus.UNAVAILABLE;
this.groups = new ArrayList<DirectoryGroup>(1);
}
+ public String getNamespace() {
+ return namespace;
+ }
+
+ public void setNamespace(String namespace) {
+ this.namespace = namespace;
+ }
+
public String getId() {
return id;
}
diff --git
a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/aaa/DirectoryGroup.java
b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/aaa/DirectoryGroup.java
index 812f43b..f105ab2 100644
---
a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/aaa/DirectoryGroup.java
+++
b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/aaa/DirectoryGroup.java
@@ -4,7 +4,7 @@
public class DirectoryGroup extends DirectoryEntry {
private static final long serialVersionUID = 7446478647138904658L;
- public DirectoryGroup(String directoryName, String id, String name) {
- super(directoryName, id, name);
+ public DirectoryGroup(String directoryName, String namespace, String id,
String name) {
+ super(directoryName, namespace, id, name);
}
}
diff --git
a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/aaa/DirectoryUser.java
b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/aaa/DirectoryUser.java
index ce6aa94..9f5961d 100644
---
a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/aaa/DirectoryUser.java
+++
b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/aaa/DirectoryUser.java
@@ -15,8 +15,8 @@
// Flag indicating if this user has the administrator role:
private boolean isAdmin;
- public DirectoryUser(String directoryName, String id, String name) {
- super(directoryName, id, name);
+ public DirectoryUser(String directoryName, String namespace, String id,
String name) {
+ super(directoryName, namespace, id, name);
isAdmin = false;
}
diff --git
a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/BusinessEntitiesDefinitions.java
b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/BusinessEntitiesDefinitions.java
index da5555e..f0fbe22 100644
---
a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/BusinessEntitiesDefinitions.java
+++
b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/BusinessEntitiesDefinitions.java
@@ -73,6 +73,7 @@
public static final int USER_GROUP_IDS_SIZE = 2048;
public static final int USER_DEPARTMENT_SIZE = 255;
public static final int USER_DOMAIN_SIZE = 255;
+ public static final int USER_NAMESPACE_SIZE = 2048;
public static final int USER_EMAIL_SIZE = 255;
public static final int USER_FIRST_NAME_SIZE = 255;
public static final int USER_NOTE_SIZE = 255;
diff --git
a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/DbGroup.java
b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/DbGroup.java
index b4cf5ba..c2d86c0 100644
---
a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/DbGroup.java
+++
b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/DbGroup.java
@@ -19,7 +19,7 @@
* This is the identifier assigned by the external directory to this group.
*/
private String externalId;
-
+ private String namespace;
private String domain;
private String name;
private String distinguishedName;
@@ -38,6 +38,7 @@
public DbGroup(DirectoryGroup directoryGroup) {
externalId = directoryGroup.getId();
setId(new Guid(directoryGroup.getId().getBytes(), true));
+ namespace = directoryGroup.getNamespace();
domain = directoryGroup.getDirectoryName();
name = directoryGroup.getName();
}
@@ -56,6 +57,14 @@
public void setExternalId(String value) {
externalId = value;
+ }
+
+ public String getNamespace() {
+ return namespace;
+ }
+
+ public void setNamespace(String value) {
+ namespace = value;
}
public String getDomain() {
@@ -109,6 +118,7 @@
int result = 1;
result = prime * result + ((id == null) ? 0 : id.hashCode());
result = prime * result + ((externalId == null) ? 0 :
externalId.hashCode());
+ result = prime * result + ((namespace == null) ? 0 :
namespace.hashCode());
result = prime * result + ((domain == null) ? 0 : domain.hashCode());
result = prime * result + ((name == null) ? 0 : name.hashCode());
result = prime * result + ((distinguishedName == null) ? 0 :
distinguishedName.hashCode());
diff --git
a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/DbUser.java
b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/DbUser.java
index 3a294d9..fbee2e7 100644
---
a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/DbUser.java
+++
b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/DbUser.java
@@ -24,6 +24,9 @@
@Size(min = 1, max = BusinessEntitiesDefinitions.USER_DOMAIN_SIZE)
private String domain;
+ @Size(min = 1, max = BusinessEntitiesDefinitions.USER_NAMESPACE_SIZE)
+ private String namespace;
+
@Size(min = 1, max = BusinessEntitiesDefinitions.USER_LOGIN_NAME_SIZE)
private String loginName;
@@ -85,6 +88,7 @@
public DbUser(LdapUser ldapUser) {
externalId = ldapUser.getUserId();
domain = ldapUser.getDomainControler();
+ namespace = ldapUser.getNamespace();
loginName = ldapUser.getUserName();
firstName = ldapUser.getName();
lastName = ldapUser.getSurName();
@@ -99,6 +103,7 @@
public DbUser(DirectoryUser directoryUser) {
externalId = directoryUser.getId();
domain = directoryUser.getDirectoryName();
+ namespace = directoryUser.getNamespace();
loginName = directoryUser.getName();
firstName = directoryUser.getFirstName();
lastName = directoryUser.getLastName();
@@ -134,6 +139,14 @@
public void setExternalId(String externalId) {
this.externalId = externalId;
+ }
+
+ public String getNamespace() {
+ return namespace;
+ }
+
+ public void setNamespace(String value) {
+ namespace = value;
}
public String getDomain() {
@@ -249,6 +262,7 @@
result = prime * result + ((externalId == null) ? 0 :
externalId.hashCode());
result = prime * result + ((department == null) ? 0 :
department.hashCode());
result = prime * result + ((domain == null) ? 0 : domain.hashCode());
+ result = prime * result + ((namespace == null) ? 0 :
namespace.hashCode());
result = prime * result + ((email == null) ? 0 : email.hashCode());
result = prime * result + ((groupNames == null) ? 0 :
groupNames.hashCode());
result = prime * result + (isAdmin ? 1231 : 1237);
@@ -277,6 +291,7 @@
&& ObjectUtils.objectsEqual(externalId, other.externalId)
&& ObjectUtils.objectsEqual(department, other.department)
&& ObjectUtils.objectsEqual(domain, other.domain)
+ && ObjectUtils.objectsEqual(namespace, other.namespace)
&& ObjectUtils.objectsEqual(email, other.email)
&& ObjectUtils.objectsEqual(groupNames, other.groupNames)
&& isAdmin == other.isAdmin
diff --git
a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/LdapUser.java
b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/LdapUser.java
index 12644cc..03a46c3 100644
---
a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/LdapUser.java
+++
b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/LdapUser.java
@@ -14,6 +14,7 @@
// TODO - DesktopDevice ?? (Miki)
private static final long serialVersionUID = 6800096193162766377L;
+ private String mNamespace;
private String mUserId;
private String mUserName;
private String mDomainControler;
@@ -33,6 +34,7 @@
public LdapUser(DbUser dbUser) {
setUserId(dbUser.getExternalId());
+ setNamespace(dbUser.getNamespace());
setUserName(dbUser.getLoginName());
setName(dbUser.getFirstName());
setSurName(dbUser.getLastName());
@@ -42,6 +44,14 @@
mGroups = new HashMap<String, LdapGroup>();
}
+ public String getNamespace() {
+ return mNamespace;
+ }
+
+ public void setNamespace(String value) {
+ mNamespace = value;
+ }
+
public String getUserName() {
return mUserName;
}
diff --git
a/backend/manager/modules/extensions-api-root/extensions-api/src/main/java/org/ovirt/engine/api/extensions/aaa/Authz.java
b/backend/manager/modules/extensions-api-root/extensions-api/src/main/java/org/ovirt/engine/api/extensions/aaa/Authz.java
index 821728a..7f098b0 100644
---
a/backend/manager/modules/extensions-api-root/extensions-api/src/main/java/org/ovirt/engine/api/extensions/aaa/Authz.java
+++
b/backend/manager/modules/extensions-api-root/extensions-api/src/main/java/org/ovirt/engine/api/extensions/aaa/Authz.java
@@ -167,9 +167,11 @@
* Principal record.
*/
public static class PrincipalRecord {
+ /** Namespace. */
+ public static final ExtKey NAMESPACE = new
ExtKey("AAA_AUTHZ_PRINCIPAL_NAMESPACE", String.class,
"79703b8c-1e50-462f-9491-f5cf446f49de");
/** Principal unique (within provider) id. */
public static final ExtKey ID = new ExtKey("AAA_AUTHZ_PRINCIPAL_ID",
String.class, "4f9440bc-9303-4d95-b317-b827515c782f");
- /** Principal name */
+ /** User name */
public static final ExtKey NAME = new
ExtKey("AAA_AUTHZ_PRINCIPAL_NAME", String.class,
"a0df5bcc-6ead-40a2-8565-2f5cc8773bdd");
/** Display name. */
public static final ExtKey DISPLAY_NAME = new
ExtKey("AAA_AUTHZ_PRINCIPAL_DISPLAY_NAME", String.class,
"1687a9e2-d951-4ee6-9409-36bca8e83ed1");
@@ -201,6 +203,8 @@
* Group record.
*/
public static class GroupRecord {
+ /** Namespace. */
+ public static final ExtKey NAMESPACE = new
ExtKey("AAA_AUTHZ_GROUP_NAMESPACE", String.class,
"a4763ceb-472f-4f06-a61e-e71289b5afe4");
/** Group unique (within provider) id. */
public static final ExtKey ID = new ExtKey("AAA_AUTHZ_GROUP_ID",
String.class, "4615d4d3-a1b7-43cc-bc8d-c8a24a2ffd5a");
/** Group name. */
@@ -225,6 +229,8 @@
* Role record.
*/
public static class RoleRecord {
+ /** Namespace. */
+ public static final ExtKey NAMESPACE = new
ExtKey("AAA_AUTHZ_GROUP_NAMESPACE", String.class,
"183fb40e-a825-45f8-a655-b6270566fa2e");
/** Group unique (within provider) id. */
public static final ExtKey ID = new ExtKey("AAA_AUTHZ_ROLE_ID",
String.class, "fbd391cc-29b6-41a5-af42-6ef8c4ed8652");
/** Group name. */
diff --git
a/backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/AbstractBackendBaseTest.java
b/backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/AbstractBackendBaseTest.java
index d9e4f11..ce9b341 100644
---
a/backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/AbstractBackendBaseTest.java
+++
b/backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/AbstractBackendBaseTest.java
@@ -103,6 +103,7 @@
protected static final String USER = "Aladdin";
protected static final String SECRET = "open sesame";
protected static final String DOMAIN = "Maghreb.Maghreb.Maghreb.com";
+ protected static final String NAMESPACE = "*";
protected static final String sessionId = Guid.newGuid().toString();
diff --git
a/backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/BackendApiResourceTest.java
b/backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/BackendApiResourceTest.java
index 4e4da03..892aa83 100644
---
a/backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/BackendApiResourceTest.java
+++
b/backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/BackendApiResourceTest.java
@@ -59,6 +59,7 @@
protected static final String USER = "Aladdin";
protected static final String SECRET = "open sesame";
protected static final String DOMAIN = "Maghreb";
+ protected static final String NAMESPACE = "*";
protected static final String URI_ROOT = "http://localhost:8099";;
protected static final String SLASH = "/";
diff --git
a/backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/BackendDomainGroupResourceTest.java
b/backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/BackendDomainGroupResourceTest.java
index 28ed42a..f08c110 100644
---
a/backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/BackendDomainGroupResourceTest.java
+++
b/backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/BackendDomainGroupResourceTest.java
@@ -78,7 +78,7 @@
@Override
protected DirectoryGroup getEntity(int index) {
- return new DirectoryGroup(DOMAIN, new
String(DatatypeConverter.parseHexBinary(EXTERNAL_IDS[index]),
Charset.forName("UTF-8")), NAMES[index]);
+ return new DirectoryGroup(DOMAIN, NAMESPACE, new
String(DatatypeConverter.parseHexBinary(EXTERNAL_IDS[index]),
Charset.forName("UTF-8")), NAMES[index]);
}
}
diff --git
a/backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/BackendDomainUserResourceTest.java
b/backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/BackendDomainUserResourceTest.java
index ddcd990..62017f5 100644
---
a/backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/BackendDomainUserResourceTest.java
+++
b/backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/BackendDomainUserResourceTest.java
@@ -75,7 +75,7 @@
@Override
protected DirectoryUser getEntity(int index) {
- return new DirectoryUser(DOMAIN,
+ return new DirectoryUser(DOMAIN, NAMESPACE,
DirectoryEntryIdUtils.decode(EXTERNAL_IDS[index]),
NAMES[index]);
}
diff --git
a/backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/BackendGroupsResourceTest.java
b/backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/BackendGroupsResourceTest.java
index 2580190..02e9810 100644
---
a/backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/BackendGroupsResourceTest.java
+++
b/backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/BackendGroupsResourceTest.java
@@ -24,6 +24,8 @@
public class BackendGroupsResourceTest
extends AbstractBackendCollectionResourceTest<Group, DbGroup,
BackendGroupsResource> {
+ private static final String NAMESPACE = "*";
+
/**
* This is the query that will be used when the user didn't provide any
query explicitly.
*/
@@ -367,11 +369,12 @@
entity.setExternalId(EXTERNAL_IDS[index]);
entity.setName(GROUP_NAMES[index]);
entity.setDomain(DOMAIN);
+ entity.setNamespace(NAMESPACE);
return entity;
}
private DirectoryGroup getDirectoryGroup(int index) {
- return new DirectoryGroup(DOMAIN, EXTERNAL_IDS[index],
GROUP_NAMES[index]);
+ return new DirectoryGroup(DOMAIN, NAMESPACE, EXTERNAL_IDS[index],
GROUP_NAMES[index]);
}
@Override
diff --git
a/backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/BackendUsersResourceTest.java
b/backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/BackendUsersResourceTest.java
index 4d5e181..a273350 100644
---
a/backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/BackendUsersResourceTest.java
+++
b/backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/BackendUsersResourceTest.java
@@ -26,6 +26,8 @@
public class BackendUsersResourceTest
extends AbstractBackendCollectionResourceTest<User, DbUser,
BackendUsersResource> {
+ static final String NAMESPACE = "*";
+
static final String GROUPS =
"Schema Admins@Maghreb/Users," +
"Group Policy Creator Owners@Maghreb/Users," +
@@ -208,12 +210,13 @@
entity.setExternalId(EXTERNAL_IDS[index]);
entity.setLoginName(NAMES[index]);
entity.setGroupNames(GROUPS);
+ entity.setNamespace(NAMESPACE);
entity.setDomain(DOMAIN);
return entity;
}
private DirectoryUser getDirectoryUser(int index) {
- return new DirectoryUser(DOMAIN, EXTERNAL_IDS[index], NAMES[index]);
+ return new DirectoryUser(DOMAIN, NAMESPACE, EXTERNAL_IDS[index],
NAMES[index]);
}
@Override
diff --git
a/frontend/webadmin/modules/gwt-extension/src/main/java/org/ovirt/engine/core/aaa/DirectoryGroup_CustomFieldSerializer.java
b/frontend/webadmin/modules/gwt-extension/src/main/java/org/ovirt/engine/core/aaa/DirectoryGroup_CustomFieldSerializer.java
index 83fc51a..6c6d614 100644
---
a/frontend/webadmin/modules/gwt-extension/src/main/java/org/ovirt/engine/core/aaa/DirectoryGroup_CustomFieldSerializer.java
+++
b/frontend/webadmin/modules/gwt-extension/src/main/java/org/ovirt/engine/core/aaa/DirectoryGroup_CustomFieldSerializer.java
@@ -11,13 +11,15 @@
public static DirectoryGroup instantiate(SerializationStreamReader reader)
throws SerializationException {
String directoryName = reader.readString();
+ String namespace = reader.readString();
String id = reader.readString();
String name = reader.readString();
- return new DirectoryGroup(directoryName, id, name);
+ return new DirectoryGroup(directoryName, namespace, id, name);
}
public static void serialize(SerializationStreamWriter writer,
DirectoryGroup group) throws SerializationException {
writer.writeObject(group.getDirectoryName());
+ writer.writeObject(group.getNamespace());
writer.writeObject(group.getId());
writer.writeString(group.getName());
}
diff --git
a/frontend/webadmin/modules/gwt-extension/src/main/java/org/ovirt/engine/core/aaa/DirectoryUser_CustomFieldSerializer.java
b/frontend/webadmin/modules/gwt-extension/src/main/java/org/ovirt/engine/core/aaa/DirectoryUser_CustomFieldSerializer.java
index f337ca5..59ddf68 100644
---
a/frontend/webadmin/modules/gwt-extension/src/main/java/org/ovirt/engine/core/aaa/DirectoryUser_CustomFieldSerializer.java
+++
b/frontend/webadmin/modules/gwt-extension/src/main/java/org/ovirt/engine/core/aaa/DirectoryUser_CustomFieldSerializer.java
@@ -12,13 +12,15 @@
public static DirectoryUser instantiate(SerializationStreamReader reader)
throws SerializationException {
String directoryName = reader.readString();
+ String namespace = reader.readString();
String id = reader.readString();
String name = reader.readString();
- return new DirectoryUser(directoryName, id, name);
+ return new DirectoryUser(directoryName, namespace, id, name);
}
public static void serialize(SerializationStreamWriter writer,
DirectoryUser user) throws SerializationException {
writer.writeString(user.getDirectoryName());
+ writer.writeObject(user.getNamespace());
writer.writeObject(user.getId());
writer.writeString(user.getName());
writer.writeBoolean(user.isAdmin());
--
To view, visit http://gerrit.ovirt.org/28217
To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I99b5611d4a05a18b271bde61a9d5be14007fd9a4
Gerrit-PatchSet: 1
Gerrit-Project: ovirt-engine
Gerrit-Branch: master
Gerrit-Owner: Alon Bar-Lev <alo...@redhat.com>
_______________________________________________
Engine-patches mailing list
Engine-patches@ovirt.org
http://lists.ovirt.org/mailman/listinfo/engine-patches
