Merge branch 'main' into JIRA-WT-464-alias-none

Author: rakillen

alias-test/pom.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-    Copyright (c) 2020, Oracle and/or its affiliates. All rights reserved.
-    The Universal Permissive License (UPL), Version 1.0
+    Copyright (c) 2020, 2022, Oracle and/or its affiliates.
+    Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl.
 -->
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
@@ -21,19 +21,8 @@
 
     <dependencies>
         <dependency>
-            <groupId>junit</groupId>
-            <artifactId>junit</artifactId>
-            <version>4.13.1</version>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>com.google.guava</groupId>
-            <artifactId>guava</artifactId>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>commons-io</groupId>
-            <artifactId>commons-io</artifactId>
+            <groupId>org.junit.jupiter</groupId>
+            <artifactId>junit-jupiter-engine</artifactId>
             <scope>test</scope>
         </dependency>
     </dependencies>

core/pom.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
     Copyright (c) 2017, 2022, Oracle Corporation and/or its affiliates.
-    The Universal Permissive License (UPL), Version 1.0
+    Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl.
 -->
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>

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

@@ -1,5 +1,5 @@
 """
-Copyright (c) 2017, 2021, Oracle Corporation and/or its affiliates.
+Copyright (c) 2017, 2022, Oracle Corporation and/or its affiliates.
 Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl.
 """
 import os
@@ -98,6 +98,7 @@ def _populate_model_parameters(self, dictionary, location):
             return
 
         wlst_lsa_params = self._get_attributes_for_current_location(location)
+        wlst_did_get = list()
         _logger.finest('WLSDPLY-06102', self._wlst_helper.get_pwd(), wlst_lsa_params, class_name=_class_name,
                        method_name=_method_name)
         wlst_get_params = self._get_required_attributes(location)
@@ -107,6 +108,7 @@ def _populate_model_parameters(self, dictionary, location):
             for wlst_lsa_param in wlst_lsa_params:
                 if wlst_lsa_param in wlst_get_params:
                     success, wlst_value = self._get_attribute_value_with_get(wlst_lsa_param, wlst_path)
+                    wlst_did_get.append(wlst_lsa_param)
                     if not success:
                         continue
                 else:
@@ -121,25 +123,13 @@ def _populate_model_parameters(self, dictionary, location):
 
                 self._add_to_dictionary(dictionary, location, wlst_lsa_param, wlst_value, wlst_path)
 
-        # These will come after the lsa / get params in the ordered dictionary
-        wlst_extra_params = self._get_additional_parameters(location)
-        _logger.finest('WLSDPLY-06149', str(location), wlst_extra_params,
-                       class_name=_class_name, method_name=_method_name)
-        if wlst_extra_params is not None:
-            for wlst_extra_param in wlst_extra_params:
-                if wlst_extra_param in wlst_get_params:
-                    success, wlst_value = self._get_attribute_value_with_get(wlst_extra_param, wlst_path)
-                    if success:
-                        self._add_to_dictionary(dictionary, location, wlst_extra_param, wlst_value, wlst_path)
-                    else:
-                        _logger.info('WLSDPLY-06152', wlst_extra_param, location.get_folder_path(),
-                                     class_name=_class_name, method_name=_method_name)
-                elif self._is_defined_attribute(location, wlst_extra_param):
-                    _logger.info('WLSDPLY-06154', wlst_extra_param, location.get_folder_path(),
-                                 class_name=_class_name, method_name=_method_name)
-                else:
-                    _logger.info('WLSDPLY-06153', wlst_extra_param, location.get_folder_path(),
-                                 class_name=_class_name, method_name=_method_name)
+        # These will come after the lsa params in the ordered dictionary
+        # Find the attributes that are not in the LSA wlst map but are in the alias definitions with GET access
+        get_attributes = [get_param for get_param in wlst_get_params if not get_param in wlst_did_get]
+        for get_attribute in get_attributes:
+            success, wlst_value = self._get_attribute_value_with_get(wlst_extra_param, wlst_path)
+            if success:
+                self._add_to_dictionary(dictionary, location, wlst_extra_param, wlst_value, wlst_path)
 
     def _get_attribute_value_with_get(self, wlst_get_param, wlst_path):
         _method_name = '_get_attribute_value_with_get'

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

