Merge branch 'alias-test-fixes' into 'main'

Include secure_default null values in alias test generated files

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

Author: robertpatrick

integration-tests/alias-test/generate/src/test/python/aliastest/generate/generator_base.py

@@ -1,5 +1,5 @@
 """
-Copyright (c) 2021, 2023, Oracle and/or its affiliates.
+Copyright (c) 2021, 2025, Oracle and/or its affiliates.
 Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl.
 """
 import types
@@ -105,14 +105,16 @@ def add_computed_defaults(self, dictionary, cmo_helper, attribute_name):
             if computed_value is not None:  # None means no attribute info was found
                 dictionary[COMPUTED_DEFAULT] = computed_value
 
-            production_default_value = cmo_helper.production_default_value()
-            if production_default_value is not None:
+            # we want to include null values
+            if cmo_helper.has_production_default():
+                production_default_value = cmo_helper.production_default_value()
                 dictionary[PRODUCTION_DEFAULT] = self.convert_attribute(attribute_name, production_default_value,
                                                                         value_type=dictionary[GET_TYPE])
 
+            # we want to include null values
             if self._model_context.get_local_wls_version() not in SECURE_DEFAULT_DISMISS:
-                secure_default_value = cmo_helper.secure_default_value()
-                if secure_default_value is not None:
+                if cmo_helper.has_secure_default():
+                    secure_default_value = cmo_helper.secure_default_value()
                     dictionary[SECURE_DEFAULT] = self.convert_attribute(attribute_name, secure_default_value,
                                                                         value_type=dictionary[GET_TYPE])
 

integration-tests/alias-test/generate/src/test/python/aliastest/generate/mbean_info_helper.py

@@ -1,5 +1,5 @@
 """
-Copyright (c) 2020, 2022, Oracle Corporation and/or its affiliates.
+Copyright (c) 2020, 2025, Oracle and/or its affiliates.
 Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl.
 """
 
@@ -24,14 +24,25 @@
 
 class MBeanInfoHelper(object):
     """
-    Facade to provide the details for a specific WLST MBean and its attributes / child MBeans.
-    The information provided in this class is retrieved from the MBeanInfo descriptors for the MBean
-    encapsulated in an instance.
+    Wrapper for an MBean proxy object that derives MBean, child MBean, and attribute information
+    using the MBean's BeanInfo descriptors.
+
+    interfaces = self.__mbean_instance.getClass().getInterfaces()
+    mbean_interface = interfaces[0]
+    bean_access = ManagementServiceClient.getBeanInfoAccess()  // weblogic.management.provider.beaninfo.BeanInfoAccess
+    getname = getattr(mbean_interface, 'getTypeName')
+    type_name = getname()
+    self.__mbean_info = bean_access.getBeanInfoForInterface(type_name, False, '9.0.0.0')
+        // subclass of java.beans.BeanInfo, weblogic.management.configuration.*MBeanImplBeanInfo
     """
-
     __logger = PlatformLogger('test.aliases.generate.mbean.info')
 
     def __init__(self, mbean_instance, mbean_path, mbean_type=None):
+        """
+        :param mbean_instance: an MBean proxy object, if None it is looked up from mbean_path
+        :param mbean_path: the MBean path
+        :param mbean_type: never passed in ?, derived from MBean descriptor name
+        """
         self.__class_name__ = self.__class__.__name__
         self.__mbean_path = mbean_path
         self.__mbean_instance = self.__encapsulate_mbean_instance(mbean_instance=mbean_instance, mbean_path=mbean_path)
@@ -366,13 +377,23 @@ def computed_default_value(self):
             value = False
         return value
 
+    # allow for null secure default values
+    def has_secure_default(self):
+        return (self.__exists and
+                ('secureValue' in self.__get_descriptor_values_keys()
+                 or 'secureValueNull' in self.__get_descriptor_values_keys())
+                and 'secureValueDocOnly' not in self.__get_descriptor_values_keys())
+
     def secure_default_value(self):
         value = None
         doc_only = self.__get_descriptor_value('secureValueDocOnly')
