Skip to content

work around for missing trust service identity asserter schematype ja… #1439

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 2 commits into from
Mar 31, 2023
Merged

work around for missing trust service identity asserter schematype ja… #1439

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5474abf
work around for missing trust service identity asserter schematype ja…
CarolynRountree Mar 31, 2023
541aee5
system test was running without schema file. Change expected return code
CarolynRountree Mar 31, 2023
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
7 changes: 6 additions & 1 deletion core/src/main/python/wlsdeploy/tool/discover/discoverer.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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(),
Expand Down
8 changes: 4 additions & 4 deletions integration-tests/system-test/src/test/java/oracle/weblogic/deploy/integration/ITWdt.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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());
Expand Down Expand Up @@ -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());
Expand Down Expand Up @@ -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());
Expand Down Expand Up @@ -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());
Expand Down