Merge pull request #233 from oracle/wdt-50-groupparams

Wdt 50 groupparams

Author: rakillen

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

@@ -1,5 +1,5 @@
 """
-Copyright (c) 2017, 2018, Oracle and/or its affiliates. All rights reserved.
+Copyright (c) 2017, 2019, Oracle and/or its affiliates. All rights reserved.
 The Universal Permissive License (UPL), Version 1.0
 """
 import javaos as os
@@ -143,7 +143,7 @@ def _get_attributes_for_current_location_online(self, location):
         path = self._alias_helper.get_wlst_attributes_path(location)
         try:
             lsa_attributes = wlst_helper.lsa(path)
-            mbi_attributes = _get_mbi_attribute_list()
+            mbi_attributes = _get_mbi_attribute_list(path)
             if mbi_attributes:
                 for lsa_attribute_name in lsa_attributes:
                     if lsa_attribute_name in lsa_attributes and lsa_attribute_name not in mbi_attributes:
@@ -659,9 +659,9 @@ def convert_to_absolute_path(relative_to, file_name):
     return file_name
 
 
-def _get_mbi_attribute_list():
+def _get_mbi_attribute_list(path):
     attribute_list = []
-    for mbean_attribute_info in wlst_helper.get_mbi().getAttributes():
+    for mbean_attribute_info in wlst_helper.get_mbi(path).getAttributes():
         if _is_attribute(mbean_attribute_info):
             attribute_list.append(mbean_attribute_info.getName())
     return attribute_list
@@ -705,7 +705,7 @@ def _massage_online_folders(lsc_folders):
     location = wlst_helper.get_pwd()
     folder_list = []
     mbi_folder_list = []
-    for mbean_attribute_info in wlst_helper.get_mbi().getAttributes():
+    for mbean_attribute_info in wlst_helper.get_mbi(location).getAttributes():
         if _is_containment(mbean_attribute_info):
             mbi_folder_list.append(mbean_attribute_info.getName())
     for lsc_folder in lsc_folders:

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

@@ -321,10 +321,14 @@ def _get_group_params(self, location):
                                     class_name=_class_name, method_name=_method_name)
                 else:
                     group_param_name = attributes[wlst_subdeployment]
-                    _logger.finer('WLSDPLY-06487', group_param_name, self._alias_helper.get_model_folder_path(location),
-                                  class_name=_class_name, method_name=_method_name)
-                    subfolder_result[group_param_name] = OrderedDict()
-                    self._populate_model_parameters(subfolder_result[group_param_name], location)
+                    if group_param_name is None:
+                        _logger.warning('WLSDPLY-06486', folder_name, self._alias_helper.get_model_folder_path(location),
+                                        class_name=_class_name, method_name=_method_name)
+                    else:
+                        _logger.finer('WLSDPLY-06487', group_param_name, self._alias_helper.get_model_folder_path(location),
+                                      class_name=_class_name, method_name=_method_name)
+                        subfolder_result[group_param_name] = OrderedDict()
+                        self._populate_model_parameters(subfolder_result[group_param_name], location)
                 location.remove_name_token(name_token)
         location.pop_location()
         _logger.exiting(class_name=_class_name, method_name=_method_name, result=subfolder_result)

core/src/main/python/wlsdeploy/util/wlst_helper.py

@@ -1,5 +1,5 @@
 """
-Copyright (c) 2017, 2018, Oracle and/or its affiliates. All rights reserved.
+Copyright (c) 2017, 2019, Oracle and/or its affiliates. All rights reserved.
 The Universal Permissive License (UPL), Version 1.0
 """
 import com.oracle.cie.domain.script.jython.WLSTException as offlineWLSTException
@@ -1103,9 +1103,20 @@ def _get_wlst_mode():
     return result
 
 
-def get_mbi():
+def get_mbi(path=None):
     """
-    Get the MBeanInfo for the current MBean location.
+    Get the MBeanInfo for the current or specifiec MBean location.
+    :param path: optionally specify path to check
     :return: javax.management.modelmbean.ModelMBeanInfo instance for the current location
     """
-    return wlst.getMBI()
+    current_path = None
+    if path is not None:
+        current_path = get_pwd()
+        cd(path)
+
+    result = wlst.getMBI()
+
+    if current_path is not None:
+        cd(current_path)
+
+    return result