Revised k8s model help to use hyphenated lists

Author: rakillen

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

@@ -46,10 +46,10 @@ def _print_model_section_sample(self, section_name, control_option):
         _print_indent(path, 0)
 
         if model_help_utils.show_attributes(control_option):
-            self._print_attributes_sample(self._schema, 1)
+            self._print_attributes_sample(self._schema, 1, False)
 
         if model_help_utils.show_folders(control_option):
-            self._print_subfolders_sample(self._schema, control_option, 1, path)
+            self._print_subfolders_sample(self._schema, control_option, 1, path, False)
 
     def _print_model_folder_sample(self, section_name, model_path_tokens, control_option):
         """
@@ -69,6 +69,7 @@ def _print_model_folder_sample(self, section_name, model_path_tokens, control_op
         _print_indent(section_name + ":", indent)
         indent += 1
 
+        in_object_array = False
         model_path = section_name + ":"
         current_folder = self._schema
         for token in model_path_tokens[1:]:
@@ -83,31 +84,30 @@ def _print_model_folder_sample(self, section_name, model_path_tokens, control_op
 
             current_folder = properties[token]
 
-            _print_indent(token + ":", indent)
+            _print_indent(token + ":", indent, in_object_array)
             indent += 1
 
-            if wko_schema_helper.is_object_array(current_folder):
-                name = token + '-1'
-                _print_indent(name + ":", indent)
-                indent += 1
-
+            # apply to the next folder in the path
+            in_object_array = wko_schema_helper.is_object_array(current_folder)
             model_path = model_path + "/" + token
 
         # list the attributes and folders, as specified
 
         if model_help_utils.show_attributes(control_option):
             # Print the attributes associated with schema folder
-            self._print_attributes_sample(current_folder, indent)
+            in_object_array = self._print_attributes_sample(current_folder, indent, in_object_array)
 
         if model_help_utils.show_folders(control_option):
-            self._print_subfolders_sample(current_folder, control_option, indent, model_path)
+            self._print_subfolders_sample(current_folder, control_option, indent, model_path, in_object_array)
 
-    def _print_subfolders_sample(self, schema_folder, control_option, indent_level, path):
+    def _print_subfolders_sample(self, schema_folder, control_option, indent_level, path, in_object_array):
         """
         Prints a model sample section for the folders in a model location.
         :param schema_folder: the schema folder being printed
         :param control_option: a command-line switch that controls what is output to STDOUT
         :param indent_level: the level to indent by, before printing output
+        :param path: indicates path to request for child folder help
+        :param in_object_array: if True, a hyphen is printed before the first attribute
         """
         _method_name = '_print_subfolders_sample'
 
@@ -135,27 +135,29 @@ def _print_subfolders_sample(self, schema_folder, control_option, indent_level,
             if control_option != ControlOptions.RECURSIVE:
                 print("")
 
-            key_level = indent_level
-            _print_indent(key + ":", key_level)
+            _print_indent(key + ":", indent_level, in_object_array)
+            in_object_array = False
 
-            child_level = key_level
-            if key in multi_folders:
-                name = key + "-1"
-                child_level += 1
-                _print_indent(name + ":", child_level)
+            child_level = indent_level + 1
 
+            next_path = path + "/" + key
             if control_option == ControlOptions.RECURSIVE:
                 # Call this method recursively
-                self._print_subfolders_sample(folder_info, control_option, child_level + 1, path)
+                child_in_object_array = key in multi_folders
+                self._print_subfolders_sample(folder_info, control_option, child_level, path,
+                                              child_in_object_array)
             else:
-                next_path = path + "/" + key
-                _print_indent("# see " + next_path, child_level + 1)
+                _print_indent("# see " + next_path, child_level)
+
+        return in_object_array
 
-    def _print_attributes_sample(self, schema_folder, indent_level):
+    def _print_attributes_sample(self, schema_folder, indent_level, in_object_array):
         """
         Prints a model sample for the attributes in a model location
         :param schema_folder: the schema folder to be printed
         :param indent_level: the level of indentation for this folder
+        :param in_object_array: if True, a hyphen is printed before the first attribute
+        :return: value of in_object_array, or False if an attribute was printed with a hyphen
         """
         _method_name = '_print_attributes_sample'
 
@@ -192,10 +194,13 @@ def _print_attributes_sample(self, schema_folder, indent_level):
             format_string = '%-' + str(maxlen + 1) + 's # %s'
             for attr_name in attr_list:
                 line = format_string % (attr_name + ":", attribute_map[attr_name])
-                _print_indent(line, indent_level)
+                _print_indent(line, indent_level, in_object_array)
+                in_object_array = False
         else:
             _print_indent("# no attributes", indent_level)
 
+        return in_object_array
+
 
 def _get_properties(schema_folder):
     # in array elements, the properties are under "items"
@@ -221,15 +226,20 @@ def _get_folder_names(schema_properties):
     return folder_names
 
 
-def _print_indent(msg, level=1):
+def _print_indent(msg, level=1, first_in_list_object=False):
     """
     Print a message at the specified indent level.
     :param msg: the message to be printed
     :param level: the indent level
+    :param first_in_list_object: True if this is the first property of an object in a list
     """
     result = ''
     i = 0
     while i < level:
         result += '    '
         i += 1
+
+    if first_in_list_object:
+        result = result[:-2] + "- "
+
     print '%s%s' % (result, msg)