Add separate target filters for k8s and vz

rakillen · rakillen · commit 6a130bf31511 · 2022-01-14T17:24:18.000-06:00
diff --git a/core/src/main/python/wlsdeploy/tool/util/filter_helper.py b/core/src/main/python/wlsdeploy/tool/util/filter_helper.py
@@ -18,6 +18,8 @@
 TARGET_CONFIG_TOKEN = '@@TARGET_CONFIG_DIR@@'
 
 __id_filter_map = {
+    'k8s_filter': wko_filter.filter_model,
+    'vz_filter': wko_filter.filter_model,
     'wko_filter': wko_filter.filter_model
 }
 
diff --git a/core/src/main/targetconfigs/k8s/target.json b/core/src/main/targetconfigs/k8s/target.json
@@ -2,7 +2,7 @@
   "model_filters" : {
         "discover": [
           { "name": "k8s_prep", "path": "@@TARGET_CONFIG_DIR@@/k8s_operator_filter.py" },
-          { "id": "wko_filter" }
+          { "id": "k8s_filter" }
         ]
       },
   "variable_injectors" : {"PORT": {},"HOST": {},"URL": {}},
diff --git a/core/src/main/targetconfigs/vz/target.json b/core/src/main/targetconfigs/vz/target.json
@@ -2,7 +2,7 @@
     "model_filters" : {
         "discover": [
             { "name": "vz_prep", "path": "@@TARGET_CONFIG_DIR@@/vz_filter.py" },
-            { "id": "wko_filter" }
+            { "id": "vz_filter" }
         ]
     },
     "variable_injectors" : {"PORT": {},"HOST": {},"URL": {}},

Original file line number	Diff line number	Diff line change
`@@ -18,6 +18,8 @@`
`18`	`18`	`TARGET_CONFIG_TOKEN = '@@TARGET_CONFIG_DIR@@'`
`19`	`19`
`20`	`20`	`__id_filter_map = {`
	`21`	`+ 'k8s_filter': wko_filter.filter_model,`
	`22`	`+ 'vz_filter': wko_filter.filter_model,`
`21`	`23`	`'wko_filter': wko_filter.filter_model`
`22`	`24`	`}`
`23`	`25`
Original file line number	Diff line number	Diff line change
`@@ -2,7 +2,7 @@`
`2`	`2`	`"model_filters" : {`
`3`	`3`	`"discover": [`
`4`	`4`	`{ "name": "k8s_prep", "path": "@@TARGET_CONFIG_DIR@@/k8s_operator_filter.py" },`
`5`		`- { "id": "wko_filter" }`
	`5`	`+ { "id": "k8s_filter" }`
`6`	`6`	`]`
`7`	`7`	`},`
`8`	`8`	`"variable_injectors" : {"PORT": {},"HOST": {},"URL": {}},`