Merge pull request #49 from oracle/Issue#46-Validate-discovered-domain

validate discovered mode

Author: ddsharpe

core/src/main/python/discover.py

@@ -22,6 +22,7 @@
 from oracle.weblogic.deploy.util import WebLogicDeployToolingVersion
 from oracle.weblogic.deploy.util import WLSDeployArchive
 from oracle.weblogic.deploy.util import WLSDeployArchiveIOException
+from oracle.weblogic.deploy.validate import ValidateException
 
 sys.path.append(os.path.dirname(os.path.realpath(sys.argv[0])))
 
@@ -35,6 +36,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.validate.validator import Validator
 from wlsdeploy.tool.util import filter_helper
 from wlsdeploy.util import wlst_helper
 from wlsdeploy.util import model_translator
@@ -354,14 +356,27 @@ def __persist_model(model, model_context):
     return
 
 
-def __check_and_customize_model(model):
+def __check_and_customize_model(model, model_context):
+    """
+    Customize the model dictionary before persisting. Validate the model after customization for informational
+    purposes. Any validation errors will not stop the discovered model to be persisted.
+    :param model: completely discovered 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)
+
+    try:
+        validator = Validator(model_context, wlst_mode=__wlst_mode)
+
+        # no variables are generated by the discover tool
+        return_code = validator.validate_in_tool_mode(model.get_model(), variables_file_name=None,
+                                                      archive_file_name=model_context.get_archive_file_name())
+    except ValidateException, ex:
+        __logger.warning('WLSDPLY-06015', ex.getLocalizedMessage(), class_name=_class_name, method_name=_method_name)
 
 
 def __log_and_exit(exit_code, _class_name, _method_name):
@@ -415,7 +430,7 @@ 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)
+    __check_and_customize_model(model, model_context)
 
     try:
         __persist_model(model, model_context)

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

@@ -406,6 +406,7 @@ 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
+WLSDPLY-06015=Unable to run validation against the discovered model :  {0}
 
 
 # discoverer.py