Yair Zaslavsky has uploaded a new change for review. Change subject: aaa: Adding interface build version ......................................................................
aaa: Adding interface build version Adding interfaxce build version on context of built in extensions + adding it to dump of extensions info during engine start. Change-Id: I05392555014bd0da87525a719c5628deb8c03d6e Topic: AAA Signed-off-by: Yair Zaslavsky <[email protected]> --- M backend/manager/modules/builtin-extensions/src/main/java/org/ovirt/engine/extensions/aaa/builtin/header/HeaderAuthn.java M backend/manager/modules/builtin-extensions/src/main/java/org/ovirt/engine/extensions/aaa/builtin/internal/InternalAuthn.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/KerberosLdapAuthn.java M backend/manager/modules/builtin-extensions/src/main/java/org/ovirt/engine/extensions/aaa/builtin/kerberosldap/KerberosLdapAuthz.java M backend/manager/modules/builtin-extensions/src/main/java/org/ovirt/engine/extensions/aaa/builtin/kerberosldap/KerberosLdapMapper.java M backend/manager/modules/extensions-manager/src/main/java/org/ovirt/engine/core/extensions/mgr/ExtensionsManager.java 7 files changed, 20 insertions(+), 7 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/71/26971/1 diff --git a/backend/manager/modules/builtin-extensions/src/main/java/org/ovirt/engine/extensions/aaa/builtin/header/HeaderAuthn.java b/backend/manager/modules/builtin-extensions/src/main/java/org/ovirt/engine/extensions/aaa/builtin/header/HeaderAuthn.java index c4250ad..0844995 100644 --- a/backend/manager/modules/builtin-extensions/src/main/java/org/ovirt/engine/extensions/aaa/builtin/header/HeaderAuthn.java +++ b/backend/manager/modules/builtin-extensions/src/main/java/org/ovirt/engine/extensions/aaa/builtin/header/HeaderAuthn.java @@ -121,7 +121,9 @@ ).mput( Authn.ContextKeys.CAPABILITIES, Authn.Capabilities.AUTHENTICATE_NEGOTIATE - ); + ).mput( + Base.ContextKeys.BUILD_INTERFACE_VERSION, + Base.INTERFACE_VERSION_CURRENT); } } diff --git a/backend/manager/modules/builtin-extensions/src/main/java/org/ovirt/engine/extensions/aaa/builtin/internal/InternalAuthn.java b/backend/manager/modules/builtin-extensions/src/main/java/org/ovirt/engine/extensions/aaa/builtin/internal/InternalAuthn.java index 12948be..fa82edd 100644 --- a/backend/manager/modules/builtin-extensions/src/main/java/org/ovirt/engine/extensions/aaa/builtin/internal/InternalAuthn.java +++ b/backend/manager/modules/builtin-extensions/src/main/java/org/ovirt/engine/extensions/aaa/builtin/internal/InternalAuthn.java @@ -73,7 +73,9 @@ ).mput( Authn.ContextKeys.CAPABILITIES, Authn.Capabilities.AUTHENTICATE_PASSWORD - ); + ).mput( + Base.ContextKeys.BUILD_INTERFACE_VERSION, + Base.INTERFACE_VERSION_CURRENT); Properties config = context.<Properties> get(Base.ContextKeys.CONFIGURATION); adminUser = config.getProperty("config.authn.user.name"); adminPassword = config.getProperty("config.authn.user.password"); 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 905764e..6f2bf25 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 @@ -100,7 +100,9 @@ ).mput( Authz.ContextKeys.QUERY_MAX_FILTER_SIZE, (int) configuration.get("config.query.filter.size") - ); + ).mput( + Base.ContextKeys.BUILD_INTERFACE_VERSION, + Base.INTERFACE_VERSION_CURRENT); adminUser = new ExtMap().mput( Authz.PrincipalRecord.NAME, configuration.getProperty("config.authz.user.name") diff --git a/backend/manager/modules/builtin-extensions/src/main/java/org/ovirt/engine/extensions/aaa/builtin/kerberosldap/KerberosLdapAuthn.java b/backend/manager/modules/builtin-extensions/src/main/java/org/ovirt/engine/extensions/aaa/builtin/kerberosldap/KerberosLdapAuthn.java index 1f45cbc..75cfa20 100644 --- a/backend/manager/modules/builtin-extensions/src/main/java/org/ovirt/engine/extensions/aaa/builtin/kerberosldap/KerberosLdapAuthn.java +++ b/backend/manager/modules/builtin-extensions/src/main/java/org/ovirt/engine/extensions/aaa/builtin/kerberosldap/KerberosLdapAuthn.java @@ -69,7 +69,9 @@ ).mput( Authn.ContextKeys.CAPABILITIES, Authn.Capabilities.AUTHENTICATE_PASSWORD - ); + ).mput( + Base.ContextKeys.BUILD_INTERFACE_VERSION, + Base.INTERFACE_VERSION_CURRENT); KerberosManager.getInstance(); UsersDomainsCacheManagerService.getInstance().init(); 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 8443e61..2da3a0b 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 @@ -202,7 +202,9 @@ ).mput( Authz.ContextKeys.QUERY_MAX_FILTER_SIZE, (int) configuration.get("config.query.filter.size") - ); + ).mput( + Base.ContextKeys.BUILD_INTERFACE_VERSION, + Base.INTERFACE_VERSION_CURRENT); } private ExtMap mapLdapUser(LdapUser user) { diff --git a/backend/manager/modules/builtin-extensions/src/main/java/org/ovirt/engine/extensions/aaa/builtin/kerberosldap/KerberosLdapMapper.java b/backend/manager/modules/builtin-extensions/src/main/java/org/ovirt/engine/extensions/aaa/builtin/kerberosldap/KerberosLdapMapper.java index 3fa7d48..f0c8289 100644 --- a/backend/manager/modules/builtin-extensions/src/main/java/org/ovirt/engine/extensions/aaa/builtin/kerberosldap/KerberosLdapMapper.java +++ b/backend/manager/modules/builtin-extensions/src/main/java/org/ovirt/engine/extensions/aaa/builtin/kerberosldap/KerberosLdapMapper.java @@ -46,7 +46,9 @@ ).mput( Base.ContextKeys.VERSION, "N/A" - ); + ).mput( + Base.ContextKeys.BUILD_INTERFACE_VERSION, + Base.INTERFACE_VERSION_CURRENT); config = context.<Properties> get(Base.ContextKeys.CONFIGURATION); authzName = config.get("org.ovirt.engine.config.authz.name"); } diff --git a/backend/manager/modules/extensions-manager/src/main/java/org/ovirt/engine/core/extensions/mgr/ExtensionsManager.java b/backend/manager/modules/extensions-manager/src/main/java/org/ovirt/engine/core/extensions/mgr/ExtensionsManager.java index e32ca35..14959b5 100644 --- a/backend/manager/modules/extensions-manager/src/main/java/org/ovirt/engine/core/extensions/mgr/ExtensionsManager.java +++ b/backend/manager/modules/extensions-manager/src/main/java/org/ovirt/engine/core/extensions/mgr/ExtensionsManager.java @@ -318,10 +318,11 @@ if (entry.extension != null) { ExtMap context = entry.extension.getContext(); log.info(String.format( - "Instance name: '%1$s', Extension name: '%2$s', Version: '%3$s', License: '%4$s', Home: '%5$s', Author '%6$s', File: '%7$s', Activated: '%8$s", + "Instance name: '%1$s', Extension name: '%2$s', Version: '%3$s', Build interface Version: '%4$s', License: '%5$s', Home: '%6$s', Author '%7$s', File: '%8$s', Activated: '%9$s", emptyIfNull(context.get(Base.ContextKeys.INSTANCE_NAME)), emptyIfNull(context.get(Base.ContextKeys.EXTENSION_NAME)), emptyIfNull(context.get(Base.ContextKeys.VERSION)), + emptyIfNull(context.get(Base.ContextKeys.BUILD_INTERFACE_VERSION)), emptyIfNull(context.get(Base.ContextKeys.LICENSE)), emptyIfNull(context.get(Base.ContextKeys.HOME_URL)), emptyIfNull(context.get(Base.ContextKeys.AUTHOR)), -- To view, visit http://gerrit.ovirt.org/26971 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I05392555014bd0da87525a719c5628deb8c03d6e 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
