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

JIRA WDT-40 Use fully qualified path for keystore location in NM prop…

Author: CarolynRountree

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

@@ -165,6 +165,14 @@ def _create_named_mbeans(self, type_name, model_nodes, base_location, log_create
 
         Creator._create_named_mbeans(self, type_name, model_nodes, base_location, log_created=log_created)
 
+    # Override
+    def _create_mbean(self, type_name, model_nodes, base_location, log_created=False):
+        Creator._create_mbean(self, type_name, model_nodes, base_location, log_created)
+
+        # check for file paths that need to be qualified
+        self.topology_helper.qualify_nm_properties(type_name, model_nodes, base_location, self.model_context,
+                                                   self.attribute_setter)
+
     def __run_rcu(self):
         """
         The method that runs RCU to drop and then create the schemas.

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

@@ -59,6 +59,14 @@ def _add_named_elements(self, type_name, model_nodes, location):
 
         Deployer._add_named_elements(self, type_name, model_nodes, location)
 
+    # Override
+    def _add_model_elements(self, type_name, model_nodes, location):
+        Deployer._add_model_elements(self, type_name, model_nodes, location)
+
+        # check for file paths that need to be qualified
+        self._topology_helper.qualify_nm_properties(type_name, model_nodes, location, self.model_context,
+                                                    self.attribute_setter)
+
     def update(self):
         """
         Deploy resource model elements at the domain level, including multi-tenant elements.

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

@@ -1,15 +1,18 @@
 """
-Copyright (c) 2017, 2018, Oracle and/or its affiliates. All rights reserved.
+Copyright (c) 2017, 2019, Oracle and/or its affiliates. All rights reserved.
 The Universal Permissive License (UPL), Version 1.0
 """
 
 import wlsdeploy.tool.deploy.deployer_utils as deployer_utils
 import wlsdeploy.util.dictionary_utils as dictionary_utils
+from oracle.weblogic.deploy.util import WLSDeployArchive
 
 from wlsdeploy.aliases.location_context import LocationContext
 from wlsdeploy.aliases.model_constants import CLUSTER
 from wlsdeploy.aliases.model_constants import COHERENCE_CLUSTER_SYSTEM_RESOURCE
+from wlsdeploy.aliases.model_constants import CUSTOM_IDENTITY_KEYSTORE_FILE
 from wlsdeploy.aliases.model_constants import JDBC_SYSTEM_RESOURCE
+from wlsdeploy.aliases.model_constants import NM_PROPERTIES
 from wlsdeploy.aliases.model_constants import SERVER
 from wlsdeploy.aliases.model_constants import SERVER_TEMPLATE
 from wlsdeploy.tool.util.alias_helper import AliasHelper
@@ -113,3 +116,20 @@ def create_placeholder_jdbc_resources(self, resources):
                     deployer_utils.create_and_cd(resource_location, existing_names, self.alias_helper)
 
         self.wlst_helper.cd(original_location)
+
+    def qualify_nm_properties(self, type_name, model_nodes, base_location, model_context, attribute_setter):
+        """
+        For the NM properties MBean, update the keystore file path to be fully qualified with the domain directory.
+        :param type_name: the type name of the MBean to be checked
+        :param model_nodes: the model nodes of the MBean to be checked
+        :param base_location: the parent location of the MBean
+        :param model_context: the model context of the tool
+        :param attribute_setter: the attribute setter to be used for update
+        """
+        if type_name == NM_PROPERTIES:
+            location = LocationContext(base_location).append_location(type_name)
+            keystore_file = dictionary_utils.get_element(model_nodes, CUSTOM_IDENTITY_KEYSTORE_FILE)
+            if keystore_file and WLSDeployArchive.isPathIntoArchive(keystore_file):
+                value = model_context.get_domain_home() + "/" + keystore_file
+                attribute_setter.set_attribute(location, CUSTOM_IDENTITY_KEYSTORE_FILE, value)
+