Merge pull request #184 from oracle/issue#181-directory-name-can-be-different

Issue#181 directory name can be different

Author: rakillen

core/src/main/python/create.py

@@ -53,12 +53,13 @@
 
 __required_arguments = [
     CommandLineArgUtil.ORACLE_HOME_SWITCH,
-    CommandLineArgUtil.DOMAIN_PARENT_SWITCH,
     CommandLineArgUtil.DOMAIN_TYPE_SWITCH
 ]
 
 __optional_arguments = [
     CommandLineArgUtil.ARCHIVE_FILE_SWITCH,
+    CommandLineArgUtil.DOMAIN_HOME_SWITCH,
+    CommandLineArgUtil.DOMAIN_PARENT_SWITCH,
     CommandLineArgUtil.JAVA_HOME_SWITCH,
     CommandLineArgUtil.MODEL_FILE_SWITCH,
     CommandLineArgUtil.RUN_RCU_SWITCH,
@@ -79,10 +80,11 @@ def __process_args(args):
     :raises CLAException: if an error occurs while validating and processing the command-line arguments
     """
     cla_util = CommandLineArgUtil(_program_name, __required_arguments, __optional_arguments)
-    required_arg_map, optional_arg_map = cla_util.process_args(args)
+    required_arg_map, optional_arg_map = cla_util.process_args(args, True)
 
     __verify_required_args_present(required_arg_map)
     __process_java_home_arg(optional_arg_map)
+    __process_domain_location_args(optional_arg_map)
     __process_model_args(optional_arg_map)
 
     #
@@ -141,6 +143,29 @@ def __process_java_home_arg(optional_arg_map):
     return
 
 
+def __process_domain_location_args(optional_arg_map):
+    """
+    Verify that either the domain_home or domain_parent was specified, and not both.
+    Their values were already checked in the process_args call.
+    :param optional_arg_map: the optional arguments map
+    :raises CLAException: if the arguments are invalid or an error occurs extracting the model from the archive
+    """
+    _method_name = '__process_domain_location_args'
+    global __tmp_model_dir
+
+    has_home = CommandLineArgUtil.DOMAIN_HOME_SWITCH in optional_arg_map
+    has_parent = CommandLineArgUtil.DOMAIN_PARENT_SWITCH in optional_arg_map
+
+    if (has_home and has_parent) or (not has_home and not has_parent):
+        ex = exception_helper.create_cla_exception('WLSDPLY-20025', _program_name,
+                                                   CommandLineArgUtil.DOMAIN_PARENT_SWITCH,
+                                                   CommandLineArgUtil.DOMAIN_HOME_SWITCH)
+        ex.setExitCode(CommandLineArgUtil.USAGE_ERROR_EXIT_CODE)
+        __logger.throwing(ex, class_name=_class_name, method_name=_method_name)
+        raise ex
+    return
+
+
 def __process_model_args(optional_arg_map):
     """
     Verify that either the model_file or archive_file was provided and exists.

core/src/main/python/wlsdeploy/tool/create/domain_creator.py

@@ -91,7 +91,13 @@ def __init__(self, model_dictionary, model_context, aliases):
             self._domain_name = self._topology[DOMAIN_NAME]
         else:
             self._domain_name = DEFAULT_WLS_DOMAIN_NAME
-        self._domain_home = os.path.join(self.model_context.get_domain_parent_dir(), self._domain_name)
+
+        # if domain home specified on command line, set it here, otherwise append domain name to domain parent
+        model_domain_home = self.model_context.get_domain_home()
+        if model_domain_home:
+            self._domain_home = model_domain_home
+        else:
+            self._domain_home = os.path.join(self.model_context.get_domain_parent_dir(), self._domain_name)
 
         if ADMIN_SERVER_NAME in self._topology:
             self._admin_server_name = self._topology[ADMIN_SERVER_NAME]
@@ -712,7 +718,11 @@ def __set_app_dir(self):
             self.logger.fine('WLSDPLY-12225', model_helper.get_model_domain_info_key(), APP_DIR, app_dir,
                              class_name=self.__class_name, method_name=_method_name)
         else:
-            app_dir = os.path.join(self.model_context.get_domain_parent_dir(), 'applications')
+            app_parent = self.model_context.get_domain_parent_dir()
+            if not app_parent:
+                app_parent = os.path.dirname(self.model_context.get_domain_home())
+
+            app_dir = os.path.join(app_parent, 'applications')
             self.logger.fine('WLSDPLY-12226', model_helper.get_model_domain_info_key(), APP_DIR, app_dir,
                              class_name=self.__class_name, method_name=_method_name)
 
@@ -730,6 +740,9 @@ def __set_domain_name(self):
         if self.__default_domain_name is None or len(self.__default_domain_name) == 0:
             self.__default_domain_name = DEFAULT_WLS_DOMAIN_NAME
 
+        # set this option, in case domain name is different from domain directory name
+        self.wlst_helper.set_option_if_needed('DomainName', self._domain_name)
+
         if self._domain_name != self.__default_domain_name:
             #
             # We cannot use the aliases for the Server Name attribute since we

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

@@ -4,6 +4,7 @@
 
 Module that handles command-line argument parsing and common validation.
 """
+import os
 import java.io.File as JFile
 import java.lang.IllegalArgumentException as JIllegalArgumentException
 import java.net.URI as JURI
@@ -94,11 +95,12 @@ def __init__(self, program_name, required_args, optional_args):
         self._optional_result = {}
         return
 
-    def process_args(self, args):
+    def process_args(self, args, for_domain_create=False):
         """
         This method parses the command-line arguments and returns dictionaries of the required and optional args.
 
         :param args: sys.argv
+        :param for_domain_create: true if validating for domain creation
         :return: the required and optional argument dictionaries
         :raises CLAException: if argument processing encounters a usage or validation exception
         """
@@ -147,7 +149,10 @@ def process_args(self, args):
             elif self.is_domain_home_key(key):
                 idx += 1
                 if idx < args_len:
-                    full_path = self._validate_domain_home_arg(args[idx])
+                    if for_domain_create:
+                        full_path = self._validate_domain_home_arg_for_create(args[idx])
+                    else:
+                        full_path = self._validate_domain_home_arg(args[idx])
                     self._add_arg(key, full_path, True)
                 else:
                     ex = self._get_out_of_args_exception(key)
@@ -450,8 +455,7 @@ def is_domain_home_key(self, key):
         return self.DOMAIN_HOME_SWITCH == key
 
     #
-    # The domain home arg is only used by discover and deploy so it must be a valid domain home.
-    # The create domain operation should use the domain parent arg.
+    # The domain home arg used by discover and deploy must be a valid domain home.
     #
     def _validate_domain_home_arg(self, value):
         method_name = '_validate_domain_home_arg'
@@ -477,6 +481,24 @@ def _validate_domain_home_arg(self, value):
 
         return dh.getAbsolutePath()
 
+    #
+    # The domain home arg used by create must be the child of a valid, writable directory.
+    #
+    def _validate_domain_home_arg_for_create(self, value):
+        method_name = '_validate_domain_home_arg_for_create'
+
+        try:
+            parent_dir = os.path.dirname(value)
+            JFileUtils.validateWritableDirectory(parent_dir)
+        except JIllegalArgumentException, iae:
+            ex = exception_helper.create_cla_exception('WLSDPLY-01606', value, iae.getLocalizedMessage(), error=iae)
+            ex.setExitCode(self.ARG_VALIDATION_ERROR_EXIT_CODE)
+            self._logger.throwing(ex, class_name=self._class_name, method_name=method_name)
+            raise ex
+
+        home_dir = JFile(value)
+        return home_dir.getAbsolutePath()
+
     def get_domain_parent_key(self):
         return self.DOMAIN_PARENT_SWITCH
 

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

@@ -1225,6 +1225,7 @@ WLSDPLY-20021=Filter path {0} does not exist
 WLSDPLY-20022=Error loading filter path {0}
 WLSDPLY-20023={0} unable to add model file {1} to archive as {2}: {3}
 WLSDPLY-20024={0} failed to persist the model to the archive file {1}: {2}
+WLSDPLY-20025=For {0}, specify the {1} or {2} argument, but not both
 
 # Common messages used for tool exit and clean-up
 WLSDPLY-21000={0} Messages:

installer/src/main/bin/createDomain.cmd

@@ -323,7 +323,7 @@ GOTO exit_script
 ECHO.
 ECHO Usage: %~nx0 [-help] [-use_encryption] [-run_rcu]
 ECHO              -oracle_home ^<oracle-home^>
-ECHO              -domain_parent ^<domain-parent^>
+ECHO              [-domain_parent ^<domain-parent^> ^| -domain_home ^<domain-home^>]
 ECHO              -domain_type ^<domain-type^>
 ECHO              [-java_home ^<java-home^>]
 ECHO              [-archive_file ^<archive-file^>]
@@ -337,7 +337,13 @@ ECHO.
 ECHO     where:
 ECHO         oracle-home     - the existing Oracle Home directory for the domain.
 ECHO.
-ECHO         domain-parent   - the directory where the domain should be created.
+ECHO         domain-parent   - the parent directory where the domain should be created.
+ECHO                           The domain name from the model will be appended to this
+ECHO                           location to become the domain home.
+ECHO.
+ECHO         domain-home     - the full directory where the domain should be created.
+ECHO                           This is used in cases where the domain name is different
+ECHO                           from the domain home directory name.
 ECHO.
 ECHO         domain-type     - the type of domain (e.g., WLS, JRF).  This controls
 ECHO                           the domain templates and template resource targeting.

installer/src/main/bin/createDomain.sh

@@ -53,7 +53,7 @@ usage() {
   echo ""
   echo "Usage: $1 [-help] [-use_encryption] [-run_rcu]"
   echo "          -oracle_home <oracle-home>"
-  echo "          -domain_parent <domain-parent>"
+  echo "          [-domain_parent <domain-parent> | -domain_home <domain-home>]"
   echo "          -domain_type <domain-type>"
   echo "          [-java_home <java-home>]"
   echo "          [-archive_file <archive-file>]"
@@ -67,7 +67,13 @@ usage() {
   echo "    where:"
   echo "        oracle-home     - the existing Oracle Home directory for the domain."
   echo ""
-  echo "        domain-parent   - the directory where the domain should be created."
+  echo "        domain-parent   - the parent directory where the domain should be created."
+  echo "                          The domain name from the model will be appended to this"
+  echo "                          location to become the domain home."
+  echo ""
+  echo "        domain-home     - the full directory where the domain should be created."
+  echo "                          This is used in cases where the domain name is different"
+  echo "                          from the domain home directory name."
   echo ""
   echo "        domain-type     - the type of domain (e.g., WLS, JRF).  This controls"
   echo "                          the domain templates and template resource targeting."