Skip to content

Compare model: compare property attributes correctly #801

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Dec 8, 2020
Merged

Compare model: compare property attributes correctly #801

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
29 changes: 22 additions & 7 deletions core/src/main/python/compare_model.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,7 @@
import oracle.weblogic.deploy.util.TranslateException as TranslateException
from wlsdeploy.aliases import alias_utils
from wlsdeploy.aliases.alias_constants import ALIAS_LIST_TYPES
from wlsdeploy.aliases.alias_constants import PROPERTIES
from wlsdeploy.aliases.aliases import Aliases
from wlsdeploy.aliases.location_context import LocationContext
from wlsdeploy.aliases.model_constants import KUBERNETES
Expand Down Expand Up @@ -253,15 +254,18 @@ def calculate_changed_model(self):

def _parse_change_path(self, path):
"""
Determine the location and attribute name (if specified) for the specified change path
Determine the location and attribute name (if specified) for the specified change path.
Include a property key for property attribute paths.
:param path: delimited change path, such as "resources|JDBCSystemResource|Generic2|JdbcResource"
:return: tuple - location for path, attribute name from path or None
:return: tuple - (location from path, attribute name from path, property key from path)
"""
_method_name = '_parse_change_path'

location = LocationContext()
attribute_name = None
property_key = None
name_token_next = False
property_key_next = False

path_tokens = path.split(PATH_TOKEN)
folder_names = self.aliases.get_model_section_top_level_folder_names(path_tokens[0])
Expand All @@ -279,6 +283,8 @@ def _parse_change_path(self, path):
token_name = self.aliases.get_name_token(location)
location.add_name_token(token_name, path_token)
name_token_next = False
elif property_key_next:
property_key = path_token
elif path_token in folder_names:
location.append_location(path_token)
folder_names = self.aliases.get_model_subfolder_names(location)
Expand All @@ -294,13 +300,16 @@ def _parse_change_path(self, path):
location.add_name_token(token_name, "TOKEN")
elif path_token in attribute_names:
attribute_name = path_token
attribute_type = self.aliases.get_model_attribute_type(location, attribute_name)
if attribute_type == PROPERTIES:
property_key_next = True
name_token_next = False
else:
ex = exception_helper.create_compare_exception('WLSDPLY-05712', path_token, path)
_logger.throwing(ex, class_name=_class_name, method_name=_method_name)
raise ex

return location, attribute_name
return location, attribute_name, property_key

def _add_results(self, change_paths, is_delete=False):
"""
Expand All @@ -312,7 +321,7 @@ def _add_results(self, change_paths, is_delete=False):
for change_path in change_paths:
# change_path is the keys of changes in the piped format, such as:
# resources|JDBCSystemResource|Generic2|JdbcResource|JDBCConnectionPoolParams|TestConnectionsOnReserve
location, attribute_name = self._parse_change_path(change_path)
location, attribute_name, property_key = self._parse_change_path(change_path)
is_folder_path = attribute_name is None

if is_delete and not is_folder_path:
Expand Down Expand Up @@ -361,10 +370,13 @@ def _add_results(self, change_paths, is_delete=False):
if current_folder:
current_value = current_folder[key]
previous_value = dictionary_utils.get_element(previous_folder, key)
change_value, comment = self._get_change_info(current_value, previous_value, location, attribute_name)
change_value, comment = self._get_change_info(current_value, previous_value, location, attribute_name,
property_key)

if comment:
change_folder[COMMENT_MATCH] = comment
# make comment key unique, key will not appear in output
comment_key = COMMENT_MATCH + comment
change_folder[comment_key] = comment
change_folder[key] = change_value
else:
change_folder[key] = None
Expand Down Expand Up @@ -397,13 +409,14 @@ def _add_results(self, change_paths, is_delete=False):
else:
pointer_dict[parent_key]['!' + app_key] = PyOrderedDict()

def _get_change_info(self, current_value, previous_value, location, attribute_name):
def _get_change_info(self, current_value, previous_value, location, attribute_name, property_key):
"""
Determine the value and comment to put in the change model based on the supplied arguments.
:param current_value: the current value from the new model
:param previous_value: the previous value from the old model
:param location: the location of the value in the model
:param attribute_name: the name of the attribute, or None if this is a folder path
:param property_key: a key in a property value, or None if a different type
:return: a tuple with the change value and comment, either can be None
"""
change_value = current_value
Expand All @@ -430,6 +443,8 @@ def _get_change_info(self, current_value, previous_value, location, attribute_na
current_text = ','.join(current_list)
previous_text = ','.join(previous_list)
comment = attribute_name + ": '" + previous_text + "' -> '" + current_text + "'"
elif attribute_type == PROPERTIES:
comment = property_key + ": '" + str(previous_value) + "'"
elif not isinstance(previous_value, dict):
comment = attribute_name + ": '" + str(previous_value) + "'"

Expand Down
15 changes: 8 additions & 7 deletions core/src/test/python/compare_model_test.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -312,7 +312,7 @@ def testCompareModelFull2(self):

self.assertEqual(return_code, 0)

def _testCompareModelFull3(self):
def testCompareModelFull3(self):
_method_name = 'testCompareModelFull3'
# This test for
# 1. Changing MailSessionProperty
Expand All @@ -321,8 +321,8 @@ def _testCompareModelFull3(self):
# 4. Changing ODL Logger attributes

_variables_file = self._resources_dir + '/compare_model_model1.10.properties'
_new_model_file = self._resources_dir + '/compare_model_model7.yaml'
_old_model_file = self._resources_dir + '/compare_model_model6.yaml'
_new_model_file = self._resources_dir + '/compare_model_model8.yaml'
_old_model_file = self._resources_dir + '/compare_model_model7.yaml'
_temp_dir = os.path.join(tempfile.gettempdir(), _method_name)

if os.path.exists(_temp_dir):
Expand Down Expand Up @@ -359,10 +359,11 @@ def _testCompareModelFull3(self):
self.assertEqual(model_dictionary.has_key('resources'), True)
self.assertEqual(model_dictionary['resources'].has_key('MailSession'), True)
self.assertEqual(model_dictionary['resources']['MailSession'].has_key('MyMailSession'), True)
self.assertEqual(model_dictionary['resources']['MailSession']['MyMailSession'].has_key('mail.imap.port'),
True)
self.assertEqual(model_dictionary['resources']['MailSession']['MyMailSession']['mail.imap.port'], 993)
self.assertEqual(len(model_dictionary['resources']['MailSession']['MyMailSession']['mail.imap.port']), 1)

mail_session = model_dictionary['resources']['MailSession']['MyMailSession']
self.assertEqual(mail_session.has_key('Properties'), True)
self.assertEqual(mail_session['Properties'].has_key('mail.imap.port'), True)
self.assertEqual(mail_session['Properties']['mail.imap.port'], 993)

self.assertEqual(model_dictionary['resources'].has_key('ODLConfiguration'), True)
self.assertEqual(model_dictionary['resources']['ODLConfiguration'].has_key('config'), True)
Expand Down