Merge pull request #33 from oracle/Issue#31-Add-filter-to-discover

Issue#31 Add filter feature to discover tool

Author: ddsharpe

core/src/main/python/discover.py

@@ -35,6 +35,7 @@
 from wlsdeploy.tool.discover.multi_tenant_discoverer import MultiTenantDiscoverer
 from wlsdeploy.tool.discover.resources_discoverer import ResourcesDiscoverer
 from wlsdeploy.tool.discover.topology_discoverer import TopologyDiscoverer
+from wlsdeploy.tool.util import filter_helper
 from wlsdeploy.util import wlst_helper
 from wlsdeploy.util import model_translator
 from wlsdeploy.util.cla_utils import CommandLineArgUtil
@@ -353,6 +354,16 @@ def __persist_model(model, model_context):
     return
 
 
+def __check_and_customize_model(model):
+    _method_name = '__check_and_customize_model'
+    __logger.entering(class_name=_class_name, method_name=_method_name)
+
+    if filter_helper.apply_filters(model.get_model(), "discover"):
+        __logger.info('WLSDPLY-06014', _class_name=_class_name, method_name=_method_name)
+
+    __logger.exiting(class_name=_class_name, method_name=_method_name)
+
+
 def __log_and_exit(exit_code, _class_name, _method_name):
     """
     Helper method to log the exiting message and call sys.exit()
@@ -404,6 +415,8 @@ def main():
                         error=ex, class_name=_class_name, method_name=_method_name)
         __log_and_exit(CommandLineArgUtil.PROG_ERROR_EXIT_CODE, _class_name, _method_name)
 
+    __check_and_customize_model(model)
+
     try:
         __persist_model(model, model_context)
     except TranslateException, ex:

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

@@ -405,6 +405,7 @@ WLSDPLY-06010={0} failed to clear the existing archive file at {1} of binaries:
 WLSDPLY-06011={0} failed to discover domain {1} at {2} : {3}
 WLSDPLY-06012={0} failed to persist the model to the archive file {1}: {2}
 WLSDPLY-06013={0} failed to create the archive file at {1}: {2}
+WLSDPLY-06014=Filters applied to the model
 
 
 # discoverer.py