Merge pull request #230 from oracle/WDT#218-discover-jta-path-service

Fix for JTA and PathService in JTA

Author: rakillen

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

@@ -1,5 +1,5 @@
 """
-Copyright (c) 2017, 2018, Oracle and/or its affiliates. All rights reserved.
+Copyright (c) 2017, 2019, Oracle and/or its affiliates. All rights reserved.
 The Universal Permissive License (UPL), Version 1.0
 """
 from java.io import File
@@ -58,6 +58,8 @@ def discover(self):
         discoverer.add_to_model_if_not_empty(self._dictionary, model_folder_name, folder_result)
         model_folder_name, folder_result = self.get_jdbc_stores()
         discoverer.add_to_model_if_not_empty(self._dictionary, model_folder_name, folder_result)
+        model_folder_name, folder_result = self.get_path_services()
+        discoverer.add_to_model_if_not_empty(self._dictionary, model_folder_name, folder_result)
         JmsResourcesDiscoverer(self._model_context, self._dictionary, self._base_location, wlst_mode=self._wlst_mode,
                                aliases=self._aliases).discover()
         model_folder_name, folder_result = self.get_wldf_system_resources()
@@ -289,7 +291,7 @@ def get_path_services(self):
                 result[path_service] = OrderedDict()
                 location.add_name_token(name_token, path_service)
                 self._populate_model_parameters(result[path_service], location)
-                location.remove_name_token(name_token.PATHSERVICE)
+                location.remove_name_token(name_token)
         _logger.exiting(class_name=_class_name, method_name=_method_name, result=result)
         return model_top_folder_name, result
 

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

@@ -1,5 +1,5 @@
 """
-Copyright (c) 2017, 2018, Oracle and/or its affiliates. All rights reserved.
+Copyright (c) 2017, 2019, Oracle and/or its affiliates. All rights reserved.
 The Universal Permissive License (UPL), Version 1.0
 """
 from java.io import File
@@ -306,9 +306,11 @@ def _get_jta(self):
         model_top_folder_name = model_constants.JTA
         result = OrderedDict()
         location = LocationContext(self._base_location)
-        if self._subfolder_exists(model_top_folder_name, location):
+        location.append_location(model_top_folder_name)
+        name = self._find_singleton_name_in_folder(location)
+        if name is not None:
             _logger.info('WLSDPLY-06614', class_name=_class_name, method_name=_method_name)
-            location.append_location(model_top_folder_name)
+            location.add_name_token(self._alias_helper.get_name_token(location), name)
             self._populate_model_parameters(result, location)
         _logger.exiting(class_name=_class_name, method_name=_method_name)
         return model_top_folder_name, result

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

@@ -1,7 +1,9 @@
 {
-    "copyright": "Copyright (c) 2017, 2018, Oracle and/or its affiliates. All rights reserved.",
+    "copyright": "Copyright (c) 2017, 2019, Oracle and/or its affiliates. All rights reserved.",
     "license": "The Universal Permissive License (UPL), Version 1.0",
     "wlst_type": "JTA",
+    "child_folders_type": "single_unpredictable",
+    "default_name_value": "${NO_NAME_0:%DOMAIN%}",
     "folders": {},
     "attributes": {
         "AbandonTimeoutSeconds":                      [ {"version": "[10,)",       "wlst_mode": "both",   "wlst_name": "AbandonTimeoutSeconds",                        "wlst_path": "WP001", "value": {"default": 86400                     }, "wlst_type": "integer"         } ],
@@ -46,6 +48,6 @@
     },
     "wlst_attributes_path": "WP001",
     "wlst_paths": {
-        "WP001": "/JTA/%DOMAIN%"
+        "WP001": "/JTA/%JTA%"
     }
 }

core/src/test/python/aliases_test.py

@@ -1335,6 +1335,15 @@ def testServerStartArgs(self):
                                                                                 existing_value)
         self.assertEqual('-Dxyz=123,456,789', wlst_value)
 
+    def testGetJTA(self):
+        location = LocationContext()
+        location.append_location(FOLDERS.JTA)
+        location.add_name_token('DOMAIN', 'mydomain')
+        offline_path = self.aliases.get_wlst_mbean_name(location)
+        self.assertEqual('NO_NAME_0', offline_path)
+        online_path = self.online_aliases.get_wlst_mbean_name(location)
+        self.assertEqual('mydomain', online_path)
+
 
 if __name__ == '__main__':
     unittest.main()