From 5474abf5637fee8172affaae5430379385b1154c Mon Sep 17 00:00:00 2001 From: Carolyn Rountree Date: Fri, 31 Mar 2023 15:26:59 -0500 Subject: [PATCH 1/2] work around for missing trust service identity asserter schematype jar in discoverDomain --- core/src/main/python/wlsdeploy/tool/discover/discoverer.py | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/core/src/main/python/wlsdeploy/tool/discover/discoverer.py b/core/src/main/python/wlsdeploy/tool/discover/discoverer.py index 7e4b77daca..b68f5fdefd 100644 --- a/core/src/main/python/wlsdeploy/tool/discover/discoverer.py +++ b/core/src/main/python/wlsdeploy/tool/discover/discoverer.py @@ -454,7 +454,12 @@ def _discover_artificial_folder(self, model_subfolder_type, location, name_token location.add_name_token(name_token, name) massaged = self._inspect_artificial_folder_name(name, location) location.add_name_token(name_token, massaged) - artificial = self._get_artificial_type(location) + # circumventing problems if the trust identity asserter schematype jar + # is not in the oracle home. Force it to have the correct name. + if name == 'Trust Service Identity Asserter': + artificial = 'TrustServiceIdentityAsserter' + else: + artificial = self._get_artificial_type(location) if artificial is None: if self._aliases.is_custom_folder_allowed(location): _logger.fine('WLSDPLY-06148', model_subfolder_type, massaged, location.get_folder_path(), From 541aee57ceb015494d126dc468374754320cff80 Mon Sep 17 00:00:00 2001 From: Carolyn Rountree Date: Fri, 31 Mar 2023 16:29:58 -0500 Subject: [PATCH 2/2] system test was running without schema file. Change expected return code --- .../java/oracle/weblogic/deploy/integration/ITWdt.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/integration-tests/system-test/src/test/java/oracle/weblogic/deploy/integration/ITWdt.java b/integration-tests/system-test/src/test/java/oracle/weblogic/deploy/integration/ITWdt.java index 379cfcea88..8033f1d654 100644 --- a/integration-tests/system-test/src/test/java/oracle/weblogic/deploy/integration/ITWdt.java +++ b/integration-tests/system-test/src/test/java/oracle/weblogic/deploy/integration/ITWdt.java @@ -530,7 +530,7 @@ void test17DiscoverDomainWithRequiredArgument(TestInfo testInfo) throws Exceptio + " -domain_type RestrictedJRF"; CommandResult result = Runner.run(cmd, getTestMethodEnvironment(testInfo), out); // SecurityConfiguration warning - assertEquals(1, result.exitValue(), "Unexpected return code"); + assertEquals(0, result.exitValue(), "Unexpected return code"); // verify model file verifyModelFile(discoveredModel.toString()); @@ -569,7 +569,7 @@ void test18DiscoverDomainWithModelFile(TestInfo testInfo) throws Exception { try (PrintWriter out = getTestMethodWriter(testInfo)) { CommandResult result = Runner.run(cmd, getTestMethodEnvironment(testInfo), out); // SecurityConfiguration warning - assertEquals(1, result.exitValue(), "Unexpected return code"); + assertEquals(0, result.exitValue(), "Unexpected return code"); // verify model file verifyModelFile(discoveredModelFile.toString()); @@ -601,7 +601,7 @@ void test19DiscoverDomainWithVariableFile(TestInfo testInfo) throws Exception { try (PrintWriter out = getTestMethodWriter(testInfo)) { CommandResult result = Runner.run(cmd, getTestMethodEnvironment(testInfo), out); // SecurityConfiguration warning - assertEquals(1, result.exitValue(), "Unexpected return code"); + assertEquals(0, result.exitValue(), "Unexpected return code"); // verify model file and variable file verifyModelFile(discoveredModelFile.toString()); @@ -652,7 +652,7 @@ void test20DiscoverDomainJRFDomainType(TestInfo testInfo) throws Exception { CommandResult result = Runner.run(cmd, getTestMethodEnvironment(testInfo), out); // SecurityConfiguration warning - assertEquals(1, result.exitValue(), "Unexpected return code"); + assertEquals(0, result.exitValue(), "Unexpected return code"); // verify model file verifyModelFile(discoveredModelFile.toString());