-        if not doc_only:
+        if not doc_only and self.__get_descriptor_value('secureValueNull') is not True:
             value = self.__get_descriptor_value('secureValue')
         return value
 
+    def has_production_default(self):
+        return self.__exists and 'restProductionModeDefault' in self.__get_descriptor_values_keys()
+
     def production_default_value(self):
         return self.__get_descriptor_value('restProductionModeDefault')
 

integration-tests/alias-test/generate/src/test/python/aliastest/generate/mbean_method_helper.py

@@ -1,5 +1,5 @@
 """
-Copyright (c) 2020, 2022, Oracle Corporation and/or its affiliates.
+Copyright (c) 2020, 2025, Oracle and/or its affiliates.
 Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl.
 """
 
@@ -21,10 +21,21 @@
 
 
 class MBeanMethodHelper(object):
+    """
+    Wrapper for an MBean proxy object that derives MBean, child MBean, and attribute information
+    using Java reflection.
+    Attributes and child MBeans are derived from methods of the proxy object.
 
+    self.__mbean_info is a map of attribute_names to getter methods
+    """
     __logger = PlatformLogger('test.aliases.generate.mbean.method')
 
     def __init__(self, mbean_instance, mbean_path, mbean_type=None):
+        """
+        :param mbean_instance: an MBean proxy object, if None it is looked up from mbean_path
+        :param mbean_path: the MBean path
+        :param mbean_type: never passed in ?, derived from interface name
+        """
         self.__class_name__ = self.__class__.__name__
         self.__mbean_path = mbean_path
         self.__mbean_instance = self.__encapsulate_mbean_instance(mbean_instance=mbean_instance, mbean_path=mbean_path)
@@ -299,9 +310,15 @@ def derived_default_value(self):
     def computed_default_value(self):
         return None
 
+    def has_secure_default(self):
+        return False
+
     def secure_default_value(self):
         return None
 
+    def has_production_default(self):
+        return False
+
     def production_default_value(self):
         return None
 

integration-tests/alias-test/generate/src/test/python/aliastest/generate/mbi_helper.py

@@ -1,5 +1,5 @@
 """
-Copyright (c) 2020, 2022, Oracle Corporation and/or its affiliates.
+Copyright (c) 2020, 2025, Oracle and/or its affiliates.
 Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl.
 """
 
@@ -25,7 +25,13 @@
 
 
 class MBIHelper(object):
+    """
+    Wrapper for an MBean proxy object that derives MBean, child MBean, and attribute information
+    using WLST MBI information.
 
+    mbi_info = getMBI()
+    self.__mbean_info = mbi_info.getMBeanDescriptor()  // javax.management.modelmbean.ModelMBeanInfoSupport
+    """
     __logger = PlatformLogger('test.aliases.generate.mbean.mbi')
 
     def __init__(self, mbean_instance, mbean_path, mbean_type=None):
@@ -300,13 +306,23 @@ def derived_default_value(self):
     def computed_default_value(self):
         return self.__get_descriptor_value('computed')
 
+    # allow for null secure default values
+    def has_secure_default(self):
+        return (self.__exists and
+                ('secureValue' in self.__get_descriptor_field_keys()
+                 or 'secureValueNull' in self.__get_descriptor_field_keys())
+                and 'secureValueDocOnly' not in self.__get_descriptor_field_keys())
+
     def secure_default_value(self):
         value = None
         doc_only = self.__get_descriptor_value('secureValueDocOnly')
-        if not doc_only:
+        if not doc_only and self.__get_descriptor_value('secureValueNull') is not True:
             value = self.__get_descriptor_value('secureValue')
         return value
 
+    def has_production_default(self):
+        return self.__exists and 'restProductionModeDefault' in self.__get_descriptor_field_keys()
+
     def production_default_value(self):
         return self.__get_descriptor_value('restProductionModeDefault')