Add a few corrections and a unit test for aliases get default value

Author: CarolynRountree

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

@@ -92,11 +92,15 @@ def __init__(self, program_name, model, model_context=None, version=None):
         self.__original = copy.deepcopy(model)
         self.__model = model
         self.__model_context = model_context
+        if self.__model_context:
+            self.__wlst_mode = self.__model_context.get_target_wlst_mode()
+        else:
+            self.__wlst_mode = WlstModes.OFFLINE
         self.__section_keys = model_sections.get_model_top_level_keys()
         self.__section_keys.remove(model_sections.get_model_domain_info_key())
 
         if version:
-            self.__aliases = Aliases(model_context, WlstModes.OFFLINE, version, None)
+            self.__aliases = Aliases(model_context, self.__wlst_mode, version, None)
         else:
             self.__aliases = Aliases(model_context)
 
@@ -526,26 +530,25 @@ def _check_insert_attribute_model(self, location, model_section, attribute, inje
         _method_name = '_check_insert_attribute_model'
         if attribute not in model_section and (FORCE in injector_values and Boolean(injector_values[FORCE])):
             value = self.__aliases.get_model_attribute_default_value(location, attribute)
-            # This is the best I can do - need a get_default_value_model function(location, attribute)
-            __, wlst_value = self.__aliases.get_wlst_attribute_name_and_value(location, attribute, value)
-            _logger.fine('WLSDPLY-19540', attribute, location.get_folder_path(), wlst_value,
+            _logger.fine('WLSDPLY-19540', attribute, location.get_folder_path(), value,
                          class_name=_class_name, method_name=_method_name)
-            model_section[attribute] = wlst_value
+            model_section[attribute] = value
 
     def _check_replace_variable_value(self, location, attribute, variable_value, injector_values):
         _method_name = '_format_variable_value'
+        value = variable_value
         if VARIABLE_VALUE in injector_values:
             value = injector_values[VARIABLE_VALUE]
             # might add code to call a method to populate the replacement value
             try:
-                self.__aliases.get_wlst_attribute_name_and_value(location, attribute, value)
-                variable_value = value
+                wlst_attribute_name = self.__aliases.get_wlst_attribute_name(location, attribute)
+                __, value = self.__aliases.get_model_attribute_name_and_value(location, wlst_attribute_name, value)
                 _logger.fine('WLSDPLY-19542', value, variable_value, attribute, location.get_folder_path(),
                              class_name=_class_name, method_name=_method_name)
             except AliasException, ae:
                 _logger.warning('WLSDPLY-19541', value, attribute, location, ae.getLocalizedMessage(),
                                 class_name=_class_name, method_name=_method_name)
-        return variable_value
+        return value
 
 
 def get_default_variable_injector_file_name(variable_injector_file_name=VARIABLE_INJECTOR_FILE_NAME):

core/src/test/python/variable_injector_test.py

@@ -2,7 +2,6 @@
 Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved.
 The Universal Permissive License (UPL), Version 1.0
 """
-import os
 import unittest
 
 import wlsdeploy.util.variables as variables
@@ -156,10 +155,10 @@ def testWithSegmentInList(self):
             variable_injector.REGEXP] = [list_entry]
         actual = self._helper.inject_variables(replacement_dict)
         self._compare_to_expected_dictionary(expected, actual)
-        list = self._model['resources']['WLDFSystemResource']['MyWldfModule']['WLDFResource']['Harvester'][
+        wldf_list = self._model['resources']['WLDFSystemResource']['MyWldfModule']['WLDFResource']['Harvester'][
             'HarvestedType']['weblogic.management.runtime.ServerRuntimeMBean']['HarvestedAttribute']
         found = False
-        for entry in list:
+        for entry in wldf_list:
             if entry == '@@PROP:WLDFSystemResource.MyWldfModule.WLDFResource.Harvester.HarvestedType.' \
                         'weblogic.management.runtime.ServerRuntimeMBean.HarvestedAttribute@@':
                 found = True
@@ -179,11 +178,10 @@ def testWithSegmentInStringInList(self):
             variable_injector.REGEXP] = [list_entry]
         actual = self._helper.inject_variables(replacement_dict)
         self._compare_to_expected_dictionary(expected, actual)
-        list = \
-        self._model['resources']['WLDFSystemResource']['MyWldfModule']['WLDFResource']['Harvester']['HarvestedType'][
-            'weblogic.management.runtime.ServerRuntimeMBean']['HarvestedInstance']
+        wldf_list = self._model['resources']['WLDFSystemResource']['MyWldfModule']['WLDFResource']['Harvester'][
+            'HarvestedType']['weblogic.management.runtime.ServerRuntimeMBean']['HarvestedInstance']
         found = False
-        for entry in list:
+        for entry in wldf_list:
             if entry == 'com.bea:Name=@@PROP:WLDFSystemResource.MyWldfModule.WLDFResource.Harvester.HarvestedType.' \
                         'weblogic.management.runtime.ServerRuntimeMBean.HarvestedInstance--ManagedServer@@' \
                         ',Type=ServerRuntime':
@@ -246,7 +244,6 @@ def testWithVariableHelperKeywords(self):
         self.assertEqual(self._variable_file, variable_file_name)
         self.assertEqual(True, inserted)
         actual = variables.load_variables(self._variable_file)
-        print actual
         self._compare_to_expected_dictionary(expected, actual)
 
     def testForceAttribute(self):
@@ -260,6 +257,15 @@ def testForceAttribute(self):
         actual = self._helper.inject_variables(replacement_dict)
         self._compare_to_expected_dictionary(expected, actual)
 
+    def testForceAttributeWithTwoDefaults(self):
+        expected = dict()
+        expected['JMSSystemResource.MyJmsModule.JmsResource.Template.JmsTemplate.MaximumMessageSize'] = '0'
+        replacement_dict = dict()
+        replacement_dict['JMSSystemResource.JmsResource.Template.MaximumMessageSize'] = dict()
+        replacement_dict['JMSSystemResource.JmsResource.Template.MaximumMessageSize'][variable_injector.FORCE] = True
+        actual = self._helper.inject_variables(replacement_dict)
+        self._compare_to_expected_dictionary(expected, actual)
+
     def testReplaceVariableValueAttribute(self):
         expected = dict()
         expected[
@@ -272,6 +278,7 @@ def testReplaceVariableValueAttribute(self):
                          'JNDIProperty[java.naming.security.principal].Value'][
             variable_injector.VARIABLE_VALUE] = 'k8s'
         actual = self._helper.inject_variables(replacement_dict)
+        print actual
         self._compare_to_expected_dictionary(expected, actual)
 
     def testReplaceVariableValueSegmentInString(self):
@@ -283,8 +290,8 @@ def testReplaceVariableValueSegmentInString(self):
         list_entry = dict()
         list_entry[variable_injector.REGEXP_PATTERN] = '(?<=HOST=)[\w.-]+(?=\))'
         list_entry[variable_injector.REGEXP_SUFFIX] = 'Host'
-        replacement_dict['JDBCSystemResource[Database2].JdbcResource.JDBCDriverParams.URL'][variable_injector.REGEXP] = [
-            list_entry]
+        replacement_dict['JDBCSystemResource[Database2].JdbcResource.JDBCDriverParams.URL'][
+            variable_injector.REGEXP] = [list_entry]
         replacement_dict['JDBCSystemResource[Database2].JdbcResource.JDBCDriverParams.URL'][
             variable_injector.VARIABLE_VALUE] = 'den00chv'
         actual = self._helper.inject_variables(replacement_dict)

core/src/test/resources/variable_insertion.yaml

@@ -35,6 +35,8 @@ topology:
             SSL:
                 Enabled: true
                 ListenPort: 9004
+            DefaultFileStore:
+                InitialSize:  512
             ListenPort: 9003
         AdminServer:
             ListenAddress: 127.0.0.1
@@ -44,6 +46,13 @@ topology:
                 ListenPort: 9002
             ListenPort: 9001
 resources:
+    SelfTuning:
+        MaxThreadsConstraint:
+            ThreeMax:
+                Count: 3
+        WorkManager:
+            MaxThWM:
+                Target: mycluster
     MailSession:
         MyMailSession:
             Properties:
@@ -97,6 +106,9 @@ resources:
                                  Key: bar
                                  Value: True
                          JNDIPropertiesCredentialEncrypted: '--FIX ME--'
+                 Template:
+                     JmsTemplate:
+                         InsertionPausedAtStartup: true
     JDBCSystemResource:
         Database1:
             DescriptorFileName: 'jdbc/Database1-3195-jdbc.xml'