JIRA:WDT-58 add setter method for Quota mbean and make sure the Quota is created before the mbean is set in destination

Author: CarolynRountree

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

@@ -64,6 +64,14 @@ class docstring
         UNIFORM_DISTRIBUTED_TOPIC
     ]
 
+    quota_destination_type_names = [
+        QUEUE,
+        TEMPLATE,
+        TOPIC,
+        UNIFORM_DISTRIBUTED_QUEUE,
+        UNIFORM_DISTRIBUTED_TOPIC
+    ]
+
     def __init__(self, model, model_context, aliases, wlst_mode=WlstModes.OFFLINE):
         Deployer.__init__(self, model, model_context, aliases, wlst_mode)
 
@@ -79,6 +87,8 @@ def _add_named_elements(self, type_name, model_nodes, location):
         1) Group params require special handling.
         2) Destinations may require placeholder templates.
         """
+        _method_name = '_add_named_elements'
+        self.logger.entering(type_name, class_name=self._class_name, method_name=_method_name)
         if type_name == GROUP_PARAMS:
             self._add_group_params(model_nodes, location)
             return
@@ -89,6 +99,10 @@ def _add_named_elements(self, type_name, model_nodes, location):
 
         if type_name in self.template_destination_type_names:
             self._check_destination_template(model_nodes, location)
+
+        if type_name in self.quota_destination_type_names:
+            self._check_destination_quota(model_nodes, location)
+
             # continue with regular processing
 
         Deployer._add_named_elements(self, type_name, model_nodes, location)
@@ -288,3 +302,36 @@ def _create_placeholder_jms_template(self, template_name, resource_location):
 
         self.wlst_helper.cd(original_location)
         return result
+
+    def _check_destination_quota(self, destination_nodes, location):
+        """
+        Check the destination nodes for a quota element, and create a placeholder quota if required.
+        :param destination_nodes: the destination nodes to be examined
+        :param location: the location of the destination parent
+        """
+        for name in destination_nodes:
+            child_nodes = dictionary_utils.get_dictionary_element(destination_nodes, name)
+            quota_name = dictionary_utils.get_element(child_nodes, QUOTA)
+            if quota_name is not None:
+                self._create_placeholder_jms_quota(quota_name, location)
+        return
+
+    def _create_placeholder_jms_quota(self, quota_name, resource_location):
+        """
+        :param template_name: the name of the template to be added
+        :param resource_location: the location where the template should be added
+        """
+        _method_name = '_create_placeholder_jms_quota'
+        original_location = self.wlst_helper.get_pwd()
+        quota_location = LocationContext(resource_location).append_location(QUOTA)
+        existing_names = deployer_utils.get_existing_object_list(quota_location, self.alias_helper)
+
+        if quota_name not in existing_names:
+            self.logger.info('WLSDPLY-09502', quota_name, class_name=self._class_name, method_name=_method_name)
+
+        quota_token = self.alias_helper.get_name_token(quota_location)
+        quota_location.add_name_token(quota_token, quota_name)
+        result = deployer_utils.create_and_cd(quota_location, existing_names, self.alias_helper)
+
+        self.wlst_helper.cd(original_location)
+        return result

core/src/main/python/wlsdeploy/tool/util/attribute_setter.py

@@ -45,6 +45,7 @@
 from wlsdeploy.aliases.model_constants import PARTITION_WORK_MANAGER
 from wlsdeploy.aliases.model_constants import PERSISTENT_STORE
 from wlsdeploy.aliases.model_constants import QUEUE
+from wlsdeploy.aliases.model_constants import QUOTA
 from wlsdeploy.aliases.model_constants import REALM
 from wlsdeploy.aliases.model_constants import RESOURCE_GROUP
 from wlsdeploy.aliases.model_constants import RESOURCE_GROUP_TEMPLATE
@@ -415,6 +416,20 @@ def set_jms_server_mbean(self, location, key, value, wlst_value):
         self.set_attribute(location, key, mbean, wlst_merge_value=wlst_value, use_raw_value=True)
         return
 
+    def set_jms_quota_mbean(self, location, key, value, wlst_value):
+        """
+        For those entities, queues, template, topics, that take a single Quota mbean.
+        :param location: location to look for Quota mbean
+        :param key: the attribute name
+        :param value: the string value
+        :param wlst_value: the existing value of the attribute from WLST
+        :raises BundleAwareException of the specified type: if quota mbean is not found.
+        """
+        resource_location = self.__get_parent_location(location, JMS_RESOURCE)
+        mbean = self.__find_in_location(resource_location, QUOTA, value, required=True)
+        self.set_attribute(location, key, mbean, wlst_merge_value=wlst_value, use_raw_value=True)
+        return
+
     def set_reliable_delivery_policy_mbean(self, location, key, value, wlst_value):
         """
         Sets the ws soap reliable delivery policy mbean used by mbeans like Server and Server Template.

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

