Create internal WKO filter and invoke it for known targets

Author: rakillen

core/src/main/python/wlsdeploy/tool/util/filter_helper.py

@@ -1,12 +1,13 @@
 """
-Copyright (c) 2017, 2020, Oracle Corporation and/or its affiliates.  All rights reserved.
+Copyright (c) 2017, 2021, Oracle Corporation and/or its affiliates.  All rights reserved.
 Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl.
 """
 import imp
 import os
 import sys
 
 from wlsdeploy.logging.platform_logger import PlatformLogger
+from wlsdeploy.tool.util.filters import wko_filter
 from wlsdeploy.util import dictionary_utils
 from wlsdeploy.util import path_utils
 from wlsdeploy.util.model_translator import FileToPython
@@ -17,7 +18,7 @@
 TARGET_CONFIG_TOKEN = '@@TARGET_CONFIG_DIR@@'
 
 __id_filter_map = {
-    # 'filterId': filter_method
+    'wko_filter': wko_filter.filter_model
 }
 
 

core/src/main/python/wlsdeploy/tool/util/filters/__init__.py

@@ -0,0 +1,4 @@
+"""
+Copyright (c) 2021, Oracle Corporation and/or its affiliates.
+Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl.
+"""

core/src/main/python/wlsdeploy/tool/util/filters/wko_filter.py

@@ -0,0 +1,35 @@
+# Copyright (c) 2021, Oracle Corporation and/or its affiliates.
+# Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl.
+#
+# ------------
+# Description:
+# ------------
+# WDT filters to prepare a model for use with WKO, using the createDomain or prepareModel tools.
+# These operations can be invoked as a single call, or independently of each other.
+
+def filter_model(model):
+    """
+    Perform the following operations on the specified model:
+    - Remove any online-only attributes
+    - Check if servers in a cluster have different ports
+    :param model: the model to be filtered
+    """
+    filter_online_attributes(model)
+    check_clustered_server_ports(model)
+
+
+def filter_online_attributes(model):
+    """
+    Remove any online-only attributes from the specified model.
+    :param model: the model to be filtered
+    """
+    print("\n\nFILTER ONLINE ATTRIBUTES")
+
+
+def check_clustered_server_ports(model):
+    """
+    Set the CalculatedListenPorts attribute to false for dynamic clusters in the specified model.
+    Warn if servers in a static cluster have different ports in the specified model.
+    :param model: the model to be filtered
+    """
+    print("\n\nCHECK_CLUSTERED SERVER PORTS")

core/src/main/targetconfigs/k8s/target.json

@@ -1,7 +1,8 @@
 {
   "model_filters" : {
         "discover": [
-          { "name": "k8s_prep", "path": "@@TARGET_CONFIG_DIR@@/k8s_operator_filter.py" }
+          { "name": "k8s_prep", "path": "@@TARGET_CONFIG_DIR@@/k8s_operator_filter.py" },
+          { "id": "wko_filter" }
         ]
       },
   "variable_injectors" : {"PORT": {},"HOST": {},"URL": {}},

core/src/main/targetconfigs/vz/target.json

@@ -1,7 +1,8 @@
 {
     "model_filters" : {
         "discover": [
-            { "name": "vz_prep", "path": "@@TARGET_CONFIG_DIR@@/vz_filter.py" }
+            { "name": "vz_prep", "path": "@@TARGET_CONFIG_DIR@@/vz_filter.py" },
+            { "id": "wko_filter" }
         ]
     },
     "variable_injectors" : {"PORT": {},"HOST": {},"URL": {}},

core/src/main/targetconfigs/wko/target.json

@@ -1,7 +1,8 @@
 {
   "model_filters" : {
         "discover": [
-          { "name": "wko_prep", "path": "@@TARGET_CONFIG_DIR@@/wko_operator_filter.py" }
+          { "name": "wko_prep", "path": "@@TARGET_CONFIG_DIR@@/wko_operator_filter.py" },
+          { "id": "wko_filter" }
         ]
       },
   "variable_injectors" : {"PORT": {},"HOST": {},"URL": {}},