further updates for running online discover

Author: CarolynRountree

core/src/main/python/wlsdeploy/aliases/alias_utils.py

@@ -590,22 +590,22 @@ def compute_read_data_type_and_delimiter_from_attribute_info(attribute_info, val
     if WLST_TYPE in attribute_info:
         data_type = attribute_info[WLST_TYPE]
         delimiter = compute_delimiter_from_data_type(data_type, value)
-
-    if WLST_READ_TYPE in attribute_info:
-        data_type = attribute_info[WLST_READ_TYPE]
-        read_delimiter = compute_delimiter_from_data_type(data_type, value)
-        if read_delimiter is not None:
-            delimiter = read_delimiter
-
-    if PREFERRED_MODEL_TYPE in attribute_info:
-        data_type = attribute_info[PREFERRED_MODEL_TYPE]
-        #
-        # This code does not consider the delimiter defined by the preferred_model_type field unless there is
-        # no other delimiter defined by wlst_type or wlst_read_type.  This is required to handle the use case
-        # where the value read from WLST had a different separator than the preferred_model_type.
-        #
-        if delimiter is None:
-            delimiter = compute_delimiter_from_data_type(data_type, value)
+    else:
+        if WLST_READ_TYPE in attribute_info:
+            data_type = attribute_info[WLST_READ_TYPE]
+            read_delimiter = compute_delimiter_from_data_type(data_type, value)
+            if read_delimiter is not None:
+                delimiter = read_delimiter
+
+        if PREFERRED_MODEL_TYPE in attribute_info:
+            data_type = attribute_info[PREFERRED_MODEL_TYPE]
+            #
+            # This code does not consider the delimiter defined by the preferred_model_type field unless there is
+            # no other delimiter defined by wlst_type or wlst_read_type.  This is required to handle the use case
+            # where the value read from WLST had a different separator than the preferred_model_type.
+            #
+            if delimiter is None:
+                delimiter = compute_delimiter_from_data_type(data_type, value)
 
     return data_type, delimiter
 
@@ -653,12 +653,13 @@ def convert_to_type(data_type, value, subtype=None, delimiter=None):
             raise ex
 
         if new_value is not None:
+            _logger.warning('data type {0} value {1}', data_type, new_value)
             if data_type == LONG:
                 new_value = Long(new_value)
             elif data_type == JAVA_LANG_BOOLEAN:
                 new_value = Boolean(new_value)
             elif data_type == JARRAY:
-                if subtype is None or subtype == 'java.lang.String':
+                if subtype == 'java.lang.String':
                     new_value = _create_string_array(new_value)
                 else:
                     new_value = _create_mbean_array(new_value, subtype)

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

@@ -84,7 +84,7 @@ def _populate_model_parameters(self, dictionary, location):
                 else:
                     wlst_value = wlst_params[wlst_param]
 
-                _logger.finest('WLSDPLY-06105', wlst_param, wlst_value, wlst_path, class_name=_class_name,
+                _logger.finer('WLSDPLY-06105', wlst_param, wlst_value, wlst_path, class_name=_class_name,
                                method_name=_method_name)
                 try:
                     model_param, model_value = self._alias_helper.get_model_attribute_name_and_value(location,
@@ -112,8 +112,14 @@ def _get_attributes_for_current_location(self, location):
         :param location: context with the current location information
         :return: list of attributes
         """
-        _method_name = '_get_attributes_for_current_location'
-        attributes = None
+        if self._wlst_mode == WlstModes.OFFLINE:
+            return self._get_attributes_for_current_location_offline(location)
+        else:
+            return self._get_attributes_for_current_location_online(location)
+
+    def _get_attributes_for_current_location_offline(self, location):
+        _method_name = '_get_attributes_for_current_location_offline'
+        attributes = []
         path = self._alias_helper.get_wlst_attributes_path(location)
         try:
             attributes = wlst_helper.lsa(path)
@@ -123,31 +129,36 @@ def _get_attributes_for_current_location(self, location):
                          method_name=_method_name)
         return attributes
 
-    def _get_required_attributes(self, location):
-        if self._wlst_mode == WlstModes.OFFLINE:
-            return self._get_required_attributes_offline(location)
-        else:
-            return self._get_required_attributes_online(location)
-
-    def _get_required_attributes_offline(self, location):
-        return self._alias_helper.get_wlst_get_required_attribute_names(location)
+    def _get_attributes_for_current_location_online(self, location):
+        _method_name = '_get_attributes_for_current_location_online'
+        attributes = []
+        path = self._alias_helper.get_wlst_attributes_path(location)
+        try:
+            attributes = wlst_helper.lsa(path)
+            mbean_attributes = wlst_helper.get_mbi().getAttributes()
+            for mbean_attribute in mbean_attributes:
+                name = mbean_attribute.getName()
+                if name not in attributes:
+                    attributes[name] = wlst_helper.get(name)
+        except PyWLSTException, pe:
+            name = location.get_model_folders()[-1]
+            _logger.fine('WLSDPLY-06109', name, str(location), pe.getLocalizedMessage(), class_name=_class_name,
+                         method_name=_method_name)
+        return attributes
 
-    def _get_required_attributes_online(self, location):
+    def _get_required_attributes(self, location):
         """
         Use get for all online attributes, and use the attribute names in the
         :param location:
         :return:
         """
-        _method_name = '_get_required_attributes_online'
+        _method_name = '_get_required_attributes'
         attributes = []
         try:
-            mbi = wlst_helper.get_mbi()
-            mbean_attribute_info = mbi.getAttributes()
-            for mbean_attribute in mbean_attribute_info:
-                attributes.append(mbean_attribute.getName())
-        except PyWLSTException, pe:
+            attributes = self._alias_helper.get_wlst_get_required_attribute_names(location)
+        except DiscoverException, de:
             name = location.get_model_folders()[-1]
-            _logger.warning('WLSDPLY-06109', name, str(location), pe.getLocalizedMessage(), class_name=_class_name,
+            _logger.warning('WLSDPLY-06109', name, str(location), de.getLocalizedMessage(), class_name=_class_name,
                             method_name=_method_name)
         return attributes
 
@@ -176,7 +187,10 @@ def _check_attribute(self, model_name, model_value, location):
         :param location: context containing current location information
         :return: new value if modified by the handler or the original value if not a special attribute
         """
-        new_value = model_value
+        if model_value == 'null ':
+            new_value = None
+        else:
+            new_value = model_value
         if model_name in self._att_handler_map:
             type_method = self._att_handler_map[model_name]
             if type_method is not None:

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

@@ -21,7 +21,7 @@ class MultiTenantResourcesDiscoverer(Discoverer):
     """
 
     def __init__(self, model_context, resources_dictionary, base_location, wlst_mode=WlstModes.OFFLINE, aliases=None):
-        Discoverer.__init__(self, model_context, wlst_mode, base_location)
+        Discoverer.__init__(self, model_context, base_location, wlst_mode, aliases)
         self._dictionary = resources_dictionary
 
     def discover(self):

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

@@ -229,14 +229,16 @@ def lsa(path=None, log_throwing=True):
     """
     _method_name = 'lsa'
     result = _ls(_method_name, 'a', path, log_throwing)
-    if wlst.WLS_ON.isConnected() and result is not None and type(result) is dict:
-        for key, value in result.iteritems():
-            if value is not None and type(value) is str:
-                new_value = value.rstrip()
-                if new_value == 'null':
-                    result[key] = None
-                else:
-                    result[key] = new_value
+    if result:
+        if wlst.WLS_ON.isConnected():
+            for key, value in result.iteritems():
+                if value is not None and type(value) is str:
+                    new_value = value.rstrip()
+                    _logger.info('what type is it {0}', new_value)
+                    if new_value == 'null':
+                        result[key] = None
+                    else:
+                        result[key] = new_value
     return result
 
 def lsc(path=None, log_throwing=True):

core/src/main/resources/oracle/weblogic/deploy/aliases/category_modules/SelfTuning.json

@@ -14,7 +14,7 @@
                 "DeploymentOrder": [ {"version": "[10,)", "wlst_mode": "both",    "wlst_name": "DeploymentOrder", "wlst_path": "WP001", "value": {"default": 1000  }, "wlst_type": "integer"          } ],
                 "Notes":           [ {"version": "[10,)", "wlst_mode": "both",    "wlst_name": "Notes",           "wlst_path": "WP001", "value": {"default": "None"}, "wlst_type": "string"           } ],
                 "Target":          [ {"version": "[10,)", "wlst_mode": "offline", "wlst_name": "Target",          "wlst_path": "WP001", "value": {"default": "None"}, "wlst_type": "delimited_string" },
-                                     {"version": "[10,)", "wlst_mode": "online",  "wlst_name": "Targets",         "wlst_path": "WP002", "value": {"default": "None"}, "wlst_type": "jarray",          "preferred_model_type": "delimited_string", "set_method": "MBEAN.set_target_mbeans", "set_mbean_type": "weblogic.management.configuration.TargetMBean"} ]
+                                     {"version": "[10,)", "wlst_mode": "online",  "wlst_name": "Targets",         "wlst_path": "WP002", "value": {"default": "None"}, "wlst_type": "jarray",          "set_method": "MBEAN.set_target_mbeans", "set_mbean_type": "weblogic.management.configuration.TargetMBean"} ]
             },
             "wlst_attributes_path": "WP001",
             "wlst_paths": {