Merge branch 'master' into Issue#96-online-discover-domain

Author: CarolynRountree

README.md

@@ -12,23 +12,24 @@
 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 import model_constants
 from wlsdeploy.aliases.aliases import Aliases
 from wlsdeploy.aliases.location_context import LocationContext
+import wlsdeploy.tool.util.variable_injector as variable_injector
+
 from wlsdeploy.aliases.wlst_modes import WlstModes
 from wlsdeploy.exception import exception_helper
 from wlsdeploy.logging.platform_logger import PlatformLogger
@@ -39,8 +40,9 @@
 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.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
@@ -61,8 +63,9 @@
 
 __optional_arguments = [
     # Used by shell script to locate WLST
-    CommandLineArgUtil.DOMAIN_TYPE_SWITCH,
     CommandLineArgUtil.MODEL_FILE_SWITCH,
+    CommandLineArgUtil.DOMAIN_TYPE_SWITCH,
+    CommandLineArgUtil.VARIABLE_PROPERTIES_FILE_SWITCH,
     CommandLineArgUtil.ADMIN_URL_SWITCH,
     CommandLineArgUtil.ADMIN_USER_SWITCH,
     CommandLineArgUtil.ADMIN_PASS_SWITCH
@@ -83,6 +86,7 @@ def __process_args(args):
     __verify_required_args_present(required_arg_map)
     __wlst_mode = __process_online_args(optional_arg_map)
     __process_archive_filename_arg(required_arg_map)
+    __process_variable_filename_arg(optional_arg_map)
 
     combined_arg_map = optional_arg_map.copy()
     combined_arg_map.update(required_arg_map)
@@ -162,6 +166,28 @@ def __process_archive_filename_arg(required_arg_map):
     return
 
 
+def __process_variable_filename_arg(optional_arg_map):
+    """
+    If the variable filename argument is present, the required model variable injector json file must exist in
+    the WLSDEPLOY lib directory.
+    :param optional_arg_map: containing the variable file name
+    :raises: CLAException: if this argument is present but the model variable injector json does not exist
+    """
+    _method_name = '__process_variable_filename_arg'
+
+    if CommandLineArgUtil.VARIABLE_PROPERTIES_FILE_SWITCH in optional_arg_map:
+        variable_injector_file_name = variable_injector.get_default_variable_injector_file_name()
+        try:
+            FileUtils.validateExistingFile(variable_injector_file_name)
+        except IllegalArgumentException, ie:
+            ex = exception_helper.create_cla_exception('WLSDPLY-06021', optional_arg_map[
+                CommandLineArgUtil.VARIABLE_PROPERTIES_FILE_SWITCH], variable_injector_file_name,
+                                                       ie.getLocalizedMessage(), error=ie)
+            __logger.throwing(ex, class_name=_class_name, method_name=_method_name)
+            raise ex
+    return
+
+
 def __discover(model_context, aliases):
     """
     Populate the model from the domain.
@@ -210,7 +236,7 @@ def _add_domain_name(location, aliases):
         location.add_name_token(aliases.get_name_token(location), domain_name)
         __logger.info('WLSDPLY-06022', domain_name, class_name=_class_name, method_name=_method_name)
     else:
-        de = exception_helper.create_discover_exception('WLSDPLY-WLSDPLY-06021')
+        de = exception_helper.create_discover_exception('WLSDPLY-WLSDPLY-06023')
         __logger.throwing(class_name=_class_name, method_name=_method_name, error=de)
         raise de
 
@@ -370,7 +396,7 @@ def __persist_model(model, model_context):
             if not model_file.delete():
                 model_file.deleteOnExit()
         except (WLSDeployArchiveIOException, IllegalArgumentException), arch_ex:
-            ex = exception_helper.create_discover_exception('WLSDPLY-06009', model_file.getAbsolutePath(),
+            ex = exception_helper.create_discover_exception('WLSDPLY-20023', model_file.getAbsolutePath(),
                                                             model_file_name, arch_ex.getLocalizedMessage(),
                                                             error=arch_ex)
             __logger.throwing(ex, class_name=_class_name, method_name=_method_name)
@@ -394,14 +420,21 @@ def __check_and_customize_model(model, model_context, aliases):
     if filter_helper.apply_filters(model.get_model(), "discover"):
         __logger.info('WLSDPLY-06014', _class_name=_class_name, method_name=_method_name)
 
+    inserted, variable_model, variable_file_name = VariableInjector(_program_name, model.get_model(), model_context,
+                                                                    WebLogicHelper(
+                                                                        __logger).get_actual_weblogic_version()).\
+        inject_variables_keyword_file()
+    if inserted:
+        model = Model(variable_model)
     try:
         validator = Validator(model_context, wlst_mode=__wlst_mode, aliases=aliases)
 
         # no variables are generated by the discover tool
-        validator.validate_in_tool_mode(model.get_model(), variables_file_name=None,
+        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):
@@ -412,6 +445,7 @@ def __log_and_exit(exit_code, class_name, method_name):
     :param method_name: the method name to pass to the logger
     """
     __logger.exiting(result=exit_code, class_name=class_name, method_name=method_name)
+
     sys.exit(exit_code)
 
 
@@ -458,13 +492,14 @@ def main(args):
                         model_context.get_domain_home(), ex.getLocalizedMessage(),
                         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, model_context, aliases)
-
+        
+    model = __check_and_customize_model(model, model_context)
+    
     try:
         __persist_model(model, model_context)
+
     except TranslateException, ex:
-        __logger.severe('WLSDPLY-06012', _program_name, model_context.get_archive_file_name(), ex.getLocalizedMessage(),
+        __logger.severe('WLSDPLY-20024', _program_name, model_context.get_archive_file_name(), ex.getLocalizedMessage(),
                         error=ex, class_name=_class_name, method_name=_method_name)
         __log_and_exit(CommandLineArgUtil.PROG_ERROR_EXIT_CODE, _class_name, _method_name)
 

core/src/main/python/discover.py

@@ -190,7 +190,7 @@ def __encrypt_model_and_variables(model_context):
 
     if variable_change_count > 0:
         try:
-            variable_helper.write_variables(variables, variable_file)
+            variable_helper.write_variables(_program_name, variables, variable_file)
             __logger.info('WLSDPLY-04209', _program_name, variable_change_count, variable_file,
                           class_name=_class_name, method_name=_method_name)
         except VariableException, ve: