From b27d1492fdf9c61cea99049b6a5b918d16d2e771 Mon Sep 17 00:00:00 2001 From: Johnny Shum Date: Wed, 21 Apr 2021 16:12:29 -0500 Subject: [PATCH 1/2] This fixes the case when updating the rcu schema password in the model but at the same time there is a new datasource --- core/src/main/python/wlsdeploy/tool/util/rcu_helper.py | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/core/src/main/python/wlsdeploy/tool/util/rcu_helper.py b/core/src/main/python/wlsdeploy/tool/util/rcu_helper.py index ac17e41071..f85276f87e 100644 --- a/core/src/main/python/wlsdeploy/tool/util/rcu_helper.py +++ b/core/src/main/python/wlsdeploy/tool/util/rcu_helper.py @@ -54,6 +54,12 @@ def update_rcu_password(self): for ds_name in ds_names: location = deployer_utils.get_jdbc_driver_params_location(ds_name, self.aliases) password_location = LocationContext(location) + list_path = self.aliases.get_wlst_list_path(location) + if not self.wlst_helper.path_exists(list_path): + # For update case when a new custom data source has not be persisted + # the driver params location is just placeholder continue + # since we only care about stock datasource + continue wlst_path = self.aliases.get_wlst_attributes_path(location) self.wlst_helper.cd(wlst_path) From be1567d84778694eea561d72d9bf652a8dcfd0a8 Mon Sep 17 00:00:00 2001 From: Johnny Shum Date: Thu, 22 Apr 2021 09:57:27 -0500 Subject: [PATCH 2/2] fix comments --- core/src/main/python/wlsdeploy/tool/util/rcu_helper.py | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/core/src/main/python/wlsdeploy/tool/util/rcu_helper.py b/core/src/main/python/wlsdeploy/tool/util/rcu_helper.py index f85276f87e..814822948b 100644 --- a/core/src/main/python/wlsdeploy/tool/util/rcu_helper.py +++ b/core/src/main/python/wlsdeploy/tool/util/rcu_helper.py @@ -56,9 +56,11 @@ def update_rcu_password(self): password_location = LocationContext(location) list_path = self.aliases.get_wlst_list_path(location) if not self.wlst_helper.path_exists(list_path): - # For update case when a new custom data source has not be persisted - # the driver params location is just placeholder continue - # since we only care about stock datasource + # For update case when a new custom data source has not been persisted, + # the driver params location is just a placeholder and will result in error + # if we try to get the attribute list from the location. + # Since we only care about rcu stock data sources from the template for changing + # rcu schema password; we can skip for any new custom data source. continue wlst_path = self.aliases.get_wlst_attributes_path(location)