fixing output of boolean filter fields already set

Author: robertpatrick

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

@@ -1,4 +1,4 @@
-# Copyright (c) 2021, Oracle Corporation and/or its affiliates.
+# Copyright (c) 2021, 2022, 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/yaml/yaml_translator.py

@@ -99,6 +99,15 @@ def parse(self):
         return result_dict
 
 
+def _string_value_is_boolean(value):
+    result = False
+    if value is not None:
+        _lower_case_value = value.lower()
+        if _lower_case_value == 'true' or _lower_case_value == 'false':
+            result = True
+    return result
+
+
 class PythonToJava(object):
     """
     A class that converts a Python dictionary and its contents to the Java types expected by snakeyaml.
@@ -159,7 +168,14 @@ def convert_scalar_to_java_type(self, py_value):
         elif type(py_value) is bool:
             result = JBoolean(py_value is True)
         elif type(py_value) in [str, unicode]:
-            result = JString(py_value)
+            # If the string is a legal boolean value, convert to a java.lang.Boolean
+            # to allow the SnakeYAML dump function to write the value without quotes.
+            #
+            if _string_value_is_boolean(py_value):
+                is_true = py_value.lower() == 'true'
+                result = JBoolean(is_true)
+            else:
+                result = JString(py_value)
         elif type(py_value) is int:
             result = JInteger(py_value)
         elif type(py_value) is long:

core/src/main/targetconfigs/k8s/k8s_operator_filter.py

@@ -7,6 +7,10 @@
 #  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.
 #
+
+from wlsdeploy.aliases import alias_utils
+
+
 def filter_model(model):
     __cleanup_topology(model)
     __cleanup_resources(model)
@@ -52,7 +56,9 @@ def __cleanup_topology(model):
         if topology.has_key('ServerTemplate'):
             server_templates = topology['ServerTemplate']
             for server_template in server_templates:
-                server_templates[server_template]['AutoMigrationEnabled'] = False
+                auto_migration_enabled = server_templates[server_template]['AutoMigrationEnabled']
+                if auto_migration_enabled is None or alias_utils.convert_boolean(auto_migration_enabled):
+                    server_templates[server_template]['AutoMigrationEnabled'] = False
                 for delthis in ['ServerStart']:
                     if server_templates[server_template].has_key(delthis):
                         del server_templates[server_template][delthis]

core/src/main/targetconfigs/vz/vz_filter.py

@@ -8,6 +8,8 @@
 # Remove partition, resource group elements.
 # Remove machine, node manager, virtual target, migration elements
 
+from wlsdeploy.aliases import alias_utils
+
 
 def filter_model(model):
     __cleanup_topology(model)
@@ -56,7 +58,9 @@ def __cleanup_topology(model):
         if topology.has_key('ServerTemplate'):
             server_templates = topology['ServerTemplate']
             for server_template in server_templates:
-                server_templates[server_template]['AutoMigrationEnabled'] = False
+                auto_migration_enabled = server_templates[server_template]['AutoMigrationEnabled']
+                if auto_migration_enabled is None or alias_utils.convert_boolean(auto_migration_enabled):
+                    server_templates[server_template]['AutoMigrationEnabled'] = False
                 for delthis in ['ServerStart']:
                     if server_templates[server_template].has_key(delthis):
                         del server_templates[server_template][delthis]

core/src/main/targetconfigs/wko/wko_operator_filter.py

@@ -1,4 +1,4 @@
-# Copyright (c) 2020, 2021, Oracle Corporation and/or its affiliates.
+# Copyright (c) 2020, 2022, Oracle Corporation and/or its affiliates.
 # Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl.
 #
 # ------------
@@ -7,6 +7,10 @@
 #  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.
 #
+
+from wlsdeploy.aliases import alias_utils
+
+
 def filter_model(model):
     __cleanup_topology(model)
     __cleanup_resources(model)
@@ -52,7 +56,9 @@ def __cleanup_topology(model):
         if topology.has_key('ServerTemplate'):
             server_templates = topology['ServerTemplate']
             for server_template in server_templates:
-                server_templates[server_template]['AutoMigrationEnabled'] = False
+                auto_migration_enabled = server_templates[server_template]['AutoMigrationEnabled']
+                if auto_migration_enabled is None or alias_utils.convert_boolean(auto_migration_enabled):
+                    server_templates[server_template]['AutoMigrationEnabled'] = False
                 for delthis in ['ServerStart']:
                     if server_templates[server_template].has_key(delthis):
                         del server_templates[server_template][delthis]