Added validationError Mbean to parse error in topology

Author: swapnanitin

operator/src/main/java/oracle/kubernetes/operator/helpers/ConfigMapHelper.java

@@ -16,6 +16,7 @@
 import java.io.StringReader;
 import java.util.HashMap;
 import java.util.Map;
+import java.util.List;
 import oracle.kubernetes.operator.KubernetesConstants;
 import oracle.kubernetes.operator.LabelConstants;
 import oracle.kubernetes.operator.ProcessingConstants;
@@ -534,6 +535,7 @@ static DomainTopology parseDomainTopologyYaml(String topologyYaml) {
   public static class DomainTopology {
     private boolean domainValid;
     private WlsDomainConfig domain;
+    private List<String> validationErrors;
 
     public boolean getDomainValid() {
       return this.domainValid;
@@ -551,5 +553,13 @@ public WlsDomainConfig getDomain() {
     public void setDomain(WlsDomainConfig domain) {
       this.domain = domain;
     }
+
+    public List<String> getValidationErrors() {
+      return validationErrors;
+    }
+
+    public void setValidationErrors(List<String> validationErrors) {
+      this.validationErrors = validationErrors;
+    }
   }
 }

operator/src/main/resources/scripts/introspectDomain.py

@@ -364,11 +364,10 @@ def validateServerCustomChannelName(self):
     for server in self.env.getDomain().getServers():
       naps = server.getNetworkAccessPoints()
       for nap in naps:
-        name=self.name(nap)
-        if name in reservedNames:
-          self.addError("The custom channel " + name + " is a reserved name."
+        if nap.getName() in reservedNames:
+          self.addError("The custom channel " + self.name(nap) + " is a reserved name.")
 
-  def validateClusterServersHaveSameCustomChannels():
+  #def validateClusterServersHaveSameCustomChannels():
 
   def isValid(self):
     return len(self.errors) == 0

operator/src/test/java/oracle/kubernetes/operator/helpers/ConfigMapHelperTest.java

@@ -467,6 +467,12 @@ public boolean containsAll(V1ConfigMap actual, V1ConfigMap expected) {
           + "      listenPort: 7001\n"
           + "      listenAddress: \"domain1-admin-server\"\n";
 
+  private static final String INVALID_TOPOLOGY =
+      "domainValid: false\n"
+          + "validationErrors:\n"
+          + "  - \"The dynamic cluster \\\"mycluster\\\"'s dynamic servers use calculated listen ports.\"";
+
+
   @Test
   public void parseDomainTopologyYaml() {
     ConfigMapHelper.DomainTopology domainTopology =
@@ -583,4 +589,15 @@ public void parseMixedClusterTopologyYaml() {
     assertEquals(3, wlsClusterConfig.getDynamicClusterSize());
     assertEquals(5, wlsClusterConfig.getServerConfigs().size());
   }
-}
+
+  @Test
+  public void parseInvalidTopologyYamlWithValidationErrors() {
+    ConfigMapHelper.DomainTopology domainTopology =
+        ConfigMapHelper.parseDomainTopologyYaml(INVALID_TOPOLOGY);
+
+    assertNotNull(domainTopology.getValidationErrors());
+    assertFalse(domainTopology.getDomainValid());
+    assertEquals("The dynamic cluster \"mycluster\"'s dynamic servers use calculated listen ports.",domainTopology.getValidationErrors().get(0));
+
+  }
+  }