Fix adminservername problem (#3957)

* Fix cases where the AdminServerName is not defined or set to something that's not in the model

Author: jshum2479

operator/src/main/resources/scripts/model-wdt-create-filter.py

@@ -1,4 +1,4 @@
-# Copyright (c) 2018, 2021, Oracle and/or its affiliates.
+# Copyright (c) 2018, 2023, Oracle and/or its affiliates.
 # Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl.
 #
 # ------------
@@ -10,22 +10,25 @@
 def filter_model(model):
 	if model and 'topology' in model:
             topology = model['topology']
-            if model['topology']['AdminServerName'] != None:
+            if 'AdminServerName' in model['topology']:
                 admin_server = topology['AdminServerName']
-                model['topology'] = {}
-                model['topology']['AdminServerName'] = admin_server
-                model['topology']['Server'] = {}
-                model['topology']['Server'][admin_server] = topology['Server'][admin_server]   
             else:
-                model['topology'] = {}
+                # weblogic default
+                admin_server = 'AdminServer'
+            model['topology'] = {}
+            model['topology']['AdminServerName'] = admin_server
+            model['topology']['Server'] = {}
+            if admin_server in topology['Server']:
+                model['topology']['Server'][admin_server] = topology['Server'][admin_server]
+            else:
+                model['topology']['Server'][admin_server] = {}
 
             if 'Name' in topology:
                 model['topology']['Name'] = topology['Name']
 
             if 'Security' in topology:
                 model['topology']['Security'] = topology['Security']
 
-
 	if model and 'appDeployments' in model:
             model['appDeployments'] = {}
 

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

@@ -1,4 +1,4 @@
-# Copyright (c) 2018, 2022, Oracle and/or its affiliates.
+# Copyright (c) 2018, 2023, Oracle and/or its affiliates.
 # Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl.
 #
 # ------------
@@ -47,13 +47,15 @@
 import copy
 import inspect
 import os
-import sys
+import sys, traceback
 
 tmp_callerframerecord = inspect.stack()[0]    # 0 represents this line # 1 represents line at caller
 tmp_info = inspect.getframeinfo(tmp_callerframerecord[0])
 tmp_scriptdir=os.path.dirname(tmp_info[0])
 sys.path.append(tmp_scriptdir)
 
+import utils
+
 env = None
 ISTIO_NAP_NAMES = ['tcp-cbt', 'tcp-ldap', 'tcp-iiop', 'tcp-snmp', 'http-default', 'tcp-default', 'https-secure', 'tls-ldaps', 'tls-default', 'tls-cbts', 'tls-iiops', 'https-admin']
 
@@ -157,31 +159,49 @@ def readCredentialsSecret(self, key):
 
 
 def filter_model(model):
-  if model is not None:
-    if getOfflineWlstEnv() is None:
+
+  try:
+    if model is not None:
+
+      if getOfflineWlstEnv() is None:
         initOfflineWlstEnv(model)
 
-    initSecretManager(env)
+      initSecretManager(env)
 
-    if model and 'resources' in model:
-      customizeCustomFileStores(model)
+      if model and 'resources' in model:
+        customizeCustomFileStores(model)
 
-    if model and 'topology' in model:
-      topology = model['topology']
-      customizeNodeManagerCreds(topology)
-      customizeDomainLogPath(topology)
+      if model and 'topology' in model:
+        topology = model['topology']
+        customizeNodeManagerCreds(topology)
+        customizeDomainLogPath(topology)
 
-      if 'Cluster' in topology:
-        # If Istio enabled, inject replication channel for each cluster
-        # before creating the corresponding NAP for each server and
-        # server-template
-        customizeIstioClusters(model)
+        if 'Cluster' in topology:
+          # If Istio enabled, inject replication channel for each cluster
+          # before creating the corresponding NAP for each server and
+          # server-template
+          customizeIstioClusters(model)
+
+        if 'AdminServerName' in topology:
+          admin_server = topology['AdminServerName']
+        else:
+          # weblogic default
+          admin_server = 'AdminServer'
+          topology['AdminServerName'] = admin_server
+
+        if admin_server not in topology['Server']:
+          topology['Server'][admin_server] = {}
 
-      if 'Server' in topology:
         customizeServers(model)
 
-      if 'ServerTemplate' in topology:
-        customizeServerTemplates(model)
+        if 'ServerTemplate' in topology:
+          customizeServerTemplates(model)
+  except:
+    exc_type, exc_obj, exc_tb = sys.exc_info()
+    ee_string = traceback.format_exception(exc_type, exc_obj, exc_tb)
+    utils.trace('SEVERE', 'Error in applying MII filter:\n ' + str(ee_string))
+    raise
+
 
 def initOfflineWlstEnv(model):
   global env
@@ -450,11 +470,8 @@ def customizeServerIstioNetworkAccessPoint(server, listen_address):
   istio_readiness_port = env.getEnvOrDef("ISTIO_READINESS_PORT", None)
   if istio_readiness_port is None:
     return
-  admin_server_port = server['ListenPort']
-  # Set the default if it is not provided to avoid nap default to 0 which fails validation.
 
-  if admin_server_port is None:
-    admin_server_port = 7001
+  admin_server_port = _get_default_listen_port(server)
 
   # readiness probe
   _writeIstioNAP(name='http-probe', server=server, listen_address=listen_address,
@@ -585,10 +602,8 @@ def customizeManagedIstioNetworkAccessPoint(template, listen_address):
   istio_readiness_port = env.getEnvOrDef("ISTIO_READINESS_PORT", None)
   if istio_readiness_port is None:
     return
-  listen_port = template['ListenPort']
-  # Set the default if it is not provided to avoid nap default to 0 which fails validation.
-  if listen_port is None:
-    listen_port = 7001
+
+  listen_port = _get_default_listen_port(template)
 
   # readiness probe
   _writeIstioNAP(name='http-probe', server=template, listen_address=listen_address,
@@ -651,12 +666,8 @@ def addAdminChannelPortForwardNetworkAccessPoints(server):
   if (admin_channel_port_forwarding_enabled == 'false') or \
       (istio_enabled == 'true' and istioVersionRequiresLocalHostBindings()):
     return
-
-  admin_server_port = server['ListenPort']
   # Set the default if it is not provided to avoid nap default to 0 which fails validation.
-
-  if admin_server_port is None:
-    admin_server_port = 7001
+  admin_server_port = _get_default_listen_port(server)
 
   model = env.getModel()
 
@@ -837,5 +848,10 @@ def getSecretManager():
 def istioVersionRequiresLocalHostBindings():
   if env.getEnvOrDef("ISTIO_USE_LOCALHOST_BINDINGS", "true") == 'true':
     return True
+  return False
 
-  return False
+def _get_default_listen_port(server):
+  if 'ListenPort' not in server:
+    return 7001
+  else:
+    return server['ListenPort']

operator/src/test/python/test_wdt_mii_filter.py

@@ -1,4 +1,4 @@
-# Copyright (c) 2021, 2022, Oracle and/or its affiliates.
+# Copyright (c) 2021, 2023, Oracle and/or its affiliates.
 # Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl.
 
 import ast
@@ -464,6 +464,26 @@ def test_isSecureModeEnabledForDomain_importLegalHelperError(self):
     except ImportError as ie:
       self.assertTrue(ie is not None)
 
+  def test_adminserver_name_missing(self):
+    try:
+      model = self.getModel()
+      topology = model['topology']
+      del topology['AdminServerName']
+      model_wdt_mii_filter.filter_model(model)
+      self.assertEqual('AdminServer', topology['AdminServerName'],
+                       "Expected AdminServerName set to AdminServer after filter")
+      admin_server_exists = 'AdminServer' in topology['Server']
+      self.assertTrue(admin_server_exists, "Expected AdminServer added if AdminServerName is not set")
+
+      topology['AdminServerName'] = 'MyAdminServer'
+      model_wdt_mii_filter.filter_model(model)
+      self.assertEqual('MyAdminServer', topology['AdminServerName'],
+                       "Expected AdminServerName set to MyAdminServer after filter")
+      admin_server_exists = 'MyAdminServer' in topology['Server']
+      self.assertTrue(admin_server_exists, "Expected MyAdminServer added if AdminServerName is not set")
+
+    except ImportError as ie:
+      self.assertTrue(ie is not None)