From 71575490b579cc4d2b3a575f64cddc305c85784d Mon Sep 17 00:00:00 2001 From: Thomas Graichen Date: Wed, 19 Aug 2015 16:49:12 +0200 Subject: [PATCH] Add adminUserDomainName and adminProjectDomainName to monasca-api add adminUserDomainName and adminProjectDomainName to api-config.yaml to scope the username or projectname with a domainname Change-Id: Ide981dc079be7ec18abfaadc456c5b24c386dfc5 Depends-On: I12e0a1594961ef15eac6e401521d05a15a2014ad Closes-Bug: #1484594 --- java/src/deb/etc/api-config.yml-sample | 2 ++ java/src/main/java/monasca/api/MonApiApplication.java | 2 ++ .../infrastructure/middleware/MiddlewareConfiguration.java | 4 ++++ java/src/main/resources/api-config.yml | 2 ++ 4 files changed, 10 insertions(+) diff --git a/java/src/deb/etc/api-config.yml-sample b/java/src/deb/etc/api-config.yml-sample index bba12faca..a0e4e433c 100755 --- a/java/src/deb/etc/api-config.yml-sample +++ b/java/src/deb/etc/api-config.yml-sample @@ -80,6 +80,8 @@ middleware: adminPassword: admin adminProjectId: adminProjectName: + adminUserDomainName: + adminProjectDomainName: adminToken: timeToCacheToken: 600 maxTokenCacheSize: 1048576 diff --git a/java/src/main/java/monasca/api/MonApiApplication.java b/java/src/main/java/monasca/api/MonApiApplication.java index 0f8e81406..4e72c65a0 100644 --- a/java/src/main/java/monasca/api/MonApiApplication.java +++ b/java/src/main/java/monasca/api/MonApiApplication.java @@ -182,6 +182,8 @@ public class MonApiApplication extends Application { authInitParams.put("AdminPassword", config.middleware.adminPassword); authInitParams.put(AuthConstants.ADMIN_PROJECT_ID, config.middleware.adminProjectId); authInitParams.put(AuthConstants.ADMIN_PROJECT_NAME, config.middleware.adminProjectName); + authInitParams.put(AuthConstants.ADMIN_USER_DOMAIN_NAME, config.middleware.adminUserDomainName); + authInitParams.put(AuthConstants.ADMIN_PROJECT_DOMAIN_NAME, config.middleware.adminProjectDomainName); authInitParams.put("MaxTokenCacheSize", config.middleware.maxTokenCacheSize); setIfNotNull(authInitParams, AuthConstants.TRUSTSTORE, config.middleware.truststore); setIfNotNull(authInitParams, AuthConstants.TRUSTSTORE_PASS, config.middleware.truststorePassword); diff --git a/java/src/main/java/monasca/api/infrastructure/middleware/MiddlewareConfiguration.java b/java/src/main/java/monasca/api/infrastructure/middleware/MiddlewareConfiguration.java index 452032b19..dfd1e5e15 100644 --- a/java/src/main/java/monasca/api/infrastructure/middleware/MiddlewareConfiguration.java +++ b/java/src/main/java/monasca/api/infrastructure/middleware/MiddlewareConfiguration.java @@ -67,6 +67,10 @@ public class MiddlewareConfiguration { @JsonProperty public String adminProjectName = ""; @JsonProperty + public String adminUserDomainName = ""; + @JsonProperty + public String adminProjectDomainName = ""; + @JsonProperty public String maxTokenCacheSize = "1048576"; @JsonProperty public String truststore; diff --git a/java/src/main/resources/api-config.yml b/java/src/main/resources/api-config.yml index cdff0e409..9f2523812 100644 --- a/java/src/main/resources/api-config.yml +++ b/java/src/main/resources/api-config.yml @@ -78,6 +78,8 @@ middleware: adminPassword: admin adminProjectId: adminProjectName: + adminUserDomainName: + adminUserProjectName: adminToken: timeToCacheToken: 600 maxTokenCacheSize: 1048576