Parse administration port from introspector

Author: swapnanitin

operator/src/main/java/oracle/kubernetes/operator/wlsconfig/WlsServerConfig.java

@@ -20,6 +20,8 @@ public class WlsServerConfig {
   Integer sslListenPort;
   boolean sslPortEnabled;
   String machineName;
+  Integer adminPort;
+  boolean adminPortEnabled;
   List<NetworkAccessPoint> networkAccessPoints;
 
   public WlsServerConfig() {}
@@ -97,6 +99,20 @@ public void setClusterName(String clusterName) {
     this.clusterName = clusterName;
   }
 
+  public Integer getAdminPort() {
+    return adminPort;
+  }
+
+  public void setAdminPort(Integer adminPort) {
+    this.adminPort = adminPort;
+  }
+  public boolean isAdminPortEnabled() {
+    return adminPortEnabled;
+  }
+
+  public void setAdminPortEnabled(boolean adminPortEnabled) {
+    this.adminPortEnabled = adminPortEnabled;
+  }
   /**
    * Creates a WLSServerConfig object using an "servers" or "serverTemplates" item parsed from JSON
    * result from WLS REST call

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

@@ -571,7 +571,7 @@ def addNonClusteredServer(self, server):
     self.writeln("  listenPort: " + str(server.getListenPort()))
     self.writeln("  listenAddress: " + self.quote(self.env.toDNS1123Legal(self.env.getDomainUID() + "-" + server.getName())))
     self.writeln("  adminPort: " + str(server.getAdministrationPort()))
-    self.writeln("  adminPortEnabled: " + str(server.isAdministrationPortEnabled()))
+    self.writeln("  adminPortEnabled: " + self.booleanToString(server.isAdministrationPortEnabled()))
     self.addSSL(server)
     self.addNetworkAccessPoints(server)
 

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

@@ -384,6 +384,8 @@ public boolean containsAll(V1ConfigMap actual, V1ConfigMap expected) {
           + "    - name: \"admin-server\"\n"
           + "      listenPort: 7001\n"
           + "      listenAddress: \"domain1-admin-server\"\n"
+          + "      adminPort: 7099\n"
+          + "      adminPortEnabled: true\n"
           + "    - name: \"server1\"\n"
           + "      listenPort: 9003\n"
           + "      listenAddress: \"domain1-managed-server1\"\n"
@@ -500,6 +502,9 @@ public void parseDomainTopologyYaml() {
     assertTrue(serverConfigMap.containsKey("admin-server"));
     assertTrue(serverConfigMap.containsKey("server1"));
     assertTrue(serverConfigMap.containsKey("server2"));
+    WlsServerConfig adminServerConfig = serverConfigMap.get("admin-server");
+    assertEquals(7099, adminServerConfig.getAdminPort().intValue());
+    assertTrue(adminServerConfig.isAdminPortEnabled());
 
     WlsServerConfig server2Config = serverConfigMap.get("server2");
     assertEquals("domain1-managed-server2", server2Config.getListenAddress());