Merge branch 'owls-115600-port-forward-fix' into 'main'

Fix introspector incorrectly include disabled http port for internal port...

See merge request weblogic-cloud/weblogic-kubernetes-operator!4556

Author: rjeberhard

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

@@ -1550,9 +1550,10 @@ def addAdminChannelPortForwardNetworkAccessPoints(self, server):
                                             listen_port=getAdministrationPort(server, self.env.getDomain()),
                                             protocol='admin')
     elif index == 0:
-      admin_server_port = getRealListenPort(server)
-      self._writeAdminChannelPortForwardNAP(name='internal-t3', server=server,
-                                            listen_port=admin_server_port, protocol='t3')
+      if isListenPortEnabledForServer(server, self.env.getDomain(), False):
+        admin_server_port = getRealListenPort(server)
+        self._writeAdminChannelPortForwardNAP(name='internal-t3', server=server,
+                                              listen_port=admin_server_port, protocol='t3')
 
       ssl_listen_port = getSSLPortIfEnabled(server, self.env.getDomain(), is_server_template=False)
 

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

@@ -569,8 +569,8 @@ def addAdminChannelPortForwardNetworkAccessPoints(server):
     _writeAdminChannelPortForwardNAP(name='internal-admin', server=server,
                                      listen_port=getAdministrationPort(server, model['topology']), protocol='admin')
   elif index == 0:
-    if not secure_mode:
-       _writeAdminChannelPortForwardNAP(name='internal-t3', server=server, listen_port=admin_server_port, protocol='t3')
+    if not secure_mode and is_listenport_enabled(server):
+      _writeAdminChannelPortForwardNAP(name='internal-t3', server=server, listen_port=admin_server_port, protocol='t3')
 
     ssl = getSSLOrNone(server)
     ssl_listen_port = None
@@ -584,6 +584,19 @@ def addAdminChannelPortForwardNetworkAccessPoints(server):
     if ssl_listen_port is not None:
       _writeAdminChannelPortForwardNAP(name='internal-t3s', server=server, listen_port=ssl_listen_port, protocol='t3s')
 
+
+def is_listenport_enabled(server):
+  if 'ListenPortEnabled' in server:
+    val = server['ListenPortEnabled']
+    if isinstance(val, str) or isinstance(val, unicode):
+      is_listen_port_enabled = Boolean.valueOf(val)
+    else:
+      is_listen_port_enabled = val
+  else:
+    is_listen_port_enabled = True
+  return is_listen_port_enabled
+
+
 def _writeAdminChannelPortForwardNAP(name, server, listen_port, protocol):
 
   if 'NetworkAccessPoint' not in server: