Add support for Embedded LDAP server configuration in the model topology section (#438)

* Add the EmbbeddedLDAPMBean alias definition

* Enable use of EmbbeddedLDAP in the topology section

* Add support for EmbeddedLDAP model discovery

Author: TheFrogPad

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

@@ -77,6 +77,7 @@ class AliasEntries(object):
         'Cluster': 'Cluster',
         'CoherenceClusterSystemResource': 'CoherenceClusterSystemResource',
         'Domain': 'Domain',
+        'EmbeddedLDAP': 'EmbeddedLDAP',
         'FileStore': 'FileStore',
         'ForeignJNDIProvider': 'ForeignJNDIProvider',
         'JDBCStore': 'JDBCStore',
@@ -124,6 +125,7 @@ class AliasEntries(object):
     __topology_top_level_folders = [
         'AdminConsole',
         'Cluster',
+        'EmbeddedLDAP',
         'JMX',
         'JTA',
         'Log',

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

@@ -69,6 +69,7 @@
 CPU_UTILIZATION = 'CpuUtilization'
 CREATE_TABLE_DDL_FILE = 'CreateTableDDLFile'
 CREDENTIAL = 'Credential'
+CREDENTIAL_ENCRYPTED = 'CredentialEncrypted'
 CREDENTIAL_MAPPER = 'CredentialMapper'
 CUSTOM_DBMS_AUTHENTICATOR = 'CustomDBMSAuthenticator'
 DATA_SOURCE = 'DataSource'
@@ -94,6 +95,7 @@
 DOMAIN_INFO = 'domainInfo'
 DOMAIN_LIBRARIES = 'domainLibraries'
 DYNAMIC_SERVERS = 'DynamicServers'
+EMBEDDED_LDAP = 'EmbeddedLDAP'
 ERROR_DESTINATION = 'ErrorDestination'
 EXECUTE_QUEUE = 'ExecuteQueue'
 EXPRESSION = 'Expression'

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

@@ -82,6 +82,9 @@ def discover(self):
         model_top_folder_name, security_configuration = self.discover_security_configuration()
         discoverer.add_to_model_if_not_empty(self._dictionary, model_top_folder_name, security_configuration)
 
+        model_top_folder_name, embedded_ldap_configuration = self.get_embedded_ldap_configuration()
+        discoverer.add_to_model_if_not_empty(self._dictionary, model_top_folder_name, embedded_ldap_configuration)
+
         _logger.exiting(class_name=_class_name, method_name=_method_name)
         return self._dictionary
 
@@ -304,6 +307,31 @@ def discover_security_configuration(self):
         _logger.exiting(class_name=_class_name, method_name=_method_name)
         return model_top_folder_name, result
 
+    def get_embedded_ldap_configuration(self):
+        """
+        Get the Embedded LDAP server configuration for the domain and only return the configuration
+        when there are non-default settings other than the credential value.
+        :return: name for the model:dictionary containing the discovered Embedded LDAP configuration
+        """
+        _method_name = 'get_embedded_ldap_configuration'
+        _logger.entering(class_name=_class_name, method_name=_method_name)
+        result = OrderedDict()
+        model_top_folder_name = model_constants.EMBEDDED_LDAP
+        location = LocationContext(self._base_location)
+        location.append_location(model_top_folder_name)
+        embedded_ldap_configuration = self._find_singleton_name_in_folder(location)
+        if embedded_ldap_configuration is not None:
+            location.add_name_token(self._alias_helper.get_name_token(location), embedded_ldap_configuration)
+            self._populate_model_parameters(result, location)
+            # IFF credential is the only attribute, skip adding the Embedded LDAP server configuration
+            if len(result) == 1 and model_constants.CREDENTIAL_ENCRYPTED in result:
+                result = OrderedDict()
+                _logger.info('WLSDPLY-06639', class_name=_class_name, method_name=_method_name)
+            else:
+                _logger.info('WLSDPLY-06640', class_name=_class_name, method_name=_method_name)
+        _logger.exiting(class_name=_class_name, method_name=_method_name)
+        return model_top_folder_name, result
+
     # Private methods
 
     def _get_admin_console(self):

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

@@ -0,0 +1,27 @@
+{
+    "copyright": "Copyright (c) 2019, Oracle and/or its affiliates. All rights reserved.",
+    "license": "The Universal Permissive License (UPL), Version 1.0",
+    "wlst_type": "EmbeddedLDAP",
+    "child_folders_type": "single_unpredictable",
+    "default_name_value": "%DOMAIN%",
+    "folders": {},
+    "attributes": {
+        "AnonymousBindAllowed":    [ {"version": "[10,)", "wlst_mode": "both", "wlst_name": "AnonymousBindAllowed",    "wlst_path": "WP001", "value": {"default": "false" }, "wlst_type": "boolean"   } ],
+        "BackupCopies":            [ {"version": "[10,)", "wlst_mode": "both", "wlst_name": "BackupCopies",            "wlst_path": "WP001", "value": {"default": 7       }, "wlst_type": "integer"   } ],
+        "BackupHour":              [ {"version": "[10,)", "wlst_mode": "both", "wlst_name": "BackupHour",              "wlst_path": "WP001", "value": {"default": 23      }, "wlst_type": "integer"   } ],
+        "BackupMinute":            [ {"version": "[10,)", "wlst_mode": "both", "wlst_name": "BackupMinute",            "wlst_path": "WP001", "value": {"default": 5       }, "wlst_type": "integer"   } ],
+        "CacheEnabled":            [ {"version": "[10,)", "wlst_mode": "both", "wlst_name": "CacheEnabled",            "wlst_path": "WP001", "value": {"default": "true"  }, "wlst_type": "boolean"   } ],
+        "CacheSize":               [ {"version": "[10,)", "wlst_mode": "both", "wlst_name": "CacheSize",               "wlst_path": "WP001", "value": {"default": 32      }, "wlst_type": "integer"   } ],
+        "CacheTTL":                [ {"version": "[10,)", "wlst_mode": "both", "wlst_name": "CacheTTL",                "wlst_path": "WP001", "value": {"default": 60      }, "wlst_type": "integer"   } ],
+        "CredentialEncrypted":     [ {"version": "[10,)", "wlst_mode": "both", "wlst_name": "CredentialEncrypted",     "wlst_path": "WP001", "value": {"default": "None"  }, "wlst_type": "password", "get_method": "GET" } ],
+        "KeepAliveEnabled":        [ {"version": "[10,)", "wlst_mode": "both", "wlst_name": "KeepAliveEnabled",        "wlst_path": "WP001", "value": {"default": "false" }, "wlst_type": "boolean"   } ],
+        "MasterFirst":             [ {"version": "[10,)", "wlst_mode": "both", "wlst_name": "MasterFirst",             "wlst_path": "WP001", "value": {"default": "false" }, "wlst_type": "boolean"   } ],
+        "Notes":                   [ {"version": "[10,)", "wlst_mode": "both", "wlst_name": "Notes",                   "wlst_path": "WP001", "value": {"default": "None"  }, "wlst_type": "string"    } ],
+        "RefreshReplicaAtStartup": [ {"version": "[10,)", "wlst_mode": "both", "wlst_name": "RefreshReplicaAtStartup", "wlst_path": "WP001", "value": {"default": "false" }, "wlst_type": "boolean"   } ],
+        "Timeout":                 [ {"version": "[10,)", "wlst_mode": "both", "wlst_name": "Timeout",                 "wlst_path": "WP001", "value": {"default": 0       }, "wlst_type": "integer"   } ]
+    },
+    "wlst_attributes_path": "WP001",
+    "wlst_paths": {
+        "WP001": "/EmbeddedLDAP/%EMBEDDED_LDAP%"
+    }
+}

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

@@ -695,6 +695,8 @@ WLSDPLY-06635=Adding XML Registry {0}
 WLSDPLY-06636=Adding keystore file {0} for node manager to archive file
 WLSDPLY-06637=Unable to locate and add node manager keystore file {0} to the archive file : {1}
 WLSDPLY-06638=Unexpected exception attempting to add node manager keystore file {0} to the archive : {1}
+WLSDPLY-06639=Skipping Embedded LDAP Server Configuration
+WLSDPLY-06640=Adding Embedded LDAP Server Configuration
 
 # multi_tenant_discoverer.py, multi_tenant_resources_dsi
 WLSDPLY-06700=Discover Multi-tenant