Merge branch 'optional-feature-deployment' into 'main'

adding support for the OptionalFeatureDeployment top-level folder

See merge request weblogic-cloud/weblogic-deploy-tooling!1664

Author: robertpatrick

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

@@ -143,6 +143,7 @@ class AliasEntries(object):
         'MessagingBridge',
         ODL_CONFIGURATION,
         OHS,
+        'OptionalFeatureDeployment',
         'Partition',
         'PartitionWorkManager',
         'PathService',

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

@@ -207,6 +207,8 @@
 # deprecated field name in 4.0
 OPSS_SECRETS = 'OPSSSecrets'
 OPSS_WALLET_PASSPHRASE = 'OPSSWalletPassphrase'
+OPTIONAL_FEATURE = 'OptionalFeature'
+OPTIONAL_FEATURE_DEPLOYMENT = 'OptionalFeatureDeployment'
 ORACLE_DATABASE_CONNECTION_TYPE = 'oracle_database_connection_type'
 ORACLE_OID_AUTHENTICATOR = 'OracleInternetDirectoryAuthenticator'
 ORACLE_OUD_AUTHENTICATOR = 'OracleUnifiedDirectoryAuthenticator'

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

@@ -57,6 +57,8 @@ def discover(self):
         discoverer.add_to_model_if_not_empty(self._dictionary, model_top_folder_name, jolt_pools)
         model_top_folder_name, wtc_servers = self.get_wtc_servers()
         discoverer.add_to_model_if_not_empty(self._dictionary, model_top_folder_name, wtc_servers)
+        model_top_folder_name, optional_feature_deployment = self.get_optional_feature_deployment()
+        discoverer.add_to_model_if_not_empty(self._dictionary, model_top_folder_name, optional_feature_deployment)
 
         _logger.exiting(class_name=_class_name, method_name=_method_name)
         return self._dictionary
@@ -147,15 +149,15 @@ def get_webapp_container(self):
         Discover the WebAppContainer global resource settings
         :return: model name for the folder: dictionary containing the discovered WebAppContainer
         """
-        _method_name = '_get_webapp_container'
+        _method_name = 'get_webapp_container'
         _logger.entering(class_name=_class_name, method_name=_method_name)
         model_top_folder_name = model_constants.WEBAPP_CONTAINER
         result = OrderedDict()
         location = LocationContext(self._base_location)
         location.append_location(model_top_folder_name)
         webapp_container = self._find_singleton_name_in_folder(location)
         if webapp_container is not None:
-            _logger.info('WLSDPLY-06615', class_name=_class_name, method_name=_method_name)
+            _logger.info('WLSDPLY-06676', class_name=_class_name, method_name=_method_name)
             location.add_name_token(self._aliases.get_name_token(location), webapp_container)
             self._populate_model_parameters(result, location)
             self._discover_subfolders(result, location)
@@ -287,3 +289,24 @@ def get_wtc_servers(self):
 
         _logger.exiting(class_name=_class_name, method_name=_method_name, result=result)
         return model_top_folder_name, result
+
+    def get_optional_feature_deployment(self):
+        """
+        Discover the OptionalFeatureDeployment global resource settings
+        :return: model name for the folder: dictionary containing the discovered OptionalFeatureDeployment
+        """
+        _method_name = 'get_optional_feature_deployment'
+        _logger.entering(class_name=_class_name, method_name=_method_name)
+        model_top_folder_name = model_constants.OPTIONAL_FEATURE_DEPLOYMENT
+        result = OrderedDict()
+        location = LocationContext(self._base_location)
+        location.append_location(model_top_folder_name)
+        optional_feature_deployment = self._find_singleton_name_in_folder(location)
+        if optional_feature_deployment is not None:
+            _logger.info('WLSDPLY-06677', class_name=_class_name, method_name=_method_name)
+            location.add_name_token(self._aliases.get_name_token(location), optional_feature_deployment)
+            self._populate_model_parameters(result, location)
+            self._discover_subfolders(result, location)
+
+        _logger.exiting(class_name=_class_name, method_name=_method_name, result=model_top_folder_name)
+        return model_top_folder_name, result

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

@@ -0,0 +1,31 @@
+{
+  "copyright": "Copyright (c) 2024, Oracle Corporation and/or its affiliates.",
+  "license": "Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl",
+  "wlst_type": "OptionalFeatureDeployment",
+  "online_bean": "weblogic.management.configuration.OptionalFeatureDeploymentMBean",
+  "version": "[12.2.1,)",
+  "default_name_value": "${NO_NAME_0:%DOMAIN%}",
+  "folders": {
+    "OptionalFeature": {
+      "wlst_type": "OptionalFeature${:s}",
+      "online_bean": "weblogic.management.configuration.OptionalFeatureMBean",
+      "child_folders_type": "multiple",
+      "folders": {},
+      "attributes": {
+        "Enabled":  [ {"version": "[12.2.1,)", "wlst_mode": "both", "wlst_name": "Enabled", "wlst_path": "WP001", "default_value": false,  "wlst_type": "boolean" } ],
+        "Notes":    [ {"version": "[12.2.1,)", "wlst_mode": "both", "wlst_name": "Notes",   "wlst_path": "WP001", "default_value": null,   "wlst_type": "string"  } ]
+      },
+      "wlst_attributes_path": "WP001",
+      "wlst_paths": {
+        "WP001": "/OptionalFeatureDeployment/%OPTIONALFEATUREDEPLOYMENT%/OptionalFeature${:s}/%OPTIONALFEATURE%"
+      }
+    }
+  },
+  "attributes": {
+    "Notes":        [ {"version": "[12.2.1,)", "wlst_mode": "both", "wlst_name": "Notes",   "wlst_path": "WP001", "default_value": null, "wlst_type": "string"    } ]
+  },
+  "wlst_attributes_path": "WP001",
+  "wlst_paths": {
+    "WP001": "/OptionalFeatureDeployment/%OPTIONALFEATUREDEPLOYMENT%"
+  }
+}

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

@@ -1092,6 +1092,9 @@ WLSDPLY-06673=Skipping {0} Callout {1}
 WLSDPLY-06674=Unable to locate and add CreateTableDDLFile {0} for {1} {2} to the archive file: {3}.  The \
   CreateTableDDLFile attribute for {1} {2} has also been removed from the model.
 WLSDPLY-06675=Failed to add CreateTableDDLFile {0} for {1} {2} to the archive file: {3}
+WLSDPLY-06676=Discovering WebAppContainer
+WLSDPLY-06677=Discovering OptionalFeatureDeployment
+
 
 
 # multi_tenant_discoverer.py, multi_tenant_resources_dsi