update keystone integration to handle different user and project domains

eclipse-xpanse · Feb 13, 2024 · cf62112 · cf62112
1 parent ec9252b
commit cf62112
Showing 1 changed file with 10 additions and 5 deletions.
diff --git a/...k/src/main/java/org/eclipse/xpanse/plugins/openstack/common/keystone/KeystoneManager.java b/...k/src/main/java/org/eclipse/xpanse/plugins/openstack/common/keystone/KeystoneManager.java
@@ -86,7 +86,8 @@ public OSClient.OSClientV3 getAuthenticatedClient(UUID serviceId,
         String userName = null;
         String password = null;
         String tenant = null;
-        String domain = null;
+        String userDomain = null;
+        String projectDomain = null;
         if (CredentialType.VARIABLES.toValue().equals(credential.getType().toValue())) {
             List<CredentialVariable> variables = ((CredentialVariables) credential).getVariables();
             for (CredentialVariable credentialVariable : variables) {
@@ -104,12 +105,16 @@ public OSClient.OSClientV3 getAuthenticatedClient(UUID serviceId,
                 }
                 if (OpenstackEnvironmentConstants.USER_DOMAIN.equals(
                         credentialVariable.getName())) {
-                    domain = credentialVariable.getValue();
+                    userDomain = credentialVariable.getValue();
+                }
+                if (OpenstackEnvironmentConstants.PROJECT_DOMAIN.equals(
+                        credentialVariable.getName())) {
+                    projectDomain = credentialVariable.getValue();
                 }
             }
         }
         if (Objects.isNull(userName) || Objects.isNull(password) || Objects.isNull(tenant)
-                || Objects.isNull(domain)) {
+                || Objects.isNull(userDomain)) {
             throw new CredentialsNotFoundException(
                     "Values for all openstack credential"
                             + " variables to connect to Openstack API is not found");
@@ -127,10 +132,10 @@ public OSClient.OSClientV3 getAuthenticatedClient(UUID serviceId,
         return OSFactory
                 .builderV3()
                 .withConfig(buildClientConfig(url, proxyHost, proxyPort, sslDisabled))
-                .credentials(userName, password, Identifier.byName(domain))
+                .credentials(userName, password, Identifier.byName(userDomain))
                 .scopeToProject(
                         Identifier.byName(Objects.isNull(serviceTenant) ? tenant : serviceTenant),
-                        Identifier.byName(domain))
+                        Identifier.byName(projectDomain))
                 .endpoint(url)
                 .authenticate();
     }