Changes to handle multiple custom admin channel configuration use-case.

Author: ankedia

documentation/staging/content/userguide/managing-domains/accessing-the-domain/port-forward.md

@@ -85,7 +85,7 @@ Situation | Channel Name | Listen Address | Port | Protocol
 When there's no admin port or admin channels configured, and a non-SSL default channel exists | internal-t3 | localhost | Server listening port | t3
 When there's no admin port or admin channels configured, and an SSL default channel exists | internal-t3s | localhost | Server SSL listening port | t3s 
 When an admin port is enabled | internal-admin | localhost | WebLogic administration port | admin
-When a custom admin channel is configured | internal-admin | localhost | Custom administration port | admin
+When one or more custom admin channels are configured | internal-admin${index} (where ${index} is a number that starts with 1 and increases by 1 for each custom admin channel) | localhost | Custom administration port | admin
 
 ### Port forward to an Administration Server Pod
 

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

@@ -1349,16 +1349,19 @@ def addAdminChannelPortForwardNetworkAccessPoints(self, server):
     if (admin_channel_port_forward_enabled == 'false') or (istio_enabled == 'true') :
       return
 
-    customAdminChannelPort = getCustomAdminChannelPort(server)
+    index = 0
+    for nap in server.getNetworkAccessPoints():
+      if nap.getProtocol() == "admin":
+        index += 1
+        port=nap.getListenPort()
+        self._writeAdminChannelPortForwardNAP(name='internal-admin' + str(index), server=server,
+                                              listen_port=port, protocol='admin')
 
     if isAdministrationPortEnabledForServer(server, self.env.getDomain()):
       self._writeAdminChannelPortForwardNAP(name='internal-admin', server=server,
                                             listen_port=getAdministrationPort(server, self.env.getDomain()),
                                             protocol='admin')
-    elif (customAdminChannelPort != 0):
-        self._writeAdminChannelPortForwardNAP(name='internal-admin', server=server,
-                                              listen_port=customAdminChannelPort, protocol='admin')
-    else:
+    elif index == 0:
       admin_server_port = getRealListenPort(server)
       self._writeAdminChannelPortForwardNAP(name='internal-t3', server=server,
                                             listen_port=admin_server_port, protocol='t3')
@@ -1819,14 +1822,6 @@ def isAdministrationPortEnabledForDomain(domain):
     administrationPortEnabled = isSecureModeEnabledForDomain(domain)
   return administrationPortEnabled
 
-def getCustomAdminChannelPort(server):
-  port = 0
-  for nap in server.getNetworkAccessPoints():
-    if nap.getProtocol() == "admin":
-      port=nap.getListenPort()
-      break
-  return port
-
 def isAdministrationPortEnabledForServer(server, domain, isServerTemplate=False):
   administrationPortEnabled = false
   #"if server.isSet('AdministrationPortEnabled'):" does not work in off-line WLST!

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

@@ -523,21 +523,6 @@ def customizeManagedIstioNetworkAccessPoint(template, listen_address):
     _writeIstioNAP(name='tls-iiops', server=template, listen_address=listen_address,
                    listen_port=ssl_listen_port, protocol='iiops')
 
-def getCustomAdminChannelPort(server):
-  customAdminChannelPort=0
-  if 'NetworkAccessPoint' not in server:
-    server['NetworkAccessPoint'] = {}
-
-  naps = server['NetworkAccessPoint']
-  nap_names = naps.keys()
-  for nap_name in nap_names:
-    nap = naps[nap_name]
-    if nap['Protocol'] == 'admin':
-      customAdminChannelPort = nap['ListenPort']
-      break
-  return customAdminChannelPort
-
-
 def addAdminChannelPortForwardNetworkAccessPoints(server):
   istio_enabled = env.getEnvOrDef("ISTIO_ENABLED", "false")
   admin_channel_port_forwarding_enabled = env.getEnvOrDef("ADMIN_CHANNEL_PORT_FORWARDING_ENABLED", "true")
@@ -551,15 +536,25 @@ def addAdminChannelPortForwardNetworkAccessPoints(server):
     admin_server_port = 7001
 
   model = env.getModel()
-  customAdminChannelPort=getCustomAdminChannelPort(server)
+
+  if 'NetworkAccessPoint' not in server:
+    server['NetworkAccessPoint'] = {}
+
+  naps = server['NetworkAccessPoint']
+  nap_names = naps.keys()
+  index = 0
+  for nap_name in nap_names:
+    nap = naps[nap_name]
+    if nap['Protocol'] == 'admin':
+      index += 1
+      customAdminChannelPort = nap['ListenPort']
+      _writeAdminChannelPortForwardNAP(name='internal-admin' + str(index), server=server,
+                                       listen_port=customAdminChannelPort, protocol='admin')
 
   if isAdministrationPortEnabledForServer(server, model['topology']):
     _writeAdminChannelPortForwardNAP(name='internal-admin', server=server,
                                      listen_port=getAdministrationPort(server, model['topology']), protocol='admin')
-  elif (customAdminChannelPort != 0 ):
-      _writeAdminChannelPortForwardNAP(name='internal-admin', server=server,
-                                       listen_port=customAdminChannelPort, protocol='admin')
-  else:
+  elif index == 0:
     _writeAdminChannelPortForwardNAP(name='internal-t3', server=server, listen_port=admin_server_port, protocol='t3')
 
     ssl = getSSLOrNone(server)
@@ -574,7 +569,6 @@ def addAdminChannelPortForwardNetworkAccessPoints(server):
     if ssl_listen_port is not None:
       _writeAdminChannelPortForwardNAP(name='internal-t3s', server=server, listen_port=ssl_listen_port, protocol='t3s')
 
-
 def _writeAdminChannelPortForwardNAP(name, server, listen_port, protocol):
 
   if 'NetworkAccessPoint' not in server: