Corrected comments; display object array index in validation messages

Author: rakillen

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

@@ -66,9 +66,6 @@ def __init__(self, model, model_context, logger):
         return
 
     def extract(self):
-        """
-        Deploy resource model elements at the domain level, including multi-tenant elements.
-        """
         _method_name = 'extract'
 
         resource_file = self._model_context.get_domain_resource_file()
@@ -111,7 +108,7 @@ def _process_object(self, model_dict, schema_folder, target_dict, schema_path):
         :param model_dict: the source model dictionary
         :param schema_folder: the schema for this folder
         :param target_dict: the target dictionary for the domain resource file.
-        :param schema_path: the path of schema elements (no multi-element names), used for supported check
+        :param schema_path: the path of schema elements, used for supported check
         """
         folder_properties = schema_folder["properties"]
 
@@ -146,7 +143,7 @@ def _process_object_array(self, model_value, item_info, schema_path):
         Process an array of objects.
         :param model_value: the model contents for a folder
         :param item_info: describes the contents of the sub-folder for each element
-        :param schema_path: the path of schema elements (no multi-element names), used for supported check
+        :param schema_path: the path of schema elements, used for supported check
         """
         child_list = list()
         for object_map in model_value:

core/src/main/python/wlsdeploy/tool/validate/kubernetes_validator.py

@@ -105,16 +105,19 @@ def _validate_object_array(self, model_value, property_map, schema_path, model_p
         Validate the contents of this object array.
         :param model_value: the model contents for a folder
         :param property_map: describes the contents of the sub-folder for each element
-        :param schema_path: the path of schema elements (no multi-element names), used for supported check
-        :param model_path: the path of model elements (including multi-element names), used for logging
+        :param schema_path: the path of schema elements (no array indices), used for supported check
+        :param model_path: the path of model elements (including array indices), used for logging
         """
         _method_name = '_validate_object_array'
         if not isinstance(model_value, list):
             self._logger.severe("WLSDPLY-05040", model_path, class_name=self._class_name, method_name=_method_name)
             return
 
+        index = 0
         for name_map in model_value:
-            self.validate_folder(name_map, property_map, schema_path, model_path)
+            index_path = '%s[%s]' % (model_path, index)
+            self.validate_folder(name_map, property_map, schema_path, index_path)
+            index += 1
 
     def _validate_simple_map(self, model_value, property_name, model_path):
         _method_name = '_validate_simple_map'