Fix problem with a wdt without any servers defined but with cluster (#3977)

* Fix problem with a wdt without any servers defined but with cluster

Author: jshum2479

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

@@ -441,7 +441,7 @@ def validateNonDynamicClusterReferencedByAtLeastOneServer(self, cluster):
     for server in self.env.getDomain().getServers():
       if self.env.getClusterOrNone(server) is cluster:
         return
-    self.addError("The WebLogic configured cluster " + self.name(cluster) + " is not referenced by any servers.")
+    self.addError("The WebLogic configured cluster " + self.name(cluster) + " is not referenced by any servers.  You must have managed servers defined that belong to this cluster.")
 
   def validateNonDynamicClusterNotReferencedByAnyServerTemplates(self, cluster):
     for template in self.env.getDomain().getServerTemplates():

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

@@ -7,31 +7,44 @@
 #  This is a WDT filter for primordial domain creation. It filters out all resources and
 #  apps deployments, leaving only the domainInfo and admin server in topology.
 #
+import sys, traceback
+import utils
+
 def filter_model(model):
-	if model and 'topology' in model:
-            topology = model['topology']
-            if 'AdminServerName' in model['topology']:
-                admin_server = topology['AdminServerName']
-            else:
-                # 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] = {}
+    try:
+        if model and 'topology' in model:
+                topology = model['topology']
+                if 'AdminServerName' in model['topology']:
+                    admin_server = topology['AdminServerName']
+                else:
+                    # weblogic default
+                    admin_server = 'AdminServer'
+                model['topology'] = {}
+                model['topology']['AdminServerName'] = admin_server
+                model['topology']['Server'] = {}
+
+                # cover the odd case that the model doesn't have any server!
+                if 'Server' in topology and admin_server in topology['Server']:
+                    model['topology']['Server'][admin_server] = topology['Server'][admin_server]
+                else:
+                    if 'Server' not in topology:
+                        model['topology']['Server'] = {}
+                    model['topology']['Server'][admin_server] = {}
 
-            if 'Name' in topology:
-                model['topology']['Name'] = topology['Name']
+                if 'Name' in topology:
+                    model['topology']['Name'] = topology['Name']
 
-            if 'Security' in topology:
-                model['topology']['Security'] = topology['Security']
+                if 'Security' in topology:
+                    model['topology']['Security'] = topology['Security']
 
-	if model and 'appDeployments' in model:
-            model['appDeployments'] = {}
+        if model and 'appDeployments' in model:
+                model['appDeployments'] = {}
 
-	if model and 'resources' in model:
-            model['resources'] = {}
+        if model and 'resources' in model:
+                model['resources'] = {}
 
+    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

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

@@ -189,6 +189,11 @@ def filter_model(model):
           admin_server = 'AdminServer'
           topology['AdminServerName'] = admin_server
 
+        # cover the odd case that the model doesn't have any server!
+
+        if 'Server' not in topology:
+          topology['Server'] = {}
+
         if admin_server not in topology['Server']:
           topology['Server'][admin_server] = {}