From 5b7f82b42377d017471306a0c200657309758c1e Mon Sep 17 00:00:00 2001 From: Carolyn Rountree Date: Fri, 7 Oct 2022 17:08:17 -0500 Subject: [PATCH 1/2] Fix for flattened folders without tokens in location --- .../src/test/python/aliastest/verify/verifier_helper.py | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/alias-test/src/test/python/aliastest/verify/verifier_helper.py b/alias-test/src/test/python/aliastest/verify/verifier_helper.py index e817133018..e2b2c085e2 100644 --- a/alias-test/src/test/python/aliastest/verify/verifier_helper.py +++ b/alias-test/src/test/python/aliastest/verify/verifier_helper.py @@ -326,6 +326,11 @@ def verify_attributes(self, attributes, location): :param location: current location in aliases """ _method_name = 'verify_attributes' + flattened_info = self._helper.aliases().get_wlst_flattened_folder_info(location) + if flattened_info is not None: + path_token = flattened_info.get_path_token() + mbean_name = flattened_info.get_mbean_name() + location.add_name_token(path_token, mbean_name) model_name_map = self._model_attribute_map(location) _logger.fine('WLSDPLYST-01211', location.get_folder_path(), model_name_map, class_name=CLASS_NAME, method_name=_method_name) @@ -973,6 +978,9 @@ def check_dictionary_against_model_list(self, location, dictionary, folder_map): if flattened_info is not None: _logger.finer('WLSDPLYST-01203', location.get_folder_path(), class_name=CLASS_NAME, method_name=_method_name) + path_token = flattened_info.get_path_token() + mbean_name = flattened_info.get_mbean_name() + location.add_name_token(path_token, mbean_name) else: keys = folder_map.keys() lower_case_map = all_utils.get_lower_case_dict(dictionary.keys()) From cac39d8dd9bce6cedd73a77c1674b68bdcdb2af6 Mon Sep 17 00:00:00 2001 From: Carolyn Rountree Date: Tue, 15 Nov 2022 15:22:02 -0600 Subject: [PATCH 2/2] Missing argument in remote getkeystorearchivepath --- .../main/python/wlsdeploy/tool/discover/topology_discoverer.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/src/main/python/wlsdeploy/tool/discover/topology_discoverer.py b/core/src/main/python/wlsdeploy/tool/discover/topology_discoverer.py index d52ef9201b..51037057e7 100644 --- a/core/src/main/python/wlsdeploy/tool/discover/topology_discoverer.py +++ b/core/src/main/python/wlsdeploy/tool/discover/topology_discoverer.py @@ -841,7 +841,7 @@ def _add_server_keystore_file_to_archive(self, server_name, archive_file, file_p _logger.finer('WLSDPLY-06623', file_path, server_name, class_name=_class_name, method_name=_method_name) new_name = None if self._model_context.is_remote(): - new_name = archive_file.getServerKeyStoreArchivePath(file_path) + new_name = archive_file.getServerKeyStoreArchivePath(server_name, file_path) self.add_to_remote_map(file_path, new_name, WLSDeployArchive.ArchiveEntryType.SERVER_KEYSTORE.name()) elif not self._model_context.skip_archive():