Remove machine references from server templates in model filter (#1137)

Author: rakillen

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

@@ -181,7 +181,7 @@ def filter_topology(model, _model_context):
         auto_migration_enabled = server_template[AUTO_MIGRATION_ENABLED]
         if auto_migration_enabled is None or alias_utils.convert_boolean(auto_migration_enabled):
             server_template[AUTO_MIGRATION_ENABLED] = PyRealBoolean(False)
-        for delete_key in [SERVER_START]:
+        for delete_key in [MACHINE, SERVER_START]:
             if delete_key in server_template:
                 del server_template[delete_key]
 

core/src/test/python/wlsdeploy/tool/util/filters/wko_filter_test.py

@@ -19,6 +19,8 @@
 from wlsdeploy.aliases.model_constants import RESOURCES
 from wlsdeploy.aliases.model_constants import RESOURCE_GROUP
 from wlsdeploy.aliases.model_constants import SECURITY_CONFIGURATION
+from wlsdeploy.aliases.model_constants import SERVER
+from wlsdeploy.aliases.model_constants import SERVER_TEMPLATE
 from wlsdeploy.aliases.model_constants import TOPOLOGY
 from wlsdeploy.aliases.model_constants import VIRTUAL_TARGET
 from wlsdeploy.tool.util.filters import wko_filter
@@ -78,6 +80,12 @@ def testFilter(self):
         self._no_dictionary_key(topology, MACHINE)
         self._no_dictionary_key(topology, VIRTUAL_TARGET)
 
+        server_1 = self._traverse(model, TOPOLOGY, SERVER, 'm1')
+        self._no_dictionary_key(server_1, MACHINE)
+
+        template_1 = self._traverse(model, TOPOLOGY, SERVER_TEMPLATE, 'template-1')
+        self._no_dictionary_key(template_1, MACHINE)
+
         # Partition and resource elements should be removed from the model
 
         resources = self._traverse(model, RESOURCES)

core/src/test/resources/prepare/wko-filter.yaml

@@ -31,15 +31,22 @@ topology:
         m1:
             Cluster: staticCluster
             ListenPort: 5001
+            Machine: "machine-1"
         m2:
             Cluster: staticCluster
             # string value should match numeric value
             ListenPort: "5001"
+            Machine: "machine-1"
         m3:
             Cluster: staticCluster
             # this should cause a warning message
             ListenPort: 5002
+            Machine: "machine-1"
+    ServerTemplate:
+        'template-1':
+            Machine: "machine-1"
     Machine:
+        # this machine and any references to it should be removed
         machine-1:
     VirtualTarget:
         target-2: