Merge pull request #226 from oracle/jira-wdt-9-create-domain-cluster-datasource

Issue #210 JIRA WDT-45 Fix problems with comma-separated server start…

Author: CarolynRountree

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

@@ -1,5 +1,5 @@
 """
-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 copy
@@ -246,7 +246,11 @@ def __parse_args(self):
         _method_name = '__parse_args'
 
         if self.__raw_args is not None and len(self.__raw_args) > 0:
-            arguments = self.__raw_args.split()
+            if isinstance(self.__raw_args, list):
+                arguments = self.__raw_args
+            else:
+                arguments = self.__raw_args.split()
+
             for argument in arguments:
                 if self.__client_server_regex.match(argument):
                     self.__client_server_args.append(argument)

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

@@ -51,12 +51,15 @@
 from wlsdeploy.aliases.alias_constants import WLST_READ_TYPE
 from wlsdeploy.aliases.alias_constants import WLST_TYPE
 from wlsdeploy.aliases.alias_constants import WLST_SUBFOLDERS_PATH
+from wlsdeploy.aliases.model_constants import ARGUMENTS
 from wlsdeploy.aliases.model_constants import MODEL_LIST_DELIMITER
+from wlsdeploy.aliases.model_constants import SERVER
+from wlsdeploy.aliases.model_constants import SERVER_START
 
 _class_name = 'alias_utils'
 _logger = PlatformLogger('wlsdeploy.aliases')
-_server_start_location_folder_path = '/Server/ServerStart'
-_server_start_argument_attribute_name = 'Arguments'
+_server_start_location_folder_path = '/' + SERVER + '/' + SERVER_START
+_server_start_argument_attribute_name = ARGUMENTS
 _windows_path_regex = re.compile(r'^[a-zA-Z]:[\\/].*')
 
 
@@ -149,7 +152,7 @@ def merge_model_and_existing_properties(model_props, existing_props, string_prop
 def merge_server_start_argument_values(model_args, existing_args):
     """
     Merge the two arguments strings.
-    :param model_args: the new string from the model
+    :param model_args: the new string or list from the model
     :param existing_args: the old string (e.g., from WLST)
     :return: the resulting merged string
     """
@@ -159,7 +162,8 @@ def merge_server_start_argument_values(model_args, existing_args):
     if model_args is None or len(model_args) == 0:
         result = existing_args
     elif existing_args is None or len(existing_args) == 0:
-        result = model_args
+        new_args = JVMArguments(_logger, model_args)
+        result = new_args.get_arguments_string()
     else:
         new_args = JVMArguments(_logger, model_args)
         merged_args = JVMArguments(_logger, existing_args)

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

@@ -1,5 +1,5 @@
 """
-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
 """
 from java.lang import String
@@ -43,6 +43,7 @@
 from wlsdeploy.aliases.alias_constants import RESTART_REQUIRED
 from wlsdeploy.aliases.alias_constants import SET_MBEAN_TYPE
 from wlsdeploy.aliases.alias_constants import SET_METHOD
+from wlsdeploy.aliases.alias_constants import STRING
 from wlsdeploy.aliases.alias_constants import USES_PATH_TOKENS
 from wlsdeploy.aliases.alias_constants import VALUE
 from wlsdeploy.aliases.alias_constants import WLST_NAME
@@ -385,17 +386,21 @@ def get_wlst_attribute_name_and_value(self, location, model_attribute_name, mode
                     raise ex
             else:
                 if data_type in ALIAS_LIST_TYPES or data_type in ALIAS_MAP_TYPES:
+                    to_type = data_type
+
                     merge = True
                     if MERGE in attribute_info:
                         merge = alias_utils.convert_boolean(attribute_info[MERGE])
 
-                    if merge and data_type in ALIAS_MAP_TYPES:
+                    if alias_utils.is_attribute_server_start_arguments(location, model_attribute_name):
+                        # convert to string, even if no existing value to merge
+                        merged_value = \
+                            alias_utils.merge_server_start_argument_values(model_attribute_value, existing_wlst_value)
+                        to_type = STRING
+                    elif merge and data_type in ALIAS_MAP_TYPES:
                         model_val = TypeUtils.convertToType(PROPERTIES, model_attribute_value)
                         existing_val = TypeUtils.convertToType(PROPERTIES, existing_wlst_value)
                         merged_value = alias_utils.merge_model_and_existing_properties(model_val, existing_val)
-                    elif merge and alias_utils.is_attribute_server_start_arguments(location, model_attribute_name):
-                        merged_value = \
-                            alias_utils.merge_server_start_argument_values(model_attribute_value, existing_wlst_value)
                     elif merge and existing_wlst_value is not None and len(existing_wlst_value) > 0:
                         model_val = alias_utils.convert_to_type(LIST, model_attribute_value,
                                                                 delimiter=MODEL_LIST_DELIMITER)
@@ -412,10 +417,10 @@ def get_wlst_attribute_name_and_value(self, location, model_attribute_name, mode
                         subtype = 'java.lang.String'
                         if SET_MBEAN_TYPE in attribute_info:
                             subtype = attribute_info[SET_MBEAN_TYPE]
-                        wlst_attribute_value = alias_utils.convert_to_type(data_type, merged_value, subtype=subtype,
+                        wlst_attribute_value = alias_utils.convert_to_type(to_type, merged_value, subtype=subtype,
                                                                            delimiter=MODEL_LIST_DELIMITER)
                     else:
-                        wlst_attribute_value = alias_utils.convert_to_type(data_type, merged_value,
+                        wlst_attribute_value = alias_utils.convert_to_type(to_type, merged_value,
                                                                            delimiter=MODEL_LIST_DELIMITER)
                 else:
                     wlst_attribute_value = alias_utils.convert_to_type(data_type, model_attribute_value,

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

@@ -265,6 +265,7 @@
 ABSOLUTE_SOURCE_PATH = 'AbsoluteSourcePath'
 ACTION = 'Action'
 ACTIVE_TYPE = 'ActiveType'
+ARGUMENTS = 'Arguments'
 CONSTRAINED_CANDIDATE_SERVER = 'ConstrainedCandidateServer'
 CUSTOM_IDENTITY_KEYSTORE_FILE = 'CustomIdentityKeyStoreFileName'
 CUSTOM_TRUST_KEYSTORE_FILE = 'CustomTrustKeyStoreFileName'

core/src/test/python/aliases_test.py

@@ -13,7 +13,6 @@
 from oracle.weblogic.deploy.aliases import TypeUtils
 
 from wlsdeploy.aliases.aliases import Aliases
-from wlsdeploy.aliases.alias_constants import ATTRIBUTES
 from wlsdeploy.aliases.location_context import LocationContext
 import wlsdeploy.aliases.model_constants as FOLDERS
 from wlsdeploy.aliases.validation_codes import ValidationCodes
@@ -1322,5 +1321,20 @@ def testListGetToList(self):
         actual_attr, actual_value = self.aliases.get_wlst_attribute_name_and_value(location, actual_attr, actual_value)
         self.assertEqual(wlst_list, actual_value)
 
+    # server start args can be a list in the model, merge values and become a string for WLST
+    def testServerStartArgs(self):
+        location = LocationContext().append_location(FOLDERS.SERVER)
+        location.add_name_token(self.aliases.get_name_token(location), 'AdminServer')
+        location = location.append_location(FOLDERS.SERVER_START)
+        location.add_name_token(self.aliases.get_name_token(location), 'AdminServer')
+        attribute = FOLDERS.ARGUMENTS
+        value = ['-Dxyz=123,456,789']
+        existing_value = '-Dxyz=123,555,789'
+
+        dummy_attr, wlst_value = self.aliases.get_wlst_attribute_name_and_value(location, attribute, value,
+                                                                                existing_value)
+        self.assertEqual('-Dxyz=123,456,789', wlst_value)
+
+
 if __name__ == '__main__':
     unittest.main()