Merge pull request #9 from cloudops/bug/MC-30191-OpenStackAuthenticationFailureWithKeystone

MC-30191: Keystone does not allow the type anymore for use/password auth

Author: fyrnaga

core/pom.xml

@@ -6,7 +6,7 @@
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>openstack4j-core</artifactId>
-    <version>co-3.12.2</version>
+    <version>co-3.12.3</version>
     <name>OpenStack4j Core</name>
     <description>OpenStack Java API</description>
     <url>https://github.com/openstack4j/openstack4j/</url>

core/src/main/java/org/openstack4j/openstack/identity/v3/domain/KeystoneAuth.java

@@ -63,6 +63,7 @@ protected KeystoneAuth(Type type) {
         this.type = type;
     }
 
+    @JsonIgnore
     public Type getType() {
         return type;
     }
@@ -200,13 +201,15 @@ public AuthUser(String username, String password, Identifier domainIdentifier) {
                     this.password = password;
                     if (domainIdentifier != null) {
                         domain = new AuthDomain();
-                        if (domainIdentifier.isTypeID())
-                            domain.setId(domainIdentifier.getId());
-                        else
-                            domain.setName(domainIdentifier.getId());
+                        if (domainIdentifier.isTypeID()) {
+                           domain.setId(domainIdentifier.getId());
+                        } else {
+                           domain.setName(domainIdentifier.getId());
+                        }
                         setName(username);
-                    } else
-                        setId(username);
+                    } else {
+                       setId(username);
+                    }
                 }
 
                 @Override
@@ -342,10 +345,11 @@ public static final class AuthDomain extends BasicResourceEntity implements Doma
             private String name;
 
             public AuthDomain(Identifier domain) {
-                if (domain.isTypeID())
-                    this.id = domain.getId();
-                else
-                    this.name = domain.getId();
+                if (domain.isTypeID()) {
+                   this.id = domain.getId();
+                } else {
+                   this.name = domain.getId();
+                }
             }
 
             @Override