Yair Zaslavsky has uploaded a new change for review.
Change subject: aaa: Introducing new Extension properties
......................................................................
aaa: Introducing new Extension properties
Introducing extension properties that are used to describe
the extension.
In addition, making use of them in the built-in extensions
Topic: aaa
Change-Id: Ib3fa4c5ca319afee31930fd3a8a4e3009a80ea6d
Signed-off-by: Yair Zaslavsky <yzasl...@redhat.com>
---
M
backend/manager/modules/aaa/src/main/java/org/ovirt/engine/core/aaa/internal/InternalAuthenticator.java
M
backend/manager/modules/aaa/src/main/java/org/ovirt/engine/core/aaa/internal/InternalDirectory.java
M
backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/aaa/provisional/ProvisionalAuthenticator.java
M
backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/aaa/provisional/ProvisionalDirectory.java
M
backend/manager/modules/extension-manager/src/main/java/org/ovirt/engine/core/extensions/mgr/Extension.java
5 files changed, 28 insertions(+), 1 deletion(-)
git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/78/24978/1
diff --git
a/backend/manager/modules/aaa/src/main/java/org/ovirt/engine/core/aaa/internal/InternalAuthenticator.java
b/backend/manager/modules/aaa/src/main/java/org/ovirt/engine/core/aaa/internal/InternalAuthenticator.java
index 9eeb6bc..8c33545 100644
---
a/backend/manager/modules/aaa/src/main/java/org/ovirt/engine/core/aaa/internal/InternalAuthenticator.java
+++
b/backend/manager/modules/aaa/src/main/java/org/ovirt/engine/core/aaa/internal/InternalAuthenticator.java
@@ -28,5 +28,10 @@
@Override
public void init() {
+ context.put(ExtensionProperties.AUTHOR, "oVirt");
+ context.put(ExtensionProperties.EXTENSION_NAME, "Internal
Authentication");
+ context.put(ExtensionProperties.LICENSE, "ASL 2.0");
+ context.put(ExtensionProperties.HOME, "http://www.ovirt.org";);
+ context.put(ExtensionProperties.VERSION, "1.0");
}
}
diff --git
a/backend/manager/modules/aaa/src/main/java/org/ovirt/engine/core/aaa/internal/InternalDirectory.java
b/backend/manager/modules/aaa/src/main/java/org/ovirt/engine/core/aaa/internal/InternalDirectory.java
index b77b23f..a44f12d 100644
---
a/backend/manager/modules/aaa/src/main/java/org/ovirt/engine/core/aaa/internal/InternalDirectory.java
+++
b/backend/manager/modules/aaa/src/main/java/org/ovirt/engine/core/aaa/internal/InternalDirectory.java
@@ -10,6 +10,7 @@
import org.ovirt.engine.core.common.config.Config;
import org.ovirt.engine.core.common.config.ConfigValues;
import org.ovirt.engine.core.common.utils.ExternalId;
+import org.ovirt.engine.core.extensions.mgr.Extension.ExtensionProperties;
/**
* This directory contains only the internal user as specified in the {@code
AdminUser} configuration parameter.
@@ -105,6 +106,11 @@
@Override
public void init() {
admin = new DirectoryUser(getProfileName(), ADMIN_ID, ADMIN_NAME);
+ context.put(ExtensionProperties.AUTHOR, "oVirt");
+ context.put(ExtensionProperties.EXTENSION_NAME, "Internal
Authorization");
+ context.put(ExtensionProperties.LICENSE, "ASL 2.0");
+ context.put(ExtensionProperties.HOME, "http://www.ovirt.org";);
+ context.put(ExtensionProperties.VERSION, "1.0");
}
}
diff --git
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/aaa/provisional/ProvisionalAuthenticator.java
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/aaa/provisional/ProvisionalAuthenticator.java
index 651165c..b45ca0a 100644
---
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/aaa/provisional/ProvisionalAuthenticator.java
+++
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/aaa/provisional/ProvisionalAuthenticator.java
@@ -8,6 +8,7 @@
import org.ovirt.engine.core.bll.adbroker.LdapReturnValueBase;
import org.ovirt.engine.core.bll.adbroker.LdapUserPasswordBaseParameters;
import org.ovirt.engine.core.bll.adbroker.UserAuthenticationResult;
+import org.ovirt.engine.core.extensions.mgr.Extension.ExtensionProperties;
/**
* This authenticator implementation is a bridge between the new directory
interface and the existing LDAP
@@ -28,6 +29,12 @@
@Override
public void init() {
broker = LdapFactory.getInstance(getProfileName());
+ context.put(ExtensionProperties.AUTHOR, "oVirt");
+ context.put(ExtensionProperties.EXTENSION_NAME, "Provisional
Authentication (LbapBroker code based)");
+ context.put(ExtensionProperties.LICENSE, "ASL 2.0");
+ context.put(ExtensionProperties.HOME, "http://www.ovirt.org";);
+ context.put(ExtensionProperties.VERSION, "1.0");
+
}
diff --git
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/aaa/provisional/ProvisionalDirectory.java
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/aaa/provisional/ProvisionalDirectory.java
index 84bdf9a..2cca952 100644
---
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/aaa/provisional/ProvisionalDirectory.java
+++
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/aaa/provisional/ProvisionalDirectory.java
@@ -20,6 +20,7 @@
import org.ovirt.engine.core.common.businessentities.LdapGroup;
import org.ovirt.engine.core.common.businessentities.LdapUser;
import org.ovirt.engine.core.common.utils.ExternalId;
+import org.ovirt.engine.core.extensions.mgr.Extension.ExtensionProperties;
import org.ovirt.engine.core.utils.log.Log;
import org.ovirt.engine.core.utils.log.LogFactory;
@@ -46,6 +47,11 @@
@Override
public void init() {
broker = LdapFactory.getInstance(getProfileName());
+ context.put(ExtensionProperties.AUTHOR, "oVirt");
+ context.put(ExtensionProperties.EXTENSION_NAME, "Provisional
Authorization (LbapBroker code based)");
+ context.put(ExtensionProperties.LICENSE, "ASL 2.0");
+ context.put(ExtensionProperties.HOME, "http://www.ovirt.org";);
+ context.put(ExtensionProperties.VERSION, "1.0");
}
@Override
diff --git
a/backend/manager/modules/extension-manager/src/main/java/org/ovirt/engine/core/extensions/mgr/Extension.java
b/backend/manager/modules/extension-manager/src/main/java/org/ovirt/engine/core/extensions/mgr/Extension.java
index a0df106..8d64e55 100644
---
a/backend/manager/modules/extension-manager/src/main/java/org/ovirt/engine/core/extensions/mgr/Extension.java
+++
b/backend/manager/modules/extension-manager/src/main/java/org/ovirt/engine/core/extensions/mgr/Extension.java
@@ -12,7 +12,10 @@
CONFIGURATION,
LICENSE,
PROVIDES,
- VERSION;
+ VERSION,
+ AUTHOR,
+ HOME,
+ EXTENSION_NAME;
};
/**
--
To view, visit http://gerrit.ovirt.org/24978
To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ib3fa4c5ca319afee31930fd3a8a4e3009a80ea6d
Gerrit-PatchSet: 1
Gerrit-Project: ovirt-engine
Gerrit-Branch: master
Gerrit-Owner: Yair Zaslavsky <yzasl...@redhat.com>
_______________________________________________
Engine-patches mailing list
Engine-patches@ovirt.org
http://lists.ovirt.org/mailman/listinfo/engine-patches
