AMBARI-8705. Kerberos wizard: API call to save krb5-conf configuration fails with server error. (Robert Levas via yusaku)

ambari-server/src/main/java/org/apache/ambari/server/serveraction/kerberos/KDCType.java

@@ -18,6 +18,8 @@
 
 package org.apache.ambari.server.serveraction.kerberos;
 
+import com.sun.istack.NotNull;
+
 /**
  * Enumerates the supported KDC types
  */
@@ -30,5 +32,21 @@ public enum KDCType {
   /**
    * Indicates a Microsoft Active Directory
    */
-  ACTIVE_DIRECTORY
+  ACTIVE_DIRECTORY;
+
+  /**
+   * Translates a String to a KDCType.
+   * <p/>
+   * The translation logic attempts to nicely convert a String to a KDCType by replacing all '-'
+   * characters to '_' characters and converting the String to uppercase. Allowing for values like
+   * "mit_kdc" to be translated to "MIT_KDC".
+   *
+   * @param value a String value to convert to a KDCType
+   * @return A KDCType
+   * @throws java.lang.IllegalArgumentException if this enum type has no constant with the specified name
+   * @throws java.lang.NullPointerException if the value to translate is null
+   */
+  public static KDCType translate(@NotNull String value) {
+    return KDCType.valueOf(value.replace("-", "_").toUpperCase());
+  }
 }

ambari-server/src/main/java/org/apache/ambari/server/serveraction/kerberos/KerberosServerAction.java

@@ -121,7 +121,7 @@ public abstract class KerberosServerAction extends AbstractServerAction {
 
     return ((kdcType == null) || kdcType.isEmpty())
         ? KDCType.MIT_KDC
-        : KDCType.valueOf(kdcType.toUpperCase().replace("-", "_"));
+        : KDCType.translate(kdcType);
   }
 
   /**

ambari-server/src/test/java/org/apache/ambari/server/serveraction/kerberos/KDCTypeTest.java

@@ -0,0 +1,37 @@
+package org.apache.ambari.server.serveraction.kerberos;
+
+import junit.framework.Assert;
+import org.junit.Test;
+
+public class KDCTypeTest {
+
+  @Test
+  public void testTranslateExact() {
+    Assert.assertEquals(KDCType.MIT_KDC, KDCType.translate("MIT_KDC"));
+  }
+
+  @Test
+  public void testTranslateCaseInsensitive() {
+    Assert.assertEquals(KDCType.MIT_KDC, KDCType.translate("mit_kdc"));
+  }
+
+  @Test
+  public void testTranslateHyphen() {
+    Assert.assertEquals(KDCType.MIT_KDC, KDCType.translate("MIT-KDC"));
+  }
+
+  @Test(expected = NullPointerException.class)
+  public void testTranslateNull() {
+    KDCType.translate(null);
+  }
+
+  @Test(expected = IllegalArgumentException.class)
+  public void testTranslateEmptyString() {
+    KDCType.translate("");
+  }
+
+  @Test(expected = IllegalArgumentException.class)
+  public void testTranslateNoTranslation() {
+    KDCType.translate("NO TRANSLATION");
+  }
+}