Refactoring WlsServerConfig to handle enabled attributes since introspection does not pass them

Author: swapnanitin

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

@@ -68,7 +68,8 @@ public Integer getSslListenPort() {
    * @return True if the SSL listen port should be enabled, false otherwise
    */
   public boolean isSslPortEnabled() {
-    return sslPortEnabled;
+    boolean s = sslListenPort != null;
+    return sslListenPort != null;
   }
 
   /**
@@ -108,12 +109,9 @@ public void setAdminPort(Integer adminPort) {
   }
 
   public boolean isAdminPortEnabled() {
-    return adminPortEnabled;
+    return adminPort != null;
   }
 
-  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
@@ -142,20 +140,22 @@ static WlsServerConfig create(Map<String, Object> serverConfigMap) {
     // parse the SSL configuration
     Map<String, Object> sslMap = (Map<String, Object>) serverConfigMap.get("SSL");
     Integer sslListenPort = (sslMap == null) ? null : (Integer) sslMap.get("listenPort");
-    boolean sslPortEnabled = (sslMap == null) ? false : (boolean) sslMap.get("enabled");
+    boolean sslPortEnabled = (sslMap != null && sslMap.get("listenPort") != null) ? true : false;
+
+    // parse the administration port
+    Integer adminPort = (Integer) serverConfigMap.get("adminPort");
+    boolean adminPortEnabled = (adminPort != null);
 
     return new WlsServerConfig(
         (String) serverConfigMap.get("name"),
         (Integer) serverConfigMap.get("listenPort"),
         (String) serverConfigMap.get("listenAddress"),
         sslListenPort,
         sslPortEnabled,
-        /*(Integer) serverConfigMap.get("adminPort"),
-        (boolean) serverConfigMap.get("adminPortEnabled"),*/
         getMachineNameFromJsonMap(serverConfigMap),
         networkAccessPoints,
-        null,
-        false);
+        adminPort,
+        adminPortEnabled);
   }
 
   /**
@@ -187,8 +187,8 @@ public WlsServerConfig(
     this.networkAccessPoints = networkAccessPoints;
     this.sslListenPort = sslListenPort;
     this.sslPortEnabled = sslPortEnabled;
-    this.adminPort = this.adminPort;
-    this.adminPortEnabled = this.adminPortEnabled;
+    this.adminPort = adminPort;
+    this.adminPortEnabled = adminPortEnabled;
     this.machineName = machineName;
   }
 

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

@@ -489,7 +489,6 @@ def addClusteredServer(self, cluster, server):
     self.writeln("  listenAddress: " + self.quote(self.env.toDNS1123Legal(self.env.getDomainUID() + "-" + server.getName())))
     if server.isAdministrationPortEnabled():
       self.writeln("  adminPort: " + str(server.getAdministrationPort()))
-      self.writeln("  adminPortEnabled: " + self.booleanToString(server.isAdministrationPortEnabled()))
     self.addSSL(server)
     self.addNetworkAccessPoints(server)
 
@@ -498,7 +497,6 @@ def addSSL(self, server):
     if ssl is not None and ssl.isEnabled():
       self.indent()
       self.writeln("sslListenPort: " + str(ssl.getListenPort()))
-      self.writeln("sslPortEnabled: " + self.booleanToString(ssl.isEnabled()))
       self.undent()
 
   def addServerTemplates(self):
@@ -574,7 +572,6 @@ def addNonClusteredServer(self, server):
     self.writeln("  listenAddress: " + self.quote(self.env.toDNS1123Legal(self.env.getDomainUID() + "-" + server.getName())))
     if server.isAdministrationPortEnabled():
       self.writeln("  adminPort: " + str(server.getAdministrationPort()))
-      self.writeln("  adminPortEnabled: " + self.booleanToString(server.isAdministrationPortEnabled()))
     self.addSSL(server)
     self.addNetworkAccessPoints(server)
 

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

@@ -368,13 +368,11 @@ public boolean containsAll(V1ConfigMap actual, V1ConfigMap expected) {
           + "        listenPort: 7003\n"
           + "        listenAddress: \"domain1-managed-server1\"\n"
           + "        sslListenPort: 7103\n"
-          + "        sslPortEnabled: true\n"
           + "        machineName: \"machine-managed-server1\"\n"
           + "      - name: \"managed-server2\"\n"
           + "        listenPort: 7004\n"
           + "        listenAddress: \"domain1-managed-server2\"\n"
           + "        sslListenPort: 7104\n"
-          + "        sslPortEnabled: false\n"
           + "        networkAccessPoints:\n"
           + "          - name: \"nap2\"\n"
           + "            protocol: \"t3\"\n"
@@ -385,18 +383,15 @@ public boolean containsAll(V1ConfigMap actual, V1ConfigMap expected) {
           + "      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"
           + "      sslListenPort: 8003\n"
-          + "      sslPortEnabled: true\n"
           + "      machineName: \"machine-managed-server1\"\n"
           + "    - name: \"server2\"\n"
           + "      listenPort: 9004\n"
           + "      listenAddress: \"domain1-managed-server2\"\n"
           + "      sslListenPort: 8004\n"
-          + "      sslPortEnabled: false\n"
           + "      networkAccessPoints:\n"
           + "        - name: \"nap2\"\n"
           + "          protocol: \"t3\"\n"
@@ -446,13 +441,11 @@ public boolean containsAll(V1ConfigMap actual, V1ConfigMap expected) {
           + "        listenPort: 7003\n"
           + "        listenAddress: \"domain1-managed-server1\"\n"
           + "        sslListenPort: 7103\n"
-          + "        sslPortEnabled: true\n"
           + "        machineName: \"machine-managed-server1\"\n"
           + "      - name: \"ms2\"\n"
           + "        listenPort: 7004\n"
           + "        listenAddress: \"domain1-managed-server2\"\n"
           + "        sslListenPort: 7104\n"
-          + "        sslPortEnabled: false\n"
           + "        networkAccessPoints:\n"
           + "          - name: \"nap2\"\n"
           + "            protocol: \"t3\"\n"
@@ -510,7 +503,7 @@ public void parseDomainTopologyYaml() {
     assertEquals("domain1-managed-server2", server2Config.getListenAddress());
     assertEquals(9004, server2Config.getListenPort().intValue());
     assertEquals(8004, server2Config.getSslListenPort().intValue());
-    assertFalse(server2Config.isSslPortEnabled());
+    assertTrue(server2Config.isSslPortEnabled());
     List<NetworkAccessPoint> server2ConfigNAPs = server2Config.getNetworkAccessPoints();
     assertEquals(1, server2ConfigNAPs.size());