Merge branch 'db-client-data' into 'main'

Distribute wallets using DB client data MBeans

See merge request weblogic-cloud/weblogic-deploy-tooling!1826

Author: robertpatrick

core/src/main/python/deploy.py

@@ -167,7 +167,6 @@ def __deploy_online(model_deployer, model_context):
     try:
         model_deployer.deploy_plugins()
         model_deployer.deploy_resources()
-        model_deployer.distribute_database_wallets_online()
         model_deployer.deploy_app_attributes_online()
     except (DeployException, exceptions.Exception, JException), ex:
         # release the edit session, and raise the exception for tool_main to handle

core/src/main/python/update.py

@@ -197,7 +197,6 @@ def __update_online(model_deployer, model, model_context, aliases):
         model_deployer.deploy_plugins()  # may be referenced in SecurityConfiguration/CertificateManagement
         topology_updater.update()
         model_deployer.deploy_resources()
-        model_deployer.distribute_database_wallets_online()
         model_deployer.deploy_app_attributes_online()
 
     except (DeployException, exceptions.Exception, JException), ex:

core/src/main/python/wlsdeploy/aliases/alias_entries.py

@@ -55,6 +55,7 @@
 from wlsdeploy.aliases.model_constants import APPLICATION
 from wlsdeploy.aliases.model_constants import CALLOUT
 from wlsdeploy.aliases.model_constants import CUSTOM_RESOURCE
+from wlsdeploy.aliases.model_constants import DB_CLIENT_DATA_DIRECTORY
 from wlsdeploy.aliases.model_constants import DOMAIN_INFO
 from wlsdeploy.aliases.model_constants import DOMAIN_INFO_ALIAS
 from wlsdeploy.aliases.model_constants import EJB_CONTAINER
@@ -179,6 +180,7 @@ class AliasEntries(object):
 
     __app_deployments_top_level_folders = [
         APPLICATION,
+        DB_CLIENT_DATA_DIRECTORY,
         LIBRARY,
         PLUGIN_DEPLOYMENT
     ]

core/src/main/python/wlsdeploy/aliases/model_constants.py

@@ -86,6 +86,7 @@
 # Deprecated in WDT 4.0.0
 DATABASE_TYPE = 'databaseType'
 
+DB_CLIENT_DATA_DIRECTORY = 'DbClientDataDirectory'
 DEFAULT_ADJUDICATOR = 'DefaultAdjudicator'
 DEFAULT_ADMIN_SERVER_NAME = 'AdminServer'
 DEFAULT_AUDITOR = 'DefaultAuditor'

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

@@ -301,9 +301,12 @@ def _replace_path_tokens_for_deployment(self, deployment_type, deployment_name,
         self.logger.entering(deployment_type, deployment_name, deployment_dict,
                              class_name=self._class_name, method_name=_method_name)
 
-        self.model_context.replace_tokens(deployment_type, deployment_name, SOURCE_PATH, deployment_dict)
-        self.model_context.replace_tokens(deployment_type, deployment_name, PLAN_DIR, deployment_dict)
-        self.model_context.replace_tokens(deployment_type, deployment_name, PLAN_PATH, deployment_dict)
+        for attribute in [SOURCE_PATH, PLAN_DIR, PLAN_PATH]:
+            self.model_context.replace_tokens(deployment_type, deployment_name, attribute, deployment_dict)
+            # deployment path might need correcting from wlsdeploy/* => config/wlsdeploy/*
+            path = dictionary_utils.get_element(deployment_dict, attribute)
+            if path:
+                deployment_dict[attribute] = WLSDeployArchive.getExtractPath(path)
 
         self.logger.exiting(class_name=self._class_name, method_name=_method_name)
 

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

@@ -6,6 +6,7 @@
 
 from wlsdeploy.aliases.location_context import LocationContext
 from wlsdeploy.aliases.model_constants import APPLICATION
+from wlsdeploy.aliases.model_constants import DB_CLIENT_DATA_DIRECTORY
 from wlsdeploy.aliases.model_constants import LIBRARY
 from wlsdeploy.aliases.model_constants import MODULE_TYPE
 from wlsdeploy.aliases.model_constants import PLUGIN_DEPLOYMENT
@@ -32,6 +33,7 @@ def deploy(self, _is_restart_required):
 
         self.__deploy_shared_libraries()
         self.__deploy_applications()
+        self.__deploy_db_client_data()
 
         self.logger.exiting(class_name=self._class_name, method_name=_method_name)
 
@@ -48,6 +50,9 @@ def __deploy_shared_libraries(self):
     def __deploy_applications(self):
         self.__update_deployments(APPLICATION)
 
+    def __deploy_db_client_data(self):
+        self.__update_deployments(DB_CLIENT_DATA_DIRECTORY)
+
     def __update_deployments(self, deployment_type):
         _method_name = '__update_deployments'
         self.logger.entering(deployment_type, class_name=self._class_name, method_name=_method_name)
@@ -86,7 +91,8 @@ def __update_deployments(self, deployment_type):
                 self.__validate_deployment_source_path(deployment_name, deployment_type, deployment,
                                                        existing_deployments)
 
-                self._extract_deployment_from_archive(deployment_name, deployment_type, deployment)
+                if deployment_type != DB_CLIENT_DATA_DIRECTORY:  # wallets were already extracted
+                    self._extract_deployment_from_archive(deployment_name, deployment_type, deployment)
 
                 # If SourcePath is empty and hasn't caused an error, deployment_name will be unchanged.
                 source_path = dictionary_utils.get_element(deployment, SOURCE_PATH)

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

@@ -13,12 +13,14 @@
 from oracle.weblogic.deploy.util import FileUtils
 from oracle.weblogic.deploy.util import PyOrderedDict as OrderedDict
 from oracle.weblogic.deploy.util import WdtJaxbException
+from oracle.weblogic.deploy.util import WLSDeployArchive
 
 from wlsdeploy.aliases import alias_utils
 from wlsdeploy.aliases.location_context import LocationContext
 from wlsdeploy.aliases.model_constants import ABSOLUTE_PLAN_PATH
 from wlsdeploy.aliases.model_constants import ABSOLUTE_SOURCE_PATH
 from wlsdeploy.aliases.model_constants import APPLICATION
+from wlsdeploy.aliases.model_constants import DB_CLIENT_DATA_DIRECTORY
 from wlsdeploy.aliases.model_constants import DEPLOYMENT_ORDER
 from wlsdeploy.aliases.model_constants import LIBRARY
 from wlsdeploy.aliases.model_constants import MODULE_TYPE
@@ -72,6 +74,8 @@ def deploy(self, is_restart_required=False):
         self.logger.entering(self._parent_name, self._parent_type, is_restart_required,
                              class_name=self._class_name, method_name=_method_name)
 
+        self.__deploy_db_client_data()
+
         # Make copies of the model dictionary since we are going
         # to modify it as we build the deployment strategy.
         #
@@ -1144,6 +1148,9 @@ def __undeploy_app(self, deployment_name, deployment_type, partition_name=None,
             'targets': targets
         }
 
+        if deployment_type == DB_CLIENT_DATA_DIRECTORY:
+            kwargs['dbClientData'] = 'true'
+
         if deployment_type == LIBRARY:
             kwargs['libraryModule'] = 'true'
 
@@ -1284,6 +1291,40 @@ def __start_all_apps(self, deployed_app_list, base_location, is_restart_required
 
         self.logger.exiting(class_name=self._class_name, method_name=_method_name)
 
+    def __deploy_db_client_data(self):
+        _method_name = '__deploy_db_client_data'
+        self.logger.entering(class_name=self._class_name, method_name=_method_name)
+
+        db_client_location = LocationContext(self._base_location).append_location(DB_CLIENT_DATA_DIRECTORY)
+        if not self.aliases.is_model_location_valid(db_client_location):
+            return
+
+        db_client_entries = dictionary_utils.get_dictionary_element(self._parent_dict, DB_CLIENT_DATA_DIRECTORY)
+        db_client_entries = copy.deepcopy(db_client_entries)
+        self._replace_deployments_path_tokens(DB_CLIENT_DATA_DIRECTORY, db_client_entries)
+        existing_names = deployer_utils.get_existing_object_list(db_client_location, self.aliases)
+
+        for entry_name, entry_dict in db_client_entries.items():
+            if model_helper.is_delete_name(entry_name):
+                if self._does_deployment_to_delete_exist(entry_name, existing_names, DB_CLIENT_DATA_DIRECTORY):
+                    name_to_delete = model_helper.get_delete_item_name(entry_name)
+                    self.__undeploy_app(name_to_delete, DB_CLIENT_DATA_DIRECTORY)
+            else:
+                self.logger.info('WLSDPLY-09316', DB_CLIENT_DATA_DIRECTORY, entry_name,
+                                 class_name=self._class_name, method_name=_method_name)
+
+                source_path = dictionary_utils.get_element(entry_dict, SOURCE_PATH)
+                if string_utils.is_empty(source_path):
+                    ex = exception_helper.create_deploy_exception(
+                        'WLSDPLY-09317', DB_CLIENT_DATA_DIRECTORY, entry_name, SOURCE_PATH)
+                    self.logger.throwing(ex, class_name=self._class_name, method_name=_method_name)
+                    raise ex
+
+                source_path = WLSDeployArchive.getExtractPath(source_path)  # wlsdeploy => config/wlsdeploy
+                if self.archive_helper and self.archive_helper.is_path_into_archive(source_path):
+                    source_path = self.path_helper.join(self.model_context.get_domain_home(), source_path)
+
+                self.wlst_helper.distribute_application(source_path, dbClientData='true', remote='true')
 
 def _get_deployment_order(apps_dict, ordered_list, order):
     """

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

@@ -77,45 +77,6 @@ def deploy_model_offline(self):
     def deploy_plugins(self):
         self.applications_deployer.deploy_plugins()
 
-    def distribute_database_wallets_online(self):
-        """
-        Go through the model and run the WLST distributeApplication command to distribute the already extracted wallet
-        to the targets.
-        """
-        _method_name = 'distribute_database_wallets_online'
-
-        if self.archive_helper is None:
-            return
-
-        if not self.wls_helper.is_db_client_data_distribution_supported():
-            # Older WLS versions don't support wallet distribution
-            return
-
-        if self.model_context.is_remote():
-            # Should have already warned during wallets extraction
-            return
-
-        try:
-            wallet_path_list = self.archive_helper.get_all_database_wallet_paths()
-            distribute_list = []
-            # Go through the wallet path list and build the actual list avoid duplicate path in different wallets
-            for wallet_path in wallet_path_list:
-                for path in wallet_path['paths']:
-                    # correct deprecated location
-                    if path.startswith(WLSDeployArchive.WLSDPLY_ARCHIVE_BINARY_DIR + WLSDeployArchive.ZIP_SEP):
-                        path = WLSDeployArchive.CONFIG_DIR_NAME + WLSDeployArchive.ZIP_SEP + path
-                    absolute_path = self.path_helper.join(self.model_context.get_domain_home(), path)
-                    if absolute_path not in distribute_list:
-                        distribute_list.append(absolute_path)
-
-            for distribute_path in distribute_list:
-                self.wlst_helper.distribute_application(distribute_path, dbClientData='true', remote='true')
-
-        except PyWLSTException, pwe:
-            ex = exception_helper.create_deploy_exception('WLSDPLY-09650', pwe.getLocalizedMessage(), error=pwe)
-            _logger.throwing(ex, class_name=_class_name, method_name=_method_name)
-            raise ex
-
     def deploy_model_after_update(self):
         """
         Deploy the resources that must be done after WLST updateDomain.