Skip to content

Commit b8e06ec

Browse files
JIRA WDT-47 Remove unused security configuration check methods
1 parent 84f9a35 commit b8e06ec

File tree

4 files changed

+0
-65
lines changed

4 files changed

+0
-65
lines changed

core/src/main/python/wlsdeploy/aliases/alias_entries.py

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -198,11 +198,6 @@ def __init__(self, wlst_mode=WlstModes.OFFLINE, wls_version=None):
198198
self._wls_helper = WebLogicHelper(_logger, wls_version)
199199
self._wls_version = wls_version
200200

201-
if self._wlst_mode == WlstModes.OFFLINE:
202-
self._requires_security_provider_rename = \
203-
self._wls_helper.requires_security_provider_rename_in_offline_mode()
204-
else:
205-
self._requires_security_provider_rename = False
206201
return
207202

208203
def get_dictionary_for_location(self, location, resolve=True):
@@ -664,9 +659,6 @@ def get_wlst_mbean_type_for_location(self, location):
664659
wlst_type = None
665660
elif WLST_TYPE in folder_dict:
666661
wlst_type = folder_dict[WLST_TYPE]
667-
if self._requires_security_provider_rename and alias_utils.is_security_provider_location(location) and \
668-
wlst_type in SECURITY_PROVIDER_NAME_MAP:
669-
wlst_type = SECURITY_PROVIDER_NAME_MAP[wlst_type]
670662
else:
671663
ex = exception_helper.create_alias_exception('WLSDPLY-08106', location.get_folder_path(), WLST_TYPE)
672664
_logger.throwing(ex, class_name=_class_name, method_name=_method_name)

core/src/main/python/wlsdeploy/tool/create/domain_creator.py

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -120,15 +120,6 @@ def __init__(self, model_dictionary, model_context, aliases):
120120
self.target_helper = TargetHelper(self.model, self.model_context, self.aliases, ExceptionType.CREATE,
121121
self.logger)
122122

123-
#
124-
# Creating domains with the wls.jar template is busted for pre-12.1.2 domains with regards to the
125-
# names of the default authentication providers (both the DefaultAuthenticator and the
126-
# DefaultIdentityAsserter names are 'Provider', making it impossible to work with in WLST. If
127-
# the WLS version is earlier than fix this as part of domain creation...
128-
#
129-
self.__fix_default_authentication_provider_names = \
130-
self.wls_helper.do_default_authentication_provider_names_need_fixing()
131-
132123
#
133124
# This list gets modified as the domain is being created so do use this list for anything else...
134125
#

core/src/main/python/wlsdeploy/tool/create/security_provider_creator.py

Lines changed: 0 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@
99
from wlsdeploy.tool.create.creator import Creator
1010
from wlsdeploy.tool.deploy import deployer_utils
1111
from wlsdeploy.util import dictionary_utils
12-
import oracle.weblogic.deploy.util.WebLogicDeployToolingVersion as WDTVersion
1312

1413

1514
class SecurityProviderCreator(Creator):
@@ -126,17 +125,3 @@ def __get_default_realm_location(self):
126125
wlst_attribute_path = self.alias_helper.get_wlst_attributes_path(location)
127126
self.wlst_helper.cd(wlst_attribute_path)
128127
return location, default_security_realm_name
129-
130-
def _configure_security_configuration(self):
131-
"""
132-
Keep this method in case we need to configure non-support.
133-
134-
:return: True if can configure the SecurityConfiguration mbean
135-
"""
136-
_method_name = '_configure_security_configuration'
137-
if not self.wls_helper.is_configure_security_configuration_supported():
138-
# Do we bypass or end the update ?
139-
self.logger.warning('WLSDPLY-12232', self.wls_helper.get_weblogic_version(),
140-
WDTVersion.getVersion(), class_name=self.__class_name, method_name=_method_name)
141-
return False
142-
return True

core/src/main/python/wlsdeploy/util/weblogic_helper.py

Lines changed: 0 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -65,19 +65,6 @@ def is_mt_offline_provisioning_supported(self):
6565
"""
6666
return self.is_weblogic_version_or_above('12.2.1.1') or not self.is_weblogic_version_or_above('12.2.1')
6767

68-
def do_default_authentication_provider_names_need_fixing(self):
69-
return not self.is_weblogic_version_or_above('12.1.2')
70-
71-
def provider_type_has_problem_default_provider_name(self, provider_name_list):
72-
"""
73-
The 11g default providers installed with the weblogic template have no name. In online wlst, the correct
74-
default name is stored in the mbean when it is instantiated. In offline wlst, the name 'Provider' is
75-
returned. Return True if the 'Provider' string is found in the security provider name list,
76-
:param provider_name_list: list of the provider names for a security provider type
77-
:return: True if an invalid name was found in the provider_name_list
78-
"""
79-
return self.do_default_authentication_provider_names_need_fixing() and 'Provider' in provider_name_list
80-
8168
def is_select_template_supported(self):
8269
"""
8370
Is selectTemplate() supported in this version of WLST?
@@ -143,26 +130,6 @@ def get_default_security_realm_name(self):
143130
"""
144131
return 'myrealm'
145132

146-
def requires_security_provider_rename_in_offline_mode(self):
147-
"""
148-
In older versions of WLST offline, creating security providers required the full
149-
provider class name.
150-
:return: whether or not the full provider class name is required in WLST offline
151-
"""
152-
if self.is_weblogic_version_or_above('12.1.2'):
153-
result = False
154-
else:
155-
result = True
156-
return result
157-
158-
def is_configure_security_configuration_supported(self):
159-
"""
160-
In the current release, configuring the SecurityConfiguration is not supported in 11g. There is
161-
no successful way to remove or reorder providers in the default realm. Will be investigated further.
162-
:return: True if can configure the security configuration with the model
163-
"""
164-
return self.is_weblogic_version_or_above('12.1.2')
165-
166133
# This method should be deleted once all of the old code is converted to the new model.
167134
def get_wlst_exception_content(self, message):
168135
"""

0 commit comments

Comments
 (0)