Merge pull request #94 from oracle/Issue#93-Add-functionality-to-discover-NMProperties

Added _get_nm_properties() and a resource message

Author: ddsharpe

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

@@ -265,12 +265,15 @@ def discover_domain_parameters(self):
         discoverer.add_to_model_if_not_empty(self._dictionary, model_folder_name, folder_result)
         model_folder_name, folder_result = self._get_domain_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)
+
         _logger.exiting(class_name=_class_name, method_name=_method_name)
 
     def discover_security_configuration(self):
         """
         Discover the security configuration for the domain.
-        :return: name for the model:dictionary continaing the discovered security configuration
+        :return: name for the model:dictionary containing the discovered security configuration
         """
         _method_name = 'discover_security_configuration'
         _logger.entering(class_name=_class_name, method_name=_method_name)
@@ -344,6 +347,23 @@ def _get_domain_log(self):
 
         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._subfolder_exists(model_top_folder_name, location):
+            _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.

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

@@ -578,6 +578,7 @@ 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
 
 # multi_tenant_discoverer.py, multi_tenant_resources_dsi
 WLSDPLY-06700=Discover Multi-tenant