diff --git a/core/src/main/python/wlsdeploy/aliases/alias_constants.py b/core/src/main/python/wlsdeploy/aliases/alias_constants.py index a080c5fea..da5edd62d 100644 --- a/core/src/main/python/wlsdeploy/aliases/alias_constants.py +++ b/core/src/main/python/wlsdeploy/aliases/alias_constants.py @@ -9,6 +9,7 @@ ACCESS = 'access' ATTRIBUTES = 'attributes' CHILD_FOLDERS_TYPE = 'child_folders_type' +COMMENT = 'comment' CONTAINS = 'contains' DEFAULT_NAME_VALUE = 'default_name_value' DEFAULT_VALUE = 'default_value' diff --git a/core/src/main/resources/oracle/weblogic/deploy/aliases/category_modules/Cluster.json b/core/src/main/resources/oracle/weblogic/deploy/aliases/category_modules/Cluster.json index ed8f798d0..a9c18b69f 100644 --- a/core/src/main/resources/oracle/weblogic/deploy/aliases/category_modules/Cluster.json +++ b/core/src/main/resources/oracle/weblogic/deploy/aliases/category_modules/Cluster.json @@ -157,6 +157,7 @@ "Notes": [ {"version": "[10,)", "wlst_mode": "both", "wlst_name": "Notes", "wlst_path": "WP001", "default_value": null, "wlst_type": "string" } ], "PanicAction": [ {"version": "[10,12.2.1)", "wlst_mode": "both", "wlst_name": "PanicAction", "wlst_path": "WP001", "default_value": "${__NULL__:no-action}", "derived_default": "${:true}", "wlst_type": "string" } , {"version": "[12.2.1,)", "wlst_mode": "both", "wlst_name": "PanicAction", "wlst_path": "WP001", "default_value": "${__NULL__:system-exit}", "derived_default": "${:true}", "wlst_type": "string" } ], + "ServerFailureTrigger": [ {"version": "[10,)", "wlst_mode": "online", "wlst_name": "ServerFailureTrigger", "wlst_path": "WP001", "default_value": null, "wlst_type": "string", "access": "IGNORED", "comment": "Appears in attribute list until ServerFailureTrigger folder is created"} ], "SharedCapacityForWorkManagers": [ {"version": "[10,)", "wlst_mode": "both", "wlst_name": "SharedCapacityForWorkManagers", "wlst_path": "WP001", "default_value": 65536, "derived_default": "${:true}", "wlst_type": "integer" } ] }, diff --git a/core/src/main/resources/oracle/weblogic/deploy/aliases/category_modules/Server.json b/core/src/main/resources/oracle/weblogic/deploy/aliases/category_modules/Server.json index e3fabcdc4..ec8b56021 100644 --- a/core/src/main/resources/oracle/weblogic/deploy/aliases/category_modules/Server.json +++ b/core/src/main/resources/oracle/weblogic/deploy/aliases/category_modules/Server.json @@ -438,6 +438,7 @@ "Notes": [ {"version": "[10,)", "wlst_mode": "both", "wlst_name": "Notes", "wlst_path": "WP001", "default_value": null, "wlst_type": "string" } ], "PanicAction": [ {"version": "[10,12.2.1)", "wlst_mode": "both", "wlst_name": "PanicAction", "wlst_path": "WP001", "default_value": "${__NULL__:no-action}", "derived_default": "${:true}", "wlst_type": "string" } , {"version": "[12.2.1,)", "wlst_mode": "both", "wlst_name": "PanicAction", "wlst_path": "WP001", "default_value": "${__NULL__:system-exit}", "derived_default": "${:true}", "wlst_type": "string" } ], + "ServerFailureTrigger": [ {"version": "[10,)", "wlst_mode": "online", "wlst_name": "ServerFailureTrigger", "wlst_path": "WP001", "default_value": null, "wlst_type": "string", "access": "IGNORED", "comment": "Appears in attribute list until ServerFailureTrigger folder is created"} ], "SharedCapacityForWorkManagers": [ {"version": "[10,)", "wlst_mode": "both", "wlst_name": "SharedCapacityForWorkManagers", "wlst_path": "WP001", "default_value": 65536, "derived_default": "${:true}", "wlst_type": "integer"} ] }, "wlst_attributes_path": "WP001", @@ -1015,6 +1016,7 @@ "PreferredStoreSizeLimit": [ {"version": "[10,)" , "wlst_mode": "both", "wlst_name": "PreferredStoreSizeLimit", "wlst_path": "WP001", "default_value": 100, "wlst_type": "integer"} ], "StoreSizeCheckPeriod": [ {"version": "[10,)" , "wlst_mode": "both", "wlst_name": "StoreSizeCheckPeriod", "wlst_path": "WP001", "default_value": 1, "wlst_type": "integer"} ], "SynchronousEventPersistenceEnabled": [ {"version": "[10,)" , "wlst_mode": "both", "wlst_name": "SynchronousEventPersistenceEnabled", "wlst_path": "WP001", "default_value": "false", "wlst_type": "boolean"} ], + "WLDFBuiltinSystemResourceDescriptorBean": [ {"version": "[12.1.2,)", "wlst_mode": "online", "wlst_name": "W${ldf:LDF}BuiltinSystemResourceDescriptorBean", "wlst_path": "WP001", "default_value": null, "wlst_type": "string", "access": "IGNORED", "comment": "Transient attribute for inaccessible WLDFBuiltinSystemResourceDescriptorBean folder" } ], "WldfBuiltinSystemResourceType": [ {"version": "[12.1.2,)", "wlst_mode": "both", "wlst_name": "W${ldf:LDF}BuiltinSystemResourceType", "wlst_path": "WP001", "default_value": "${__NULL__:None}", "production_default": "${__NULL__:Low}", "wlst_type": "string" } ], "WldfDiagnosticVolume": [ {"version": "[10,)" , "wlst_mode": "both", "wlst_name": "${Wldf:WLDF}DiagnosticVolume", "wlst_path": "WP001", "default_value": "${__NULL__:Low}", "wlst_type": "string" } ] }, @@ -1608,6 +1610,7 @@ "JMSThreadPoolSize": [ {"version": "[10,)", "wlst_mode": "both", "wlst_name": "JMSThreadPoolSize", "wlst_path": "WP001", "default_value": 15, "wlst_type": "integer", "get_method": "${LSA:GET}" } ], "JNDITransportableObjectFactoryList": [ {"version": "[10,)", "wlst_mode": "both", "wlst_name": "JNDITransportableObjectFactoryList", "wlst_path": "WP001", "default_value": null, "wlst_type": "jarray", "preferred_model_type": "delimited_string", "get_method": "GET" } ], "JRMPEnabled": [ {"version": "[10,)", "wlst_mode": "offline", "wlst_name": "JRMPEnabled", "wlst_path": "WP001", "default_value": "false", "wlst_type": "boolean", "get_method": "LSA"} ], + "JTAMigratableTarget": [ {"version": "[10,)", "wlst_mode": "online", "wlst_name": "JTAMigratableTarget", "wlst_path": "WP001", "default_value": null, "wlst_type": "string", "access": "IGNORED", "comment": "Appears in attribute list until JTAMigratableTarget folder is established"} ], "JavaCompiler": [ {"version": "[10,)", "wlst_mode": "both", "wlst_name": "JavaCompiler", "wlst_path": "WP001", "default_value": "javac", "wlst_type": "string" } ], "JavaCompilerPostClassPath": [ {"version": "[10,)", "wlst_mode": "both", "wlst_name": "JavaCompilerPostClassPath", "wlst_path": "WP001", "default_value": null, "wlst_type": "string" } ], "JavaCompilerPreClassPath": [ {"version": "[10,)", "wlst_mode": "both", "wlst_name": "JavaCompilerPreClassPath", "wlst_path": "WP001", "default_value": null, "wlst_type": "string" } ], diff --git a/core/src/main/resources/oracle/weblogic/deploy/aliases/category_modules/ServerTemplate.json b/core/src/main/resources/oracle/weblogic/deploy/aliases/category_modules/ServerTemplate.json index 04664d4b3..5287cb2c3 100644 --- a/core/src/main/resources/oracle/weblogic/deploy/aliases/category_modules/ServerTemplate.json +++ b/core/src/main/resources/oracle/weblogic/deploy/aliases/category_modules/ServerTemplate.json @@ -301,7 +301,7 @@ "LogMonitoringThrottleThreshold": [ {"version": "[12.2.1,)", "wlst_mode": "both", "wlst_name": "LogMonitoringThrottleThreshold", "wlst_path": "WP001", "default_value": 1500, "wlst_type": "integer"} ], "LoggerSeverity": [ {"version": "[12.1.2,)", "wlst_mode": "both", "wlst_name": "LoggerSeverity", "wlst_path": "WP001", "default_value": "${__NULL__:Info}", "wlst_type": "string" } ], "LoggerSeverityProperties": [ {"version": "[12.1.2,)", "wlst_mode": "both", "wlst_name": "LoggerSeverityProperties", "wlst_path": "WP001", "default_value": null, "wlst_type": "properties", "preferred_model_type": "dict", "get_method": "GET"} ], - "MemoryBufferFilter": [ {"version": "[12.1.2)", "wlst_mode": "both", "wlst_name": "MemoryBufferFilter", "wlst_path": "WP001", "default_value": null, "wlst_type": "string", "set_method": "MBEAN.set_log_filter_mbean", "set_mbean_type": "weblogic.management.configuration.LogFilterMBean" } ], + "MemoryBufferFilter": [ {"version": "[12.1.2,)", "wlst_mode": "both", "wlst_name": "MemoryBufferFilter", "wlst_path": "WP001", "default_value": null, "wlst_type": "string", "set_method": "MBEAN.set_log_filter_mbean", "set_mbean_type": "weblogic.management.configuration.LogFilterMBean" } ], "MemoryBufferSeverity": [ {"version": "[12.1.2,)", "wlst_mode": "both", "wlst_name": "MemoryBufferSeverity", "wlst_path": "WP001", "default_value": "${__NULL__:Trace}", "wlst_type": "string" } ], "MemoryBufferSize": [ {"version": "[12.1.2,)", "wlst_mode": "both", "wlst_name": "MemoryBufferSize", "wlst_path": "WP001", "default_value": 10, "production_default": "${__NULL__:500}", "wlst_type": "integer"} ], "Notes": [ {"version": "[12.1.2,)", "wlst_mode": "both", "wlst_name": "Notes", "wlst_path": "WP001", "default_value": null, "wlst_type": "string" } ], @@ -450,6 +450,7 @@ "Notes": [ {"version": "[12.1.2,)", "wlst_mode": "both", "wlst_name": "Notes", "wlst_path": "WP001", "default_value": null, "wlst_type": "string" } ], "PanicAction": [ {"version": "[12.1.2,12.2.1)", "wlst_mode": "both", "wlst_name": "PanicAction", "wlst_path": "WP001", "default_value": "${__NULL__:no-action}", "derived_default": "${:true}", "wlst_type": "string" } , {"version": "[12.2.1,)", "wlst_mode": "both", "wlst_name": "PanicAction", "wlst_path": "WP001", "default_value": "${__NULL__:system-exit}", "derived_default": "${:true}", "wlst_type": "string" } ], + "ServerFailureTrigger": [ {"version": "[10,)", "wlst_mode": "online", "wlst_name": "ServerFailureTrigger", "wlst_path": "WP001", "default_value": null, "wlst_type": "string", "access": "IGNORED", "comment": "Appears in attribute list until ServerFailureTrigger folder is created"} ], "SharedCapacityForWorkManagers": [ {"version": "[12.1.2,)", "wlst_mode": "both", "wlst_name": "SharedCapacityForWorkManagers", "wlst_path": "WP001", "default_value": 65536, "derived_default": "${:true}", "wlst_type": "integer"} ] }, "wlst_attributes_path": "WP001", @@ -1024,6 +1025,7 @@ "PreferredStoreSizeLimit": [ {"version": "[12.1.2,)", "wlst_mode": "both", "wlst_name": "PreferredStoreSizeLimit", "wlst_path": "WP001", "default_value": 100, "wlst_type": "integer" } ], "StoreSizeCheckPeriod": [ {"version": "[12.1.2,)", "wlst_mode": "both", "wlst_name": "StoreSizeCheckPeriod", "wlst_path": "WP001", "default_value": 1, "wlst_type": "integer" } ], "SynchronousEventPersistenceEnabled": [ {"version": "[12.1.2,)", "wlst_mode": "both", "wlst_name": "SynchronousEventPersistenceEnabled", "wlst_path": "WP001", "default_value": "false", "wlst_type": "boolean" } ], + "WLDFBuiltinSystemResourceDescriptorBean": [ {"version": "[12.1.2,)", "wlst_mode": "online", "wlst_name": "W${ldf:LDF}BuiltinSystemResourceDescriptorBean", "wlst_path": "WP001", "default_value": null, "wlst_type": "string", "access": "IGNORED", "comment": "Transient attribute for inaccessible WLDFBuiltinSystemResourceDescriptorBean folder" } ], "WldfBuiltinSystemResourceType": [ {"version": "[12.1.2,)", "wlst_mode": "both", "wlst_name": "W${ldf:LDF}BuiltinSystemResourceType", "wlst_path": "WP001", "default_value": "${__NULL__:None}", "production_default": "${__NULL__:Low}", "wlst_type": "string" } ], "WldfDiagnosticVolume": [ {"version": "[12.1.2,)", "wlst_mode": "both", "wlst_name": "W${ldf:LDF}DiagnosticVolume", "wlst_path": "WP001", "default_value": "${__NULL__:Low}", "wlst_type": "string" } ] }, @@ -1629,6 +1631,7 @@ "JMSThreadPoolSize": [ {"version": "[12.1.2,)", "wlst_mode": "both", "wlst_name": "JMSThreadPoolSize", "wlst_path": "WP001", "default_value": 15, "wlst_type": "integer", "get_method": "${LSA:GET}" } ], "JNDITransportableObjectFactoryList": [ {"version": "[12.1.2,)", "wlst_mode": "both", "wlst_name": "JNDITransportableObjectFactoryList", "wlst_path": "WP001", "default_value": null, "wlst_type": "jarray", "preferred_model_type": "delimited_string", "get_method": "GET" } ], "JRMPEnabled": [ {"version": "[12.1.2,)", "wlst_mode": "offline", "wlst_name": "JRMPEnabled", "wlst_path": "WP001", "default_value": "false", "wlst_type": "boolean" } ], + "JTAMigratableTarget": [ {"version": "[10,)", "wlst_mode": "online", "wlst_name": "JTAMigratableTarget", "wlst_path": "WP001", "default_value": null, "wlst_type": "string", "access": "IGNORED", "comment": "Appears in attribute list until JTAMigratableTarget folder is established"} ], "JavaCompiler": [ {"version": "[12.1.2,)", "wlst_mode": "both", "wlst_name": "JavaCompiler", "wlst_path": "WP001", "default_value": "javac", "wlst_type": "string" } ], "JavaCompilerPostClassPath": [ {"version": "[12.1.2,)", "wlst_mode": "both", "wlst_name": "JavaCompilerPostClassPath", "wlst_path": "WP001", "default_value": null, "wlst_type": "string" } ], "JavaCompilerPreClassPath": [ {"version": "[12.1.2,)", "wlst_mode": "both", "wlst_name": "JavaCompilerPreClassPath", "wlst_path": "WP001", "default_value": null, "wlst_type": "string" } ], diff --git a/core/src/test/python/alias_json_file_test.py b/core/src/test/python/alias_json_file_test.py index 408832452..aca506d56 100644 --- a/core/src/test/python/alias_json_file_test.py +++ b/core/src/test/python/alias_json_file_test.py @@ -24,6 +24,7 @@ from wlsdeploy.aliases.alias_constants import ALIAS_DATA_TYPES from wlsdeploy.aliases.alias_constants import ATTRIBUTES from wlsdeploy.aliases.alias_constants import CHILD_FOLDERS_TYPE +from wlsdeploy.aliases.alias_constants import COMMENT from wlsdeploy.aliases.alias_constants import CONTAINS from wlsdeploy.aliases.alias_constants import DEFAULT_NAME_VALUE from wlsdeploy.aliases.alias_constants import DEFAULT_VALUE @@ -113,6 +114,7 @@ class ListTestCase(unittest.TestCase): _optional_attribute_keys = [ ACCESS, + COMMENT, DERIVED_DEFAULT, GET_MBEAN_TYPE, GET_METHOD, @@ -516,6 +518,14 @@ def _verify_attribute_access_attribute_value(self, folder_name, attribute_name, self._known_access_attribute_values, True)) return result + def _verify_attribute_comment_attribute_value(self, folder_name, attribute_name, alias_attribute_value): + result = [] + if type(alias_attribute_value) is not str: + message = self._get_invalid_attribute_string_type_message(folder_name, attribute_name, + COMMENT, alias_attribute_value) + result.append(message) + return result + def _verify_attribute_get_mbean_type_attribute_value(self, folder_name, attribute_name, alias_attribute_value): result = [] if type(alias_attribute_value) is not str: diff --git a/integration-tests/alias-test/verify/src/test/python/aliastest/verify/utils.py b/integration-tests/alias-test/verify/src/test/python/aliastest/verify/utils.py index 0ebd6d40d..4d20b80ba 100644 --- a/integration-tests/alias-test/verify/src/test/python/aliastest/verify/utils.py +++ b/integration-tests/alias-test/verify/src/test/python/aliastest/verify/utils.py @@ -1,5 +1,5 @@ """ -Copyright (c) 2020, 2022, Oracle Corporation and/or its affiliates. +Copyright (c) 2020, 2023, Oracle Corporation and/or its affiliates. Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl. """ import random @@ -34,15 +34,36 @@ } ONLINE_ALIAS_ATTRIBUTE_IGNORE_MAP = { + '/Cluster/OverloadProtection': [ + 'ServerFailureTrigger' # appears in attribute list until folder MBean is created + ], + '/Server': [ + 'JTAMigratableTarget' # appears in attribute list until folder MBean is created + ], + '/Server/OverloadProtection': [ + 'ServerFailureTrigger' # appears in attribute list until folder MBean is created + ], '/Server/ServerDebug': [ 'DebugJAXPOutputStream', 'DebugXMLRegistryOutputStream', 'DebugXMLEntityCacheOutputStream' ], + '/Server/ServerDiagnosticConfig': [ + 'WLDFBuiltinSystemResourceDescriptorBean' + ], + '/ServerTemplate': [ + 'JTAMigratableTarget' # appears in attribute list until folder MBean is created + ], + '/ServerTemplate/OverloadProtection': [ + 'ServerFailureTrigger' # appears in attribute list until folder MBean is created + ], '/ServerTemplate/ServerDebug': [ 'DebugJAXPOutputStream', 'DebugXMLRegistryOutputStream', 'DebugXMLEntityCacheOutputStream' + ], + '/ServerTemplate/ServerDiagnosticConfig': [ + 'WLDFBuiltinSystemResourceDescriptorBean' ] }