Jira WDT-321 - Hide MT folders for WLS versions that don't support them (#684)

Author: rakillen

core/src/main/python/wlsdeploy/tool/modelhelp/model_sample_printer.py

@@ -164,6 +164,12 @@ def _print_subfolder_keys_sample(self, model_location, subfolder_keys, control_o
 
         for key in subfolder_keys:
             model_location.append_location(key)
+
+            # folder may not be valid for WLS version
+            if self._alias_helper.get_wlst_mbean_type(model_location) is None:
+                model_location.pop_location()
+                continue
+
             name_token = self._alias_helper.get_name_token(model_location)
             if name_token is not None:
                 model_location.add_name_token(name_token, '%s-0' % key)

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

@@ -1,8 +1,8 @@
 {
-    "copyright": "Copyright (c) 2017, 2019, Oracle Corporation and/or its affiliates.  All rights reserved.",
+    "copyright": "Copyright (c) 2017, 2020, Oracle Corporation and/or its affiliates.  All rights reserved.",
     "license": "Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl",
     "wlst_type": "Partition${:s}",
-    "version": "[12.2.1,)",
+    "version": "[12.2.1,14.1.1)",
     "child_folders_type": "multiple",
     "short_name": "Part",
     "folders": {

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

@@ -1,8 +1,8 @@
 {
-    "copyright": "Copyright (c) 2017, 2019, Oracle Corporation and/or its affiliates.  All rights reserved.",
+    "copyright": "Copyright (c) 2017, 2020, Oracle Corporation and/or its affiliates.  All rights reserved.",
     "license": "Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl",
     "wlst_type": "PartitionWorkManager${:s}",
-    "version": "[12.2.1,)",
+    "version": "[12.2.1,14.1.1)",
     "child_folders_type": "multiple",
     "short_name": "PartWM",
     "folders": {},

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

@@ -1,8 +1,8 @@
 {
-    "copyright": "Copyright (c) 2017, 2019, Oracle Corporation and/or its affiliates.  All rights reserved.",
+    "copyright": "Copyright (c) 2017, 2020, Oracle Corporation and/or its affiliates.  All rights reserved.",
     "license": "Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl",
     "wlst_type": "ResourceGroup${:s}",
-    "version": "[12.2.1,)",
+    "version": "[12.2.1,14.1.1)",
     "child_folders_type": "multiple",
     "short_name": "RG",
     "folders": {},

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

@@ -1,8 +1,8 @@
 {
-    "copyright": "Copyright (c) 2017, 2019, Oracle Corporation and/or its affiliates.  All rights reserved.",
+    "copyright": "Copyright (c) 2017, 2020, Oracle Corporation and/or its affiliates.  All rights reserved.",
     "license": "Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl",
     "wlst_type": "ResourceGroupTemplate${:s}",
-    "version": "[12.2.1,)",
+    "version": "[12.2.1,14.1.1)",
     "child_folders_type": "multiple",
     "short_name": "RGTemplate",
     "folders": {},

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

@@ -1,8 +1,8 @@
 {
-    "copyright": "Copyright (c) 2017, 2019, Oracle Corporation and/or its affiliates.  All rights reserved.",
+    "copyright": "Copyright (c) 2017, 2020, Oracle Corporation and/or its affiliates.  All rights reserved.",
     "license": "Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl",
     "wlst_type": "VirtualTarget${:s}",
-    "version": "[12.2.1,)",
+    "version": "[12.2.1,14.1.1)",
     "child_folders_type": "multiple",
     "short_name": "VTarg",
     "folders": {

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

@@ -906,15 +906,15 @@ WLSDPLY-08206=Invalid version range {0}: {1}
 WLSDPLY-08207=Attribute {0} in folder {1} is not supported in WebLogic version {2} but is supported in WebLogic \
   version {3} and higher
 WLSDPLY-08208=Attribute {0} in folder {1} is not supported in WebLogic version {2} but is supported in WebLogic \
-  versions between  {3} and {4}
+  versions between {3} and {4}
 WLSDPLY-08209=Attribute {0} in folder {1} is not supported in WebLogic version {2} but is supported in WebLogic \
   version {3}
 WLSDPLY-08210=Attribute {0} in folder {1} is not supported in WebLogic version {2} or any other WebLogic version \
   in WLST {3} mode
 WLSDPLY-08211=Folder {0} in folder {1} is not supported in WebLogic version {2} but is supported in WebLogic \
   version {3} and higher
 WLSDPLY-08212=Folder {0} in folder {1} is not supported in WebLogic version {2} but is supported in WebLogic \
-  versions between  {3} and {4}
+  versions between {3} and {4}
 WLSDPLY-08213=Folder {0} in folder {1} is not supported in WebLogic version {2} but is supported in WebLogic version {3}
 WLSDPLY-08214=Folder {0} in folder {1} is not supported in WebLogic version {2} or any other WebLogic version \
   in WLST {3} mode