Merge pull request #269 from oracle/issue-259-heap-server-start-args

Issue #259 - Allow uppercase multipliers in size and other -X arguments

Author: ddsharpe

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

@@ -18,14 +18,14 @@ class JVMArguments(object):
 
     _class_name = 'JVMArguments'
     __client_server_regex = re.compile('-client|-server')
-    __x_args_size_regex = re.compile('(-X(ms|mx|ss|mn) ?)([0-9]+[kmg]? ?)')
+    __x_args_size_regex = re.compile('(-X(ms|mx|ss|mn) ?)([0-9]+[kmgKMG]? ?)')
     __x_args_value_regex = re.compile('(-X[a-zS]+(/[ap])? ?):([\S]+ ?)')
-    __x_args_other_regex = re.compile('(-X[a-z]+ ?)(=([0-9]+[kmg]? ?))?')
+    __x_args_other_regex = re.compile('(-X[a-z]+ ?)(=([0-9]+[kmgKMG]? ?))?')
     __xx_args_switch_regex = re.compile('-XX:([+-] ?)([a-zA-Z0-9]+ ?)')
     __xx_args_value_regex = re.compile('-XX:([a-zA-Z0-9]+ ?)=([\S]+ ?)')
     __sys_props_regex = re.compile('-D([a-zA-Z0-9-_.]+ ?)(=([\S]+ ?))?')
 
-    __size_regex = re.compile('([0-9]+ ?)([kmg]? ?)')
+    __size_regex = re.compile('([0-9]+ ?)([kmgKMG]? ?)')
     __k_multiplier = 1024
     __m_multiplier = 1024 * 1024
     __g_multiplier = 1024 * 1024 * 1024
@@ -588,11 +588,11 @@ def __get_size_multiplier(self, multiplier):
         """
         if multiplier is None:
             result = 1
-        elif multiplier == 'k':
+        elif multiplier in ['k', 'K']:
             result = self.__k_multiplier
-        elif multiplier == 'm':
+        elif multiplier in ['m', 'M']:
             result = self.__m_multiplier
-        elif multiplier == 'g':
+        elif multiplier in ['g', 'G']:
             result = self.__g_multiplier
         else:
             result = 0

core/src/test/python/alias_jvmargs_test.py

@@ -7,6 +7,7 @@
 from wlsdeploy.aliases.alias_jvmargs import JVMArguments
 from wlsdeploy.logging.platform_logger import PlatformLogger
 
+
 class JVMArgumentsTestCase(unittest.TestCase):
 
     _logger = PlatformLogger('wlsdeploy.aliases')
@@ -29,3 +30,12 @@ def testArgMerging(self):
         existing_args.merge_jvm_arguments(model_args)
         actual = existing_args.get_arguments_string()
         self.assertEqual(actual, expected)
+
+    def testExArgs(self):
+        # verify size keys in lower/upper case.
+        # these are in correct order, so result should match exactly.
+        model = '-Xms1024m -Xmx4096M -Xa=1024k -Xb=4096K -Xc=1024g -Xd=4096G'
+
+        model_args = JVMArguments(self._logger, model)
+        result = model_args.get_arguments_string()
+        self.assertEqual(result, model)