From 20213369ce5f1b6914b41ca17ba43f1977155e3c Mon Sep 17 00:00:00 2001 From: Thomas Graichen Date: Wed, 18 Nov 2015 15:40:28 +0100 Subject: [PATCH] add adminUserDomainId and adminUserProjectId support to monasca-api add support to scope the user or project with the DomainId and not only the DomainName as i added it some weeks ago to the monasca-api. this change basically completes https://review.openstack.org/#/c/215146/ https://review.openstack.org/#/c/215147/ Change-Id: I1cb81d97799101f82a8aab363cd265a85ef1a6ac Depends-On: Ife3eedc83e7502bad7e2613121ca288958954a31 Closes-Bug: #1517493 --- 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 a0e4e433c..220fc4aa9 100755 --- a/java/src/deb/etc/api-config.yml-sample +++ b/java/src/deb/etc/api-config.yml-sample @@ -80,7 +80,9 @@ middleware: adminPassword: admin adminProjectId: adminProjectName: + adminUserDomainId: adminUserDomainName: + adminProjectDomainId: adminProjectDomainName: adminToken: timeToCacheToken: 600 diff --git a/java/src/main/java/monasca/api/MonApiApplication.java b/java/src/main/java/monasca/api/MonApiApplication.java index 4e72c65a0..d064050a0 100644 --- a/java/src/main/java/monasca/api/MonApiApplication.java +++ b/java/src/main/java/monasca/api/MonApiApplication.java @@ -182,7 +182,9 @@ 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_ID, config.middleware.adminUserDomainId); authInitParams.put(AuthConstants.ADMIN_USER_DOMAIN_NAME, config.middleware.adminUserDomainName); + authInitParams.put(AuthConstants.ADMIN_PROJECT_DOMAIN_ID, config.middleware.adminProjectDomainId); authInitParams.put(AuthConstants.ADMIN_PROJECT_DOMAIN_NAME, config.middleware.adminProjectDomainName); authInitParams.put("MaxTokenCacheSize", config.middleware.maxTokenCacheSize); setIfNotNull(authInitParams, AuthConstants.TRUSTSTORE, config.middleware.truststore); 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 dfd1e5e15..004b6ef0c 100644 --- a/java/src/main/java/monasca/api/infrastructure/middleware/MiddlewareConfiguration.java +++ b/java/src/main/java/monasca/api/infrastructure/middleware/MiddlewareConfiguration.java @@ -67,8 +67,12 @@ public class MiddlewareConfiguration { @JsonProperty public String adminProjectName = ""; @JsonProperty + public String adminUserDomainId = ""; + @JsonProperty public String adminUserDomainName = ""; @JsonProperty + public String adminProjectDomainId = ""; + @JsonProperty public String adminProjectDomainName = ""; @JsonProperty public String maxTokenCacheSize = "1048576"; diff --git a/java/src/main/resources/api-config.yml b/java/src/main/resources/api-config.yml index cad0b46e8..1afed54db 100644 --- a/java/src/main/resources/api-config.yml +++ b/java/src/main/resources/api-config.yml @@ -79,7 +79,9 @@ middleware: adminPassword: admin adminProjectId: adminProjectName: + adminUserDomainId: adminUserDomainName: + adminUserProjectId: adminUserProjectName: adminToken: timeToCacheToken: 600