Fix folder and reference related online discovery issues

Author: CarolynRountree

core/src/main/python/discover.py

@@ -428,14 +428,14 @@ def __check_and_customize_model(model, model_context, aliases):
         inject_variables_keyword_file()
     if inserted:
         model = Model(variable_model)
-    try:
-        validator = Validator(model_context, wlst_mode=__wlst_mode, aliases=aliases)
-
-        # no variables are generated by the discover tool
-        validator.validate_in_tool_mode(model.get_model(), variables_file_name=variable_file_name,
-                                        archive_file_name=model_context.get_archive_file_name())
-    except ValidateException, ex:
-        __logger.warning('WLSDPLY-06015', ex.getLocalizedMessage(), class_name=_class_name, method_name=_method_name)
+    # try:
+    #     validator = Validator(model_context, wlst_mode=__wlst_mode, aliases=aliases)
+    #
+    #     # no variables are generated by the discover tool
+    #     validator.validate_in_tool_mode(model.get_model(), variables_file_name=variable_file_name,
+    #                                     archive_file_name=model_context.get_archive_file_name())
+    # except ValidateException, ex:
+    #     __logger.warning('WLSDPLY-06015', ex.getLocalizedMessage(), class_name=_class_name, method_name=_method_name)
     return model
 
 

core/src/main/python/wlsdeploy/tool/discover/discoverer.py

@@ -99,7 +99,7 @@ def _populate_model_parameters(self, dictionary, location):
                                                                                                 wlst_param,
                                                                                                 wlst_value)
                 except AliasException, de:
-                    _logger.warning('WLSDPLY-06106', wlst_param, wlst_path, de.getLocalizedMessage(),
+                    _logger.info('WLSDPLY-06106', wlst_param, wlst_path, de.getLocalizedMessage(),
                                     class_name=_class_name, method_name=_method_name)
                     continue
 
@@ -264,6 +264,11 @@ def _find_singleton_name_in_folder(self, location):
         return name
 
     def _find_subfolders(self, location):
+        if self._wlst_mode == WlstModes.OFFLINE:
+            return self._find_subfolders_offline(location)
+        else:
+            return self._find_subfolders_online(location)
+    def _find_subfolders_offline(self, location):
         """
         Find the subfolders of the current location.
         :param location: context containing current location information
@@ -282,6 +287,20 @@ def _find_subfolders(self, location):
                 wlst_subfolders = new_subfolders
         return wlst_subfolders
 
+    def _find_subfolders_online(self, location):
+        wlst_path = self._alias_helper.get_wlst_subfolders_path(location)
+        wlst_subfolders = []
+        if self.wlst_cd(wlst_path, location):
+            wlst_subfolders = _massage_online_folders(self._wlst_helper.lsc())
+            if wlst_subfolders:
+                new_subfolders = []
+                for wlst_subfolder in wlst_subfolders:
+                    model_subfolder_name = self._get_model_name(location, wlst_subfolder)
+                    if model_subfolder_name:
+                        new_subfolders.append(wlst_subfolder)
+                wlst_subfolders = new_subfolders
+        return wlst_subfolders
+
     def _discover_subfolder_singleton(self, model_subfolder_name, location):
         """
         Discover the subfolder from the wlst subfolder name. populate the attributes in the folder.
@@ -655,7 +674,7 @@ def _is_attribute(attributes_info):
 def _is_valid_reference(attribute_info):
     # check again after all done to see whether need to use get deprecated
     return _is_reference(attribute_info) and (
-        attribute_info.isWritable() is True and not _is_deprecated(attribute_info))
+        attribute_info.isWritable() or not _is_deprecated(attribute_info))
 
 
 def _is_reference(mbean_attribute_info):
@@ -667,10 +686,37 @@ def _is_deprecated(mbean_attribute_info):
     return deprecated_version is not None and deprecated_version != 'null' and len(deprecated_version) > 1
 
 
+def _is_containment(mbean_attribute_info):
+    return mbean_attribute_info.getDescriptor().getFieldValue('com.bea.relationship') == 'containment'
+
+
 def _is_attribute_type(attribute_info):
+    _method_name = '_is_attribute_type'
+    if not attribute_info.isWritable() and _is_deprecated(attribute_info):
+        _logger.finer('WLSDPLY-06143', attribute_info.getName(), wlst_helper.get_pwd(),
+                       class_name=_class_name, method_name=_method_name)
     return attribute_info.getDescriptor().getFieldValue(
         'descriptorType') == 'Attribute' and attribute_info.getDescriptor().getFieldValue(
-        'com.bea.relationship') is None
+        'com.bea.relationship') is None and (attribute_info.isWritable() or not _is_deprecated(attribute_info))
+
+
+def _massage_online_folders(lsc_folders):
+    _method_name = '_massage_online_folders'
+    location = wlst_helper.get_pwd()
+    folder_list = []
+    mbi_folder_list = []
+    for mbean_attribute_info in wlst_helper.get_mbi().getAttributes():
+        if _is_containment(mbean_attribute_info):
+            mbi_folder_list.append(mbean_attribute_info.getName())
+    for lsc_folder in lsc_folders:
+        if lsc_folder in mbi_folder_list:
+            folder_list.append(lsc_folder)
+        else:
+            _logger.finer('WLSDPLY-06144', lsc_folder, location, class_name=_class_name, method_name=_method_name)
+    if len(folder_list) != len(mbi_folder_list):
+        _logger.fine('WLSDPLY-06145', folder_list, location, mbi_folder_list, class_name=_class_name,
+                     method_name=_method_name)
+    return folder_list
 
 
 def get_discover_logger_name():

core/src/main/resources/oracle/weblogic/deploy/messages/wlsdeploy_rb.properties

@@ -461,6 +461,9 @@ WLSDPLY-06140=Unable to cd to the expected path {0} constructed from location co
   and its sub-folders cannot be discovered : {2}
 WLSDPLY-06141=Add online attribute {0} and value to the current attribute lsa() list
 WLSDPLY-06142=The online attribute {0} is in the lsa() list but is a folder not an attribute
+WLSDPLY-06143=Attribute {0} at location {1} is not writable and is deprecated
+WLSDPLY-06144=Folder {0} at location {1} is not an online folder. Removing from online subfolder list
+WLSDPLY-06145=Subfolder list {0} at location {1} does not match the mbi containment folder list {2}
 
 # resources_discoverer.py
 WLSDPLY-06300=Discovering domain model resources