Merge pull request #325 from oracle/issue-298-admin-console-alias

Issue #298 - Add admin console alias for discover, create, update

Author: CarolynRountree

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

@@ -72,6 +72,7 @@ class AliasEntries(object):
     __domain_category = 'Domain'
 
     __model_categories_map = {
+        'AdminConsole': 'AdminConsole',
         'Application': 'AppDeployment',
         'Cluster': 'Cluster',
         'CoherenceClusterSystemResource': 'CoherenceClusterSystemResource',
@@ -121,6 +122,7 @@ class AliasEntries(object):
     }
 
     __topology_top_level_folders = [
+        'AdminConsole',
         'Cluster',
         'JMX',
         'JTA',

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

@@ -11,6 +11,7 @@
 
 ACTIVE_DIRECTORY_AUTHENTICATOR = 'ActiveDirectoryAuthenticator'
 ADJUDICATOR = 'Adjudicator'
+ADMIN_CONSOLE = 'AdminConsole'
 ADMIN_PASSWORD = 'AdminPassword'
 ADMIN_SERVER_NAME = 'AdminServerName'
 ADMIN_USERNAME = 'AdminUserName'

core/src/main/python/wlsdeploy/tool/deploy/topology_updater.py

@@ -3,6 +3,7 @@
 The Universal Permissive License (UPL), Version 1.0
 """
 from wlsdeploy.aliases.location_context import LocationContext
+from wlsdeploy.aliases.model_constants import ADMIN_CONSOLE
 from wlsdeploy.aliases.model_constants import CLUSTER
 from wlsdeploy.aliases.model_constants import DOMAIN_NAME
 from wlsdeploy.aliases.model_constants import MACHINE
@@ -87,6 +88,7 @@ def update(self):
         # set the domain attributes
         self._set_domain_attributes()
 
+        self._process_section(self._topology, folder_list, ADMIN_CONSOLE, location)
         self._process_section(self._topology, folder_list, MACHINE, location)
         self._process_section(self._topology, folder_list, UNIX_MACHINE, location)
 

core/src/main/python/wlsdeploy/tool/discover/topology_discoverer.py

@@ -256,6 +256,8 @@ def discover_domain_parameters(self):
         location = LocationContext(self._base_location)
         self._populate_model_parameters(self._dictionary, location)
 
+        model_folder_name, folder_result = self._get_admin_console()
+        discoverer.add_to_model_if_not_empty(self._dictionary, model_folder_name, folder_result)
         model_folder_name, folder_result = self._get_jta()
         discoverer.add_to_model_if_not_empty(self._dictionary, model_folder_name, folder_result)
         model_folder_name, folder_result = self._get_jmx()
@@ -304,6 +306,25 @@ def discover_security_configuration(self):
 
     # Private methods
 
+    def _get_admin_console(self):
+        """
+        Discover the domain level admin console configuration attributes.
+        :return: model name for JTA:dictionary containing the discovered JTA attributes
+        """
+        _method_name = '_get_admin_console'
+        _logger.entering(class_name=_class_name, method_name=_method_name)
+        model_top_folder_name = model_constants.ADMIN_CONSOLE
+        result = OrderedDict()
+        location = LocationContext(self._base_location)
+        location.append_location(model_top_folder_name)
+        name = self._find_singleton_name_in_folder(location)
+        if name is not None:
+            _logger.info('WLSDPLY-06613', class_name=_class_name, method_name=_method_name)
+            location.add_name_token(self._alias_helper.get_name_token(location), name)
+            self._populate_model_parameters(result, location)
+        _logger.exiting(class_name=_class_name, method_name=_method_name)
+        return model_top_folder_name, result
+
     def _get_jta(self):
         """
         Discover the domain level JTA configuration attributes.

core/src/main/resources/oracle/weblogic/deploy/aliases/category_modules/AdminConsole.json

@@ -0,0 +1,20 @@
+{
+    "copyright": "Copyright (c) 2019, Oracle and/or its affiliates. All rights reserved.",
+    "license": "The Universal Permissive License (UPL), Version 1.0",
+    "wlst_type": "AdminConsole",
+    "child_folders_type": "single_unpredictable",
+    "default_name_value": "${NO_NAME_0:%DOMAIN%}",
+    "folders": {},
+    "attributes": {
+        "CookieName":             [ {"version": "[10,)",       "wlst_mode": "both", "wlst_name": "CookieName",                 "wlst_path": "WP001", "value": {"default": "ADMINCONSOLESESSION" }, "wlst_type": "string"  } ],
+        "MinThreads":             [ {"version": "[12.2.1.1,)", "wlst_mode": "both", "wlst_name": "MinThreads",                 "wlst_path": "WP001", "value": {"default": 101                   }, "wlst_type": "integer" } ],
+        "Notes":                  [ {"version": "[10,)",       "wlst_mode": "both", "wlst_name": "Notes",                      "wlst_path": "WP001", "value": {"default": "None"                }, "wlst_type": "string"  } ],
+        "ProtectedCookieEnabled": [ {"version": "[12.2.1,)",   "wlst_mode": "both", "wlst_name": "ProtectedCookieEnabled",     "wlst_path": "WP001", "value": {"default": true                  }, "wlst_type": "boolean" } ],
+        "SsoLogoutUrl":           [ {"version": "[12.1.2,)",   "wlst_mode": "both", "wlst_name": "${Sso:SSO}Logout${Url:URL}", "wlst_path": "WP001", "value": {"default": "None"                }, "wlst_type": "string"  } ],
+        "SessionTimeout":         [ {"version": "[10,)",       "wlst_mode": "both", "wlst_name": "SessionTimeout",             "wlst_path": "WP001", "value": {"default": 3600                  }, "wlst_type": "integer" } ]
+    },
+    "wlst_attributes_path": "WP001",
+    "wlst_paths": {
+        "WP001": "/AdminConsole/%ADMINCONSOLE%"
+    }
+}

core/src/main/resources/oracle/weblogic/deploy/messages/wlsdeploy_rb.properties

@@ -607,7 +607,7 @@ WLSDPLY-06609=Discovering {0} Unix machines
 WLSDPLY-06610=Adding Unix Machine {0}
 WLSDPLY-06611=Discovering {0} machines
 WLSDPLY-06612=Adding Machine {0}
-
+WLSDPLY-06613=Adding Domain AdminConsole
 WLSDPLY-06614=Adding Domain JTA
 WLSDPLY-06615=Adding Domain JMX
 WLSDPLY-06616=Adding Domain RestfulManagementServices