@@ -882,6 +882,7 @@ WLSDPLY-09404=Failed to create directory for FileStore {0} at location {1}
 # wlsdeploy/tool/deploy/jms_resources_deployer.py
 WLSDPLY-09500=Creating placeholder for Template {0}
 WLSDPLY-09501=Skipping {0} for {1} {2}
+WLSDPLY-09502=Creating placeholder for Quota {0}
 
 # wlsdeploy/tool/deploy/log_helper.py
 WLSDPLY-09600=Adding {0}

core/src/test/python/alias_json_file_test.py

@@ -49,6 +49,8 @@
 from wlsdeploy.aliases.alias_constants import WLST_SUBFOLDERS_PATH
 from wlsdeploy.aliases.alias_constants import WLST_TYPE
 
+from wlsdeploy.exception.expection_types import ExceptionType
+from wlsdeploy.tool.util.attribute_setter import AttributeSetter
 
 class ListTestCase(unittest.TestCase):
     _resources_dir = '../../test-classes/'
@@ -496,18 +498,33 @@ def _verify_attribute_set_method_attribute_value(self, folder_name, attribute_na
                                                                       SET_METHOD, alias_attribute_value)
             result.append(message)
         else:
-            offline_value = self.alias_entries._resolve_curly_braces(alias_attribute_value)
-            if len(offline_value) > 0 and not offline_value.startswith('MBEAN'):
-                message = self._get_invalid_alias_attribute_value_message(folder_name, attribute_name, SET_METHOD,
-                                                                          'offline', offline_value,
-                                                                          'it does not start with MBEAN')
-                result.append(message)
-            online_value = self.alias_entries._resolve_curly_braces(alias_attribute_value)
-            if offline_value != online_value and len(online_value) > 0 and not online_value.startswith('MBEAN'):
+            result.extend(self._verify_attribute_set_method(folder_name, attribute_name, WlstModes.OFFLINE,
+                                                            alias_attribute_value, self.alias_entries))
+            result.extend(self._verify_attribute_set_method(folder_name, attribute_name, WlstModes.ONLINE,
+                                                            alias_attribute_value, self.online_alias_entries))
+        return result
+
+    def _verify_attribute_set_method(self, folder_name, attribute_name, wlst_mode, attribute_value, aliases):
+        result = []
+        resolved_attribute = aliases._resolve_curly_braces(attribute_value)
+        if resolved_attribute:
+            if not resolved_attribute.startswith('MBEAN'):
                 message = self._get_invalid_alias_attribute_value_message(folder_name, attribute_name, SET_METHOD,
-                                                                          'online', online_value,
+                                                                          WlstModes.from_value(wlst_mode),
+                                                                          resolved_attribute,
                                                                           'it does not start with MBEAN')
                 result.append(message)
+            else:
+                set_method_value_components = resolved_attribute.split('.')
+                if len(set_method_value_components) == 2:
+                    invoker = set_method_value_components[1]
+
+                    instance = AttributeSetter(aliases, None, ExceptionType.ALIAS, wlst_mode)
+                    try:
+                        getattr(instance, invoker)
+                    except AttributeError:
+                        result.append(self.set_method_not_found_message(folder_name, attribute_name,
+                                                                        WlstModes.from_value(wlst_mode), invoker))
         return result
 
     def _verify_attribute_uses_path_tokens_attribute_value(self, folder_name, attribute_name, alias_attribute_value):
@@ -750,3 +767,8 @@ def _get_invalid_alias_attribute_value_message(self, folder_name, attribute_name
         text = 'Folder at path %s has a defined attribute %s with alias attribute %s whose ' \
                '%s value %s was not valid because %s'
         return text % (folder_name, attribute_name, alias_attribute_name, wlst_mode, alias_attribute_value, cause)
+
+    def set_method_not_found_message(self, folder_name, attribute_name, wlst_mode, alias_attribute_value):
+        text = 'Folder at path %s has a %s defined attribute %s whose set_method %s was not found in the' \
+               ' attribute setter class'
+        return text % (folder_name, attribute_name, wlst_mode, alias_attribute_value)