Set domain source type default for extractResource and target resource files (#810)

* JIRA WDT-530 - Display enum options in modelHelp and in unit test model

* JIRA WDT-530 - Set domainHomeSourceType to Image if not specified in model

* JIRA WDT-530 - Add domainHomeSourceType to resource file for -target vz output

Author: rakillen

core/src/main/python/wlsdeploy/tool/extract/domain_resource_extractor.py

@@ -27,6 +27,7 @@
 CLUSTER_NAME = 'clusterName'
 CONFIGURATION = 'configuration'
 DOMAIN_HOME = 'domainHome'
+DOMAIN_HOME_SOURCE_TYPE = 'domainHomeSourceType'
 DOMAIN_TYPE = 'domainType'
 IMAGE = 'image'
 IMAGE_PULL_POLICY = 'imagePullPolicy'
@@ -47,6 +48,7 @@
 DEFAULT_WEBLOGIC_CREDENTIALS_SECRET = PASSWORD_TOKEN
 DEFAULT_IMAGE = PASSWORD_TOKEN
 DEFAULT_IMAGE_PULL_SECRETS = PASSWORD_TOKEN
+DEFAULT_SOURCE_TYPE = 'Image'
 
 MULTI_KEYS = {
     'spec/adminServer/adminService/channels': 'channelName',
@@ -217,6 +219,10 @@ def _update_resource_dictionary(self, resource_dict):
         if DOMAIN_HOME not in spec_section:
             spec_section[DOMAIN_HOME] = self._model_context.get_domain_home()
 
+        # only set domain home source type if it is not present in spec section
+        if DOMAIN_HOME_SOURCE_TYPE not in spec_section:
+            spec_section[DOMAIN_HOME_SOURCE_TYPE] = DEFAULT_SOURCE_TYPE
+
         # only set image if it is not present in spec section
         if IMAGE not in spec_section:
             spec_section[IMAGE] = DEFAULT_IMAGE

core/src/main/python/wlsdeploy/tool/extract/wko_schema_helper.py

@@ -130,6 +130,10 @@ def get_type(schema_map):
     return dictionary_utils.get_element(schema_map, "type")
 
 
+def get_enum_values(schema_map):
+    return dictionary_utils.get_element(schema_map, 'enum')
+
+
 def is_unsupported_folder(path):
     return path in UNSUPPORTED_FOLDERS
 

core/src/main/python/wlsdeploy/tool/modelhelp/model_kubernetes_printer.py

@@ -174,7 +174,11 @@ def _print_attributes_sample(self, schema_folder, indent_level):
                     attribute_map[key] = 'list of ' + wko_schema_helper.get_array_element_type(property_map)
 
                 elif not wko_schema_helper.is_folder(property_map):
-                    attribute_map[key] = wko_schema_helper.get_type(property_map)
+                    type_text = wko_schema_helper.get_type(property_map)
+                    enum_values = wko_schema_helper.get_enum_values(property_map)
+                    if enum_values:
+                        type_text += ' (' + ', '.join(enum_values) + ')'
+                    attribute_map[key] = type_text
 
         if attribute_map:
             attr_list = attribute_map.keys()

core/src/main/targetconfigs/vz/model.yaml

@@ -13,6 +13,10 @@ spec:
         # The WebLogic Domain Home
         domainHome: {{{domainHome}}}
 
+        # The domain home source type
+        # Set to PersistentVolume for domain-in-pv, Image for domain-in-image, or FromModel for model-in-image
+        domainHomeSourceType: {{{domainHomeSourceType}}}
+
         # The WebLogic Server Docker image that the Operator uses to start the domain
         image: {{{imageName}}}
 

core/src/test/python/wlsdeploy/tool/extract/kubernetes_schema_test.py

@@ -104,6 +104,9 @@ def _write_folder(self, folder, name, is_multiple, path, indent):
             elif property_type in wko_schema_helper.SIMPLE_TYPES:
                 if property_name != multi_key:
                     value = _get_sample_value(property_type)
+                    enum_values = wko_schema_helper.get_enum_values(property_map)
+                    if enum_values:
+                        value = "'" + enum_values[0] + "'  # " + ', '.join(enum_values)
                     self._write_line(indent + str(property_name) + ": " + value)
 
             else: