Issue#95 - Provide update of domain and classpath libraries

Author: rakillen

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

@@ -13,7 +13,6 @@
 from wlsdeploy.aliases.model_constants import CLUSTER
 from wlsdeploy.aliases.model_constants import DEFAULT_ADMIN_SERVER_NAME
 from wlsdeploy.aliases.model_constants import DEFAULT_WLS_DOMAIN_NAME
-from wlsdeploy.aliases.model_constants import DOMAIN_LIBRARIES
 from wlsdeploy.aliases.model_constants import DOMAIN_NAME
 from wlsdeploy.aliases.model_constants import DRIVER_NAME
 from wlsdeploy.aliases.model_constants import DRIVER_PARAMS_PROPERTY_VALUE
@@ -50,6 +49,7 @@
 from wlsdeploy.tool.create.security_provider_creator import SecurityProviderCreator
 from wlsdeploy.tool.deploy import model_deployer
 from wlsdeploy.tool.util.archive_helper import ArchiveHelper
+from wlsdeploy.tool.util.library_helper import LibraryHelper
 from wlsdeploy.tool.util.topology_helper import TopologyHelper
 from wlsdeploy.util import dictionary_utils
 from wlsdeploy.util import model as model_helper
@@ -66,10 +66,6 @@ def __init__(self, model_dictionary, model_context, aliases):
         _method_name = '__init__'
         Creator.__init__(self, model_dictionary, model_context, aliases)
 
-        self.topology_helper = TopologyHelper(self.aliases, ExceptionType.CREATE, self.logger)
-        self.security_provider_creator = SecurityProviderCreator(model_dictionary, model_context, aliases,
-                                                                 ExceptionType.CREATE, self.logger)
-
         # domainInfo section is required to get the admin password, everything else
         # is optional and will use the template defaults
         if model_helper.get_model_domain_info_key() not in model_dictionary:
@@ -79,6 +75,10 @@ def __init__(self, model_dictionary, model_context, aliases):
             self.logger.throwing(ex, class_name=self.__class_name, method_name=_method_name)
             raise ex
 
+        self.topology_helper = TopologyHelper(self.aliases, ExceptionType.CREATE, self.logger)
+        self.security_provider_creator = SecurityProviderCreator(model_dictionary, model_context, aliases,
+                                                                 ExceptionType.CREATE, self.logger)
+
         self._domain_typedef = self.model_context.get_domain_typedef()
         self._topology = self.model.get_model_topology()
         self._domain_info = self.model.get_model_domain_info()
@@ -102,6 +102,10 @@ def __init__(self, model_dictionary, model_context, aliases):
         if archive_file_name is not None:
             self.archive_helper = ArchiveHelper(archive_file_name, self._domain_home, self.logger,
                                                 exception_helper.ExceptionType.CREATE)
+
+        self.library_helper = LibraryHelper(self.model, self.model_context, self.aliases, self._domain_home,
+                                            ExceptionType.CREATE, self.logger)
+
         #
         # Creating domains with the wls.jar template is busted for pre-12.1.2 domains with regards to the
         # names of the default authentication providers (both the DefaultAuthenticator and the
@@ -227,8 +231,8 @@ def __create_domain(self):
             for file_to_extract in self.files_to_extract_from_archive:
                 self.archive_helper.extract_file(file_to_extract)
 
-        self.__install_domain_libraries(self._domain_home)
-        self.__extract_classpath_libraries(self._domain_home)
+        self.library_helper.install_domain_libraries()
+        self.library_helper.extract_classpath_libraries()
         self.logger.exiting(class_name=self.__class_name, method_name=_method_name)
         return
 
@@ -350,55 +354,6 @@ def __create_domain_with_select_template(self, domain_home):
         self.logger.exiting(class_name=self.__class_name, method_name=_method_name)
         return
 
-    def __install_domain_libraries(self, domain_home):
-        """
-        Extract the domain libraries listed in the model, if any, to the <DOMAIN_HOME>/lib directory.
-        :param domain_home: the domain home directory
-        :raises: CreateException: if an error occurs
-        """
-        _method_name = '__install_domain_libraries'
-
-        self.logger.entering(domain_home, class_name=self.__class_name, method_name=_method_name)
-        domain_info_dict = self.model.get_model_domain_info()
-        if DOMAIN_LIBRARIES not in domain_info_dict or len(domain_info_dict[DOMAIN_LIBRARIES]) == 0:
-            self.logger.info('WLSDPLY-12213', class_name=self.__class_name, method_name=_method_name)
-        else:
-            domain_libs = dictionary_utils.get_dictionary_element(domain_info_dict, DOMAIN_LIBRARIES)
-            if self.archive_helper is None:
-                ex = exception_helper.create_create_exception('WLSDPLY-12214', domain_libs)
-                self.logger.throwing(ex, class_name=self.__class_name, method_name=_method_name)
-                raise ex
-
-            for domain_lib in domain_libs:
-                self.logger.info('WLSDPLY-12215', domain_lib, domain_home,
-                                 class_name=self.__class_name, method_name=_method_name)
-                self.archive_helper.extract_domain_library(domain_lib)
-
-        self.logger.exiting(class_name=self.__class_name, method_name=_method_name)
-        return
-
-    def __extract_classpath_libraries(self, domain_home):
-        """
-        Extract any classpath libraries in the archive to the domain home.
-        :param domain_home: the domain home directory
-        :raises: CreateException: if an error occurs
-        """
-        _method_name = '__extract_classpath_libraries'
-
-        self.logger.entering(domain_home, class_name=self.__class_name, method_name=_method_name)
-        if self.archive_helper is None:
-            self.logger.info('WLSDPLY-12216', class_name=self.__class_name, method_name=_method_name)
-        else:
-            num_cp_libs = self.archive_helper.extract_classpath_libraries()
-            if num_cp_libs > 0:
-                self.logger.info('WLSDPLY-12217', num_cp_libs, domain_home,
-                                 class_name=self.__class_name, method_name=_method_name)
-            else:
-                self.logger.info('WLSDPLY-12218', self.model_context.get_archive_file_name(),
-                                 class_name=self.__class_name, method_name=_method_name)
-        self.logger.exiting(class_name=self.__class_name, method_name=_method_name)
-        return
-
     def __apply_base_domain_config(self, topology_folder_list):
         """
         Apply the base domain configuration from the model topology section.

core/src/main/python/wlsdeploy/tool/deploy/topology_updater.py

@@ -16,6 +16,7 @@
 from wlsdeploy.tool.create.security_provider_creator import SecurityProviderCreator
 from wlsdeploy.tool.deploy import deployer_utils
 from wlsdeploy.tool.deploy.deployer import Deployer
+from wlsdeploy.tool.util.library_helper import LibraryHelper
 from wlsdeploy.tool.util.topology_helper import TopologyHelper
 from wlsdeploy.util import dictionary_utils
 
@@ -34,6 +35,9 @@ def __init__(self, model, model_context, aliases, wlst_mode=WlstModes.OFFLINE):
         self._security_provider_creator = SecurityProviderCreator(model.get_model(), model_context, aliases,
                                                                   ExceptionType.DEPLOY, self.logger)
 
+        self.library_helper = LibraryHelper(self.model, self.model_context, self.aliases,
+                                            model_context.get_domain_home(), ExceptionType.DEPLOY, self.logger)
+
     # Override
     def _add_named_elements(self, type_name, model_nodes, location):
         """
@@ -84,6 +88,11 @@ def update(self):
 
         # TODO: update targeting
 
+        # files referenced in attributes are extracted as attributes are processed
+
+        self.library_helper.install_domain_libraries()
+        self.library_helper.extract_classpath_libraries()
+
     def _process_section(self, folder_dict, folder_list, key, location):
         if key in folder_dict:
             nodes = dictionary_utils.get_dictionary_element(folder_dict, key)

core/src/main/python/wlsdeploy/tool/util/library_helper.py

@@ -0,0 +1,80 @@
+"""
+Copyright (c) 2017, 2018, Oracle and/or its affiliates. All rights reserved.
+The Universal Permissive License (UPL), Version 1.0
+"""
+
+import wlsdeploy.util.dictionary_utils as dictionary_utils
+
+from wlsdeploy.aliases.model_constants import DOMAIN_LIBRARIES
+from wlsdeploy.exception import exception_helper
+from wlsdeploy.tool.util.alias_helper import AliasHelper
+from wlsdeploy.tool.util.archive_helper import ArchiveHelper
+from wlsdeploy.tool.util.wlst_helper import WlstHelper
+
+
+class LibraryHelper(object):
+    """
+    Shared code for updating domain and classpath libraries. Domain create and update use this code.
+    """
+    __class_name = 'LibraryHelper'
+
+    def __init__(self, model, model_context, aliases, domain_home, exception_type, logger):
+        self.logger = logger
+        self.model = model
+        self.model_context = model_context
+        self.domain_home = domain_home
+        self.alias_helper = AliasHelper(aliases, self.logger, exception_type)
+        self.wlst_helper = WlstHelper(self.logger, exception_type)
+
+        archive_file_name = self.model_context.get_archive_file_name()
+        if archive_file_name is not None:
+            self.archive_helper = ArchiveHelper(archive_file_name, self.domain_home, self.logger, exception_type)
+
+    def install_domain_libraries(self):
+        """
+        Extract the domain libraries listed in the model, if any, to the <DOMAIN_HOME>/lib directory.
+        :raises: BundleAwareException of the specified type: if an error occurs
+        """
+        _method_name = 'install_domain_libraries'
+        print('\n' + _method_name)
+
+        self.logger.entering(self.domain_home, class_name=self.__class_name, method_name=_method_name)
+        domain_info_dict = self.model.get_model_domain_info()
+        if DOMAIN_LIBRARIES not in domain_info_dict or len(domain_info_dict[DOMAIN_LIBRARIES]) == 0:
+            self.logger.info('WLSDPLY-12213', class_name=self.__class_name, method_name=_method_name)
+        else:
+            domain_libs = dictionary_utils.get_dictionary_element(domain_info_dict, DOMAIN_LIBRARIES)
+            if self.archive_helper is None:
+                ex = exception_helper.create_create_exception('WLSDPLY-12214', domain_libs)
+                self.logger.throwing(ex, class_name=self.__class_name, method_name=_method_name)
+                raise ex
+
+            for domain_lib in domain_libs:
+                self.logger.info('WLSDPLY-12215', domain_lib, self.domain_home,
+                                 class_name=self.__class_name, method_name=_method_name)
+                self.archive_helper.extract_domain_library(domain_lib)
+
+        self.logger.exiting(class_name=self.__class_name, method_name=_method_name)
+        return
+
+    def extract_classpath_libraries(self):
+        """
+        Extract any classpath libraries in the archive to the domain home.
+        :raises: BundleAwareException of the specified type: if an error occurs
+        """
+        _method_name = 'extract_classpath_libraries'
+        print('\n' + _method_name)
+
+        self.logger.entering(self.domain_home, class_name=self.__class_name, method_name=_method_name)
+        if self.archive_helper is None:
+            self.logger.info('WLSDPLY-12216', class_name=self.__class_name, method_name=_method_name)
+        else:
+            num_cp_libs = self.archive_helper.extract_classpath_libraries()
+            if num_cp_libs > 0:
+                self.logger.info('WLSDPLY-12217', num_cp_libs, self.domain_home,
+                                 class_name=self.__class_name, method_name=_method_name)
+            else:
+                self.logger.info('WLSDPLY-12218', self.model_context.get_archive_file_name(),
+                                 class_name=self.__class_name, method_name=_method_name)
+        self.logger.exiting(class_name=self.__class_name, method_name=_method_name)
+        return