Merge pull request #220 from oracle/jira-wdt-40-custom-ssl-configuration

JIRA WDT-40 Store node manager keystore file separately in archive

Author: CarolynRountree

core/src/main/java/oracle/weblogic/deploy/util/WLSDeployArchive.java

@@ -74,6 +74,11 @@ public class WLSDeployArchive {
      */
     public static final String ARCHIVE_COHERENCE_TARGET_DIR = WLSDPLY_ARCHIVE_BINARY_DIR + "/coherence";
 
+    /**
+     * The subdirectory where node manager files are stored and extracted (such as keystore file).
+     */
+    public static final String ARCHIVE_NODE_MANAGER_TARGET_DIR = WLSDPLY_ARCHIVE_BINARY_DIR + "/nodeManager";
+
     /**
      * The subdirectory to which the scripts are extracted.
      */
@@ -867,6 +872,25 @@ public String addFileStoreDirectory(String fileStoreName) throws
         return newName;
     }
 
+    /**
+     * Add a Node Manager Identity Key Store file to the node manager directory in the archive.
+     *
+     * @param keystoreFile the file to add
+     * @return the new location of the file to use in the model
+     * @throws WLSDeployArchiveIOException if an error occurs while archiving the file
+     * @throws IllegalArgumentException if the file does not exist
+     */
+    public String addNodeManagerKeyStoreFile(File keystoreFile) throws WLSDeployArchiveIOException {
+        final String METHOD = "addNodeManagerKeyStoreFile";
+
+        LOGGER.entering(CLASS, METHOD, keystoreFile);
+
+        validateExistingFile(keystoreFile, "keyStoreFile", getArchiveFileName(), METHOD);
+        String newName = addItemToZip(ARCHIVE_NODE_MANAGER_TARGET_DIR, keystoreFile);
+        LOGGER.exiting(CLASS, METHOD, newName);
+        return newName;
+    }
+
     /**
      * This method removes all binaries from the archive.  This method is intended to
      * be invoked by discovery to remove binaries from a previous run that might

core/src/main/python/wlsdeploy/tool/discover/topology_discoverer.py

@@ -578,7 +578,7 @@ def _add_library(self, server_name, classpath_name):
 
     def _add_keystore_file_to_archive(self, model_name, model_value, location):
         """
-        Add the Server custom trust or identity keystore file to the archive.
+        Add the custom trust or identity keystore file to the archive.
         :param model_name: attribute name in the model
         :param model_value: converted model value for the attribute
         :param location: context containing the current location information
@@ -591,20 +591,62 @@ def _add_keystore_file_to_archive(self, model_name, model_value, location):
             server_name = self._get_server_name_from_location(location)
             archive_file = self._model_context.get_archive_file()
             file_path = self._convert_path(model_value)
-            _logger.finer('WLSDPLY-06623', file_path, server_name, class_name=_class_name, method_name=_method_name)
-            try:
-                new_name = archive_file.addServerKeyStoreFile(server_name, File(file_path))
-            except IllegalArgumentException, iae:
-                _logger.warning('WLSDPLY-06624', server_name, file_path, iae.getLocalizedMessage(),
-                                class_name=_class_name, method_name=_method_name)
-            except WLSDeployArchiveIOException, wioe:
-                de = exception_helper.create_discover_exception('WLSDPLY-06625', server_name, file_path,
-                                                                wioe.getLocalizedMessage())
-                _logger.throwing(class_name=_class_name, method_name=_method_name, error=de)
-                raise de
+            if server_name:
+                new_name = self._add_server_keystore_file_to_archive(server_name, archive_file, file_path)
+            else:
+                new_name = self._add_node_manager_keystore_file_to_archive(archive_file, file_path)
+
         _logger.exiting(class_name=_class_name, method_name=_method_name, result=new_name)
         return new_name
 
+    def _add_server_keystore_file_to_archive(self, server_name, archive_file, file_path):
+        """
+        Add the Server custom trust or identity keystore file to the archive.
+        :param server_name: attribute name in the model
+        :param archive_file: converted model value for the attribute
+        :param file_path: context containing the current location information
+        :return: modified location and name for the model keystore file
+        """
+        _method_name = '_add_server_keystore_file_to_archive'
+        _logger.entering(server_name, archive_file, file_path, class_name=_class_name, method_name=_method_name)
+        _logger.finer('WLSDPLY-06623', file_path, server_name, class_name=_class_name, method_name=_method_name)
+        new_name = None
+
+        try:
+            new_name = archive_file.addServerKeyStoreFile(server_name, File(file_path))
+        except IllegalArgumentException, iae:
+            _logger.warning('WLSDPLY-06624', server_name, file_path, iae.getLocalizedMessage(),
+                            class_name=_class_name, method_name=_method_name)
+        except WLSDeployArchiveIOException, wioe:
+            de = exception_helper.create_discover_exception('WLSDPLY-06625', server_name, file_path,
+                                                            wioe.getLocalizedMessage())
+            _logger.throwing(class_name=_class_name, method_name=_method_name, error=de)
+            raise de
+        return new_name
+
+    def _add_node_manager_keystore_file_to_archive(self, archive_file, file_path):
+        """
+        Add the node manager custom trust or identity keystore file to the archive.
+        :param archive_file: converted model value for the attribute
+        :param file_path: context containing the current location information
+        :return: modified location and name for the model keystore file
+        """
+        _method_name = '_add_node_manager_keystore_file_to_archive'
+        _logger.entering(archive_file, file_path, class_name=_class_name, method_name=_method_name)
+        _logger.finer('WLSDPLY-06636', file_path, class_name=_class_name, method_name=_method_name)
+        new_name = None
+
+        try:
+            new_name = archive_file.addNodeManagerKeyStoreFile(File(file_path))
+        except IllegalArgumentException, iae:
+            _logger.warning('WLSDPLY-06637', file_path, iae.getLocalizedMessage(), class_name=_class_name,
+                            method_name=_method_name)
+        except WLSDeployArchiveIOException, wioe:
+            de = exception_helper.create_discover_exception('WLSDPLY-06638', file_path, wioe.getLocalizedMessage())
+            _logger.throwing(class_name=_class_name, method_name=_method_name, error=de)
+            raise de
+        return new_name
+
     def _get_server_name_from_location(self, location):
         """
         Retrieve the server name from the location context file.

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

@@ -616,6 +616,9 @@ WLSDPLY-06632=Discovering {0} XML Entity Caches
 WLSDPLY-06633=Adding XML Entity Cache{0}
 WLSDPLY-06634=Discovering {0} XML Registries
 WLSDPLY-06635=Adding XML Registry {0}
+WLSDPLY-06636=Adding keystore file {0} for node manager to archive file
+WLSDPLY-06637=Unable to locate and add node manager keystore file {0} to the archive file : {1}
+WLSDPLY-06638=Unexpected exception attempting to add node manager keystore file {0} to the archive : {1}
 
 # multi_tenant_discoverer.py, multi_tenant_resources_dsi
 WLSDPLY-06700=Discover Multi-tenant