@@ -603,8 +603,7 @@ WLSDPLY-06149=Additional attributes that are not in the LSA attributes for locat
 WLSDPLY-06150=Unable to determine if additional attributes are available for {0} at location {1} : {2}
 WLSDPLY-06151=Additional attribute {0} for model folder at location {1} requires getter on MBean instance
 WLSDPLY-06152=Attribute {0} for model folder at location {1} requires the CMO getter to retrieve the attribute value
-WLSDPLY-06153=Attribute {0} for model folder at location {1} is not in the lsa map and is not defined in the \
-  alias definitions
+WLSDPLY-06153=Skipped discovery of attribute {0} for model folder at location {1} because {0} is not defined in the alias definitions
 WLSDPLY-06154=Attribute {0} for model folder at location {1} is not in the lsa map and is not defined with get \
    to retrieve the attribute value
 WLSDPLY-06155=Attribute {0} value at location {1} replaced by token {2}

documentation/2.0/content/release-notes.md renamed to documentation/2.0/content/release-notes/_index.md

@@ -1,4 +1,61 @@
-### Known issues for WebLogic Deploy Tooling
++++
+title = "Release Notes"
+date = 2019-02-22T15:27:38-05:00
+weight = 5
+pre = "<b> </b>"
++++
+
+Review the following release notes for recent changes to WebLogic Deploy Tooling and known issues.
+
+- WebLogic Deploy Tooling now incorporates the SnakeYAML parser for reading and writing model files.
+This may require some changes to existing models in order to be parsed correctly.
+   - Model elements that use [delete notation]({{< relref "/concepts/model#declaring-named-mbeans-to-delete" >}}) need to be escaped in single or double quotation marks.
+   ```yaml
+   topology:
+       Server:
+           '!ms1':
+           ms2:
+   ```
+
+
+   - Model elements under the same parent should be indented to the exact same level. The previous YAML parser did not enforce this restriction,
+   but it is standard for YAML. In this example, each cluster is indented four spaces.
+   ```yaml
+   topology:
+       Cluster:
+           cluster1:
+               ClientCertProxyEnabled: True
+           cluster2:
+               WeblogicPluginEnabled: true
+   ```
+
+
+
+- Object lists in the `kubernetes` section of the model now should be specified in a hyphenated list format,
+similar to how they appear in the domain resource file produced for [WebLogic Kubernetes Operator](https://oracle.github.io/weblogic-kubernetes-operator/userguide/managing-domains/domain-resource/).
+
+   ```yaml
+       clusters:
+       - clusterName: 'cluster1'
+         allowReplicasBelowMinDynClusterSize: true
+       - clusterName: 'cluster2'
+         allowReplicasBelowMinDynClusterSize: true
+   ```
+
+   - The "named object list" format is deprecated now, and will cause warning messages to be displayed.
+   ```yaml
+       clusters:
+         'cluster1':
+           allowReplicasBelowMinDynClusterSize: true
+         'cluster2':
+           allowReplicasBelowMinDynClusterSize: true
+   ```
+
+
+- The deprecated argument `-model_sample` has been removed from the Model Help Tool.
+The Model Help Tool has used model sample format by default since release 1.9.2.
+
+## Known issues for WebLogic Deploy Tooling
 
 The following list contains known issues. Each issue may contain a workaround or an associated issue number.
 

documentation/2.0/layouts/shortcodes/img.html

@@ -1,8 +1,8 @@
 #!/bin/bash
-
+#
 # Copyright (c) 2019, 2021, Oracle and/or its affiliates.
 # Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl.
-
+#
 # 1313 is the hugo default port
 port=${1:-1313}