Wdt refactor domain mbeans (#646)

* Fix java.lang.Boolean issues for ActiveDirectoryAuthenticator

* refactor the code to a more generic format for domain mbeans

Author: CarolynRountree

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

@@ -79,6 +79,8 @@ def discover_domain_mbean(self, model_top_folder_name):
             _logger.info('WLSDPLY-06644', model_top_folder_name, class_name=_class_name, method_name=_method_name)
             location.add_name_token(self._alias_helper.get_name_token(location), name)
             self._populate_model_parameters(result, location)
+            # if any subfolders exist, discover
+            self._discover_subfolders(result, location)
         _logger.exiting(class_name=_class_name, method_name=_method_name)
         return model_top_folder_name, result
 

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

@@ -89,6 +89,18 @@ def discover(self):
         model_top_folder_name, embedded_ldap_configuration = self.get_embedded_ldap_configuration()
         discoverer.add_to_model_if_not_empty(self._dictionary, model_top_folder_name, embedded_ldap_configuration)
 
+        model_folder_name, folder_result = self._get_log_filters()
+        discoverer.add_to_model_if_not_empty(self._dictionary, model_folder_name, folder_result)
+
+        model_folder_name, folder_result = self._get_reliable_delivery_policies()
+        discoverer.add_to_model_if_not_empty(self._dictionary, model_folder_name, folder_result)
+
+        model_folder_name, folder_result = self._get_xml_entity_caches()
+        discoverer.add_to_model_if_not_empty(self._dictionary, model_folder_name, folder_result)
+
+        model_folder_name, folder_result = self._get_xml_registries()
+        discoverer.add_to_model_if_not_empty(self._dictionary, model_folder_name, folder_result)
+
         _logger.exiting(class_name=_class_name, method_name=_method_name)
         return self._dictionary
 
@@ -269,29 +281,21 @@ def discover_domain_parameters(self):
 
         self._populate_model_parameters(self._dictionary, location)
 
-        model_folder_name, folder_result = self._get_admin_console()
-        discoverer.add_to_model_if_not_empty(self._dictionary, model_folder_name, folder_result)
-        model_folder_name, folder_result = self._get_cdi_container()
+        model_folder_name, folder_result = self.discover_domain_mbean(model_constants.ADMIN_CONSOLE)
         discoverer.add_to_model_if_not_empty(self._dictionary, model_folder_name, folder_result)
-        model_folder_name, folder_result = self._get_jta()
+        model_folder_name, folder_result = self.discover_domain_mbean(model_constants.CDI_CONTAINER)
         discoverer.add_to_model_if_not_empty(self._dictionary, model_folder_name, folder_result)
-        model_folder_name, folder_result = self._get_jmx()
+        model_folder_name, folder_result = self.discover_domain_mbean(model_constants.JMX)
         discoverer.add_to_model_if_not_empty(self._dictionary, model_folder_name, folder_result)
-        model_folder_name, folder_result = self._get_restful_management_services()
-        discoverer.add_to_model_if_not_empty(self._dictionary, model_folder_name, folder_result)
-        model_folder_name, folder_result = self._get_log_filters()
-        discoverer.add_to_model_if_not_empty(self._dictionary, model_folder_name, folder_result)
-        model_folder_name, folder_result = self._get_reliable_delivery_policies()
-        discoverer.add_to_model_if_not_empty(self._dictionary, model_folder_name, folder_result)
-        model_folder_name, folder_result = self._get_xml_entity_caches()
+        model_folder_name, folder_result = self.discover_domain_mbean(model_constants.JPA)
         discoverer.add_to_model_if_not_empty(self._dictionary, model_folder_name, folder_result)
-        model_folder_name, folder_result = self._get_xml_registries()
+        model_folder_name, folder_result = self.discover_domain_mbean(model_constants.JTA)
         discoverer.add_to_model_if_not_empty(self._dictionary, model_folder_name, folder_result)
-        model_folder_name, folder_result = self._get_domain_log()
+        model_folder_name, folder_result = self.discover_domain_mbean(model_constants.LOG)
         discoverer.add_to_model_if_not_empty(self._dictionary, model_folder_name, folder_result)
         model_folder_name, folder_result = self._get_nm_properties()
         discoverer.add_to_model_if_not_empty(self._dictionary, model_folder_name, folder_result)
-        model_folder_name, folder_result = self.discover_domain_mbean(model_constants.JPA)
+        model_folder_name, folder_result = self.discover_domain_mbean(model_constants.RESTFUL_MANAGEMENT_SERVICES)
         discoverer.add_to_model_if_not_empty(self._dictionary, model_folder_name, folder_result)
 
         _logger.exiting(class_name=_class_name, method_name=_method_name)
@@ -351,102 +355,23 @@ def get_embedded_ldap_configuration(self):
 
     # Private methods
 
-    def _get_admin_console(self):
-        """
-        Discover the domain level admin console configuration attributes.
-        :return: model name for JTA:dictionary containing the discovered JTA attributes
-        """
-        _method_name = '_get_admin_console'
-        _logger.entering(class_name=_class_name, method_name=_method_name)
-        model_top_folder_name = model_constants.ADMIN_CONSOLE
-        result = OrderedDict()
-        location = LocationContext(self._base_location)
-        location.append_location(model_top_folder_name)
-        name = self._find_singleton_name_in_folder(location)
-        if name is not None:
-            _logger.info('WLSDPLY-06613', class_name=_class_name, method_name=_method_name)
-            location.add_name_token(self._alias_helper.get_name_token(location), name)
-            self._populate_model_parameters(result, location)
-        _logger.exiting(class_name=_class_name, method_name=_method_name)
-        return model_top_folder_name, result
-
-    def _get_cdi_container(self):
-        """
-        Discover the domain level CdiContainer configuration attributes.
-        :return: model name for CdiContainer: dictionary containing the discovered CdiContainer attributes
-        """
-        _method_name = '_get_cdi_container'
-        _logger.entering(class_name=_class_name, method_name=_method_name)
-        model_top_folder_name = model_constants.CDI_CONTAINER
-        result = OrderedDict()
-        location = LocationContext(self._base_location)
-        location.append_location(model_top_folder_name)
-        name = self._find_singleton_name_in_folder(location)
-        if name is not None:
-            _logger.info('WLSDPLY-06643', class_name=_class_name, method_name=_method_name)
-            location.add_name_token(self._alias_helper.get_name_token(location), name)
-            self._populate_model_parameters(result, location)
-        _logger.exiting(class_name=_class_name, method_name=_method_name)
-        return model_top_folder_name, result
-
-    def _get_jta(self):
-        """
-        Discover the domain level JTA configuration attributes.
-        :return: model name for JTA:dictionary containing the discovered JTA attributes
-        """
-        _method_name = '_get_jta'
-        _logger.entering(class_name=_class_name, method_name=_method_name)
-        model_top_folder_name = model_constants.JTA
-        result = OrderedDict()
-        location = LocationContext(self._base_location)
-        location.append_location(model_top_folder_name)
-        name = self._find_singleton_name_in_folder(location)
-        if name is not None:
-            _logger.info('WLSDPLY-06614', class_name=_class_name, method_name=_method_name)
-            location.add_name_token(self._alias_helper.get_name_token(location), name)
-            self._populate_model_parameters(result, location)
-        _logger.exiting(class_name=_class_name, method_name=_method_name)
-        return model_top_folder_name, result
-
-    def _get_jmx(self):
+    def _get_nm_properties(self):
         """
-        Discover the JMX agents configured in the domain.
-        :return: model name for JMX:dictionary containing the discovered JMX attributes
+        Discover the NMProperties attributes.
+        :return: model name for the Log:dictionary containing the discovered NMProperties attributes
         """
-        _method_name = '_get_jmx'
+        _method_name = '_get_nm_properties'
         _logger.entering(class_name=_class_name, method_name=_method_name)
-        model_top_folder_name = model_constants.JMX
+        model_top_folder_name = model_constants.NM_PROPERTIES
         result = OrderedDict()
         location = LocationContext(self._base_location)
-        location.append_location(model_top_folder_name)
-        name = self._find_singleton_name_in_folder(location)
-        if name is not None:
-            _logger.info('WLSDPLY-06615', class_name=_class_name, method_name=_method_name)
-            location.add_name_token(self._alias_helper.get_name_token(location), name)
+        if self._topfolder_exists(model_top_folder_name):
+            _logger.info('WLSDPLY-06627', class_name=_class_name, method_name=_method_name)
+            location.append_location(model_top_folder_name)
             self._populate_model_parameters(result, location)
         _logger.exiting(class_name=_class_name, method_name=_method_name)
         return model_top_folder_name, result
 
-    def _get_domain_log(self):
-        """
-        Discover the domain log attributes.
-        :return: model name for the Log:dictionary containing the discovered Log attributes
-        """
-        _method_name = '_get_domain_log'
-        _logger.entering(class_name=_class_name, method_name=_method_name)
-        model_top_folder_name = model_constants.LOG
-        result = OrderedDict()
-        location = LocationContext(self._base_location)
-        location.append_location(model_top_folder_name)
-        name = self._find_singleton_name_in_folder(location)
-        if name is not None:
-            _logger.info('WLSDPLY-06626', class_name=_class_name, method_name=_method_name)
-            location.add_name_token(self._alias_helper.get_name_token(location), name)
-            self._populate_model_parameters(result, location)
-            self._discover_subfolders(result, location)
-
-        return model_top_folder_name, result
-
     def _get_log_filters(self):
         """
         Discover the log filters that are used in the different types of Logs in the domain.
@@ -547,42 +472,6 @@ def _get_xml_registries(self):
         _logger.exiting(class_name=_class_name, method_name=_method_name, result=model_top_folder_name)
         return model_top_folder_name, result
 
-    def _get_nm_properties(self):
-        """
-        Discover the NMProperties attributes.
-        :return: model name for the Log:dictionary containing the discovered NMProperties attributes
-        """
-        _method_name = '_get_nm_properties'
-        _logger.entering(class_name=_class_name, method_name=_method_name)
-        model_top_folder_name = model_constants.NM_PROPERTIES
-        result = OrderedDict()
-        location = LocationContext(self._base_location)
-        if self._topfolder_exists(model_top_folder_name):
-            _logger.info('WLSDPLY-06627', class_name=_class_name, method_name=_method_name)
-            location.append_location(model_top_folder_name)
-            self._populate_model_parameters(result, location)
-        _logger.exiting(class_name=_class_name, method_name=_method_name)
-        return model_top_folder_name, result
-
-    def _get_restful_management_services(self):
-        """
-        Discover the wlst restful management services enablement for the domain.
-        :return: model name for the mbean:dictionary containing the discovered restful management services mbean
-        """
-        _method_name = '_get_restful_management_services'
-        _logger.entering(class_name=_class_name, method_name=_method_name)
-        model_top_folder_name = model_constants.RESTFUL_MANAGEMENT_SERVICES
-        result = OrderedDict()
-        location = LocationContext(self._base_location)
-        location.append_location(model_top_folder_name)
-        name = self._find_singleton_name_in_folder(location)
-        if name is not None:
-            _logger.info('WLSDPLY-06616', class_name=_class_name, method_name=_method_name)
-            location.add_name_token(self._alias_helper.get_name_token(location), name)
-            self._populate_model_parameters(result, location)
-        _logger.exiting(class_name=_class_name, method_name=_method_name)
-        return model_top_folder_name, result
-
     def _has_machines_folder(self, base_folder):
         """
         This is a private method.

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

@@ -695,10 +695,10 @@ WLSDPLY-06609=Discovering {0} Unix machines
 WLSDPLY-06610=Adding Unix Machine {0}
 WLSDPLY-06611=Discovering {0} machines
 WLSDPLY-06612=Adding Machine {0}
-WLSDPLY-06613=Adding Domain AdminConsole
-WLSDPLY-06614=Adding Domain JTA
-WLSDPLY-06615=Adding Domain JMX
-WLSDPLY-06616=Adding Domain RestfulManagementServices
+
+
+
+
 WLSDPLY-06617=Adding Server {0} Classpath {1}
 WLSDPLY-06618=Remove Classpath entry {0} for server {1}. This entry references an oracle home location
 WLSDPLY-06619=Add Classpath file or directory {0} for Server {1} to the archive file
@@ -708,7 +708,7 @@ WLSDPLY-06622=Adding Security Configuration
 WLSDPLY-06623=Adding keystore file {0} for server {1} to archive file
 WLSDPLY-06624=Unable to locate and add Server {0} keystore file {1} to the archive file : {2}
 WLSDPLY-06625=Unexpected exception attempting to add Server {0} keystore file {1} to the archive : {2}
-WLSDPLY-06626=Discovering Domain Log
+
 WLSDPLY-06627=Discovering NM Properties
 WLSDPLY-06628=Discovering {0} Log Filters
 WLSDPLY-06629=Adding Log Filter {0}
@@ -727,7 +727,7 @@ WLSDPLY-06641=Custom Keystore file name at location {0} is {1}
 WLSDPLY-06642=Custom Keystore file {0} at location {1} is a kss type which is not currently supported. \
   The Custom Keystore file will not be added to the archive file. Use export / import to \
   add the file to the target domain
-WLSDPLY-06643=Adding Domain CdiContainer
+
 WLSDPLY-06644=Adding Domain {0}