remove unused python file

Author: CarolynRountree

core/src/main/python/discover.py

@@ -12,31 +12,32 @@
 from java.lang import IllegalArgumentException
 from java.lang import IllegalStateException
 from java.lang import String
-
 from oracle.weblogic.deploy.aliases import AliasException
 from oracle.weblogic.deploy.discover import DiscoverException
 from oracle.weblogic.deploy.util import CLAException
 from oracle.weblogic.deploy.util import FileUtils
 from oracle.weblogic.deploy.util import PyWLSTException
 from oracle.weblogic.deploy.util import TranslateException
-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.util import WebLogicDeployToolingVersion
+from oracle.weblogic.deploy.validate import ValidateException
 
 sys.path.append(os.path.dirname(os.path.realpath(sys.argv[0])))
 
 from wlsdeploy.aliases.wlst_modes import WlstModes
 from wlsdeploy.exception import exception_helper
 from wlsdeploy.logging.platform_logger import PlatformLogger
 from wlsdeploy.util import getcreds
-from wlsdeploy.tool.util.variable_injector import VariableInjector
 from wlsdeploy.tool.discover import discoverer
 from wlsdeploy.tool.discover.deployments_discoverer import DeploymentsDiscoverer
 from wlsdeploy.tool.discover.domain_info_discoverer import DomainInfoDiscoverer
 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.tool.util.variable_injector import VariableInjector
+from wlsdeploy.tool.validate.validator import Validator
 from wlsdeploy.util import wlst_helper
 from wlsdeploy.util import model_translator
 from wlsdeploy.util.cla_utils import CommandLineArgUtil
@@ -373,25 +374,25 @@ def __check_and_customize_model(model, model_context):
         inject_variables_keyword_file()
     if inserted:
         model = Model(variable_model)
-    # try:
-    #     validator = Validator(model_context, wlst_mode=__wlst_mode)
-    #
-    #     # no variables are generated by the discover tool
-    #     validator.validate_in_tool_mode(model.get_model(), variables_file_name=variable_file_name,
-    #                                     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)
+    try:
+        validator = Validator(model_context, wlst_mode=__wlst_mode)
+
+        # no variables are generated by the discover tool
+        validator.validate_in_tool_mode(model.get_model(), variables_file_name=variable_file_name,
+                                        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)
     return model
 
 
-def __log_and_exit(exit_code, _class_name, _method_name):
+def __log_and_exit(exit_code, class_name, _method_name):
     """
     Helper method to log the exiting message and call sys.exit()
     :param exit_code: the exit code to use
-    :param _class_name: the class name to pass  to the logger
+    :param class_name: the class name to pass  to the logger
     :param _method_name: the method name to pass to the logger
     """
-    __logger.exiting(result=exit_code, class_name=_class_name, method_name=_method_name)
+    __logger.exiting(result=exit_code, class_name=class_name, method_name=_method_name)
     sys.exit(exit_code)
 
 
@@ -444,7 +445,7 @@ def main(args):
 
     except TranslateException, ex:
         __logger.severe('WLSDPLY-20024', _program_name, model_context.get_archive_file_name(), ex.getLocalizedMessage(),
-                error=ex, class_name=_class_name, method_name=_method_name)
+                        error=ex, class_name=_class_name, method_name=_method_name)
         __log_and_exit(CommandLineArgUtil.PROG_ERROR_EXIT_CODE, _class_name, _method_name)
 
     __close_archive(model_context)

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

@@ -3,5 +3,6 @@
   "PORT": "port.json",
   "HOST": "host.json",
   "URL": "url.json",
+  "TARGET": "target.json",
   "TOPOLOGY": "topology.json"
 }