reordering JDBCStore creation so that it succeeds (#1247)

Author: robertpatrick

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

@@ -92,7 +92,7 @@ def __folder_hierarchy(self, mbean_dictionary, online_dictionary, mbean_path, pa
         mbean_dictionary[ATTRIBUTES] = self.__get_attributes(mbean_instance)
 
         info_helper = MBeanInfoHelper(mbean_instance, mbean_path)
-        info_map = info_helper.get_child_mbeans()
+        info_map = generator_utils.reorder_info_map(mbean_path, info_helper.get_child_mbeans())
 
         methods_helper = MBeanMethodHelper(mbean_instance, mbean_path)
         methods_map = methods_helper.get_child_mbeans()

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

@@ -110,7 +110,7 @@ def get(attribute_name):
         get_value = local_get(attribute_name)
     except (online_wlst_exception, offlineWLSTException), we:
         success = False
-        __logger.warning('Unable to get attribute{0} at location {1} : {2}', attribute_name, current_path(),
+        __logger.warning('Unable to get attribute {0} at location {1} : {2}', attribute_name, current_path(),
                          we.getLocalizedMessage(), class_name=__class_name, method_name=_method_name)
 
     return success, get_value

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

@@ -58,11 +58,27 @@
 
 OUTPUT_DIR_SWITCH = '-output_dir'
 
+# In offline mode, we cannot create a JDBC Store if the domain doesn't
+# have a JDBCSystemResource (or other JDBCStore) so we need to make sure
+# to reorder the dictionary so that JDBCStores comes after
+# JDBCSystemResources.
+#
+TOP_LEVEL_INFO_MAP_DEPENDENCIES = {
+    'JDBCStores': 'JDBCSystemResources'
+}
+
+
 __logger = PlatformLogger('test.aliases')
 __logger.set_level(Level.FINER)
 CLASS_NAME = 'generate/utils'
 
 
+def reorder_info_map(mbean_path, info_map):
+    if mbean_path == '/':
+        return _reorder_top_level_info_map(info_map)
+    return info_map
+
+
 def get_generate_args_map(args):
     """
     The provided arguments are the command line key, value pairs.
@@ -306,6 +322,27 @@ def get_mbean_methods(mbean_instance):
     return list()
 
 
+def _reorder_top_level_info_map(info_map):
+    keys = info_map.keys()
+
+    new_keys = list()
+    delayed_keys = list()
+    for key in keys:
+        if key in TOP_LEVEL_INFO_MAP_DEPENDENCIES and TOP_LEVEL_INFO_MAP_DEPENDENCIES[key] not in new_keys:
+            delayed_keys.append(key)
+        else:
+            new_keys.append(key)
+
+    if len(delayed_keys) > 0:
+        new_info_map = PyOrderedDict()
+        for key in new_keys:
+            new_info_map[key] = info_map[key]
+        for key in delayed_keys:
+            new_info_map[key] = info_map[key]
+        return new_info_map
+    return info_map
+
+
 class GenerateModelContext(ModelContext):
     def __init__(self, program_name, arg_map):
         super(GenerateModelContext, self).__init__(program_name, arg_map)