Wdt 663 fix alias tests for reduce time

Jenkinsfile

@@ -64,11 +64,6 @@ pipeline {
             steps {
                 sh 'mvn -B -DskipITs=false -Dmw_home=${ORACLE_HOME} -Ddb.use.container.network=true install'
             }
-            post {
-                always {
-                    junit 'system-test/integration-tests/target/failsafe-reports/*.xml'
-                }
-            }
         }
         stage ('Analyze') {
             when {
@@ -89,6 +84,7 @@ pipeline {
                 }
             }
         }
+/*
         stage ('Alias Test') {
             // only run this stage when triggered by a cron timer and the commit does not have []skip-ci in the message
             // for example, only run integration tests during the timer triggered nightly build
@@ -130,6 +126,7 @@ pipeline {
                }
             }
         }
+*/
         stage ('Save Nightly Installer'){
             when {
                 allOf {

core/src/main/python/wlsdeploy/aliases/alias_constants.py

@@ -12,6 +12,7 @@
 CONTAINS = 'contains'
 DEFAULT_NAME_VALUE = 'default_name_value'
 DEFAULT_VALUE = 'default_value'
+DERIVED_DEFAULT = 'derived_default'
 FLATTENED_FOLDER_DATA = 'flattened_folder_data'
 FOLDERS = 'folders'
 FOLDER_ORDER = 'folder_order'

core/src/main/python/wlsdeploy/aliases/aliases.py

@@ -17,6 +17,7 @@
 from wlsdeploy.aliases.alias_constants import ATTRIBUTES
 from wlsdeploy.aliases.alias_constants import ChildFoldersTypes
 from wlsdeploy.aliases.alias_constants import DEFAULT_VALUE
+from wlsdeploy.aliases.alias_constants import DERIVED_DEFAULT
 from wlsdeploy.aliases.alias_constants import FLATTENED_FOLDER_DATA
 from wlsdeploy.aliases.alias_constants import FOLDERS
 from wlsdeploy.aliases.alias_constants import GET
@@ -1297,6 +1298,26 @@ def decrypt_password(self, text):
 
         return rtnval
 
+    def is_derived_default(self, location, model_attribute):
+        """
+        Return whether the default is derived by WLST.
+        :param location: current location
+        :param model_attribute: model name of attribute to check
+        :return: True if the default is derived
+        """
+        _method_name = "get_derived_default"
+        self._logger.entering(model_attribute, class_name=self._class_name, method_name=_method_name)
+        result = False
+        try:
+            attribute_info = self._alias_entries.get_alias_attribute_entry_by_wlst_name(location, model_attribute)
+            if attribute_info is not None and DERIVED_DEFAULT in attribute_info:
+                result = attribute_info[DERIVED_DEFAULT]
+        except AliasException, ae:
+            self._raise_exception(ae, _method_name, 'WLSDPLY-19045', model_attribute, location.get_folder_path(),
+                              ae.getLocalizedMessage())
+        self._logger.exiting(class_name=self._class_name, method_name=_method_name, result=result)
+        return result
+
     ###########################################################################
     #                          Convenience Methods                            #
     ###########################################################################

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

@@ -68,7 +68,7 @@ def add_to_remote_map(self, local_name, archive_name, file_type):
         if not os.path.isabs(local_name):
             local_name = os.path.join(self._model_context.get_domain_home(), local_name)
         # we don't know the remote machine type, so automatically turn into forward
-        # slashes. 
+        # slashes.
         local_name = local_name.replace('\\', '/')
         remote_dict[local_name] = OrderedDict()
         remote_dict[local_name][REMOTE_TYPE] = file_type
@@ -129,9 +129,15 @@ def _populate_model_parameters(self, dictionary, location):
                     wlst_value = wlst_lsa_params[wlst_lsa_param]
 
                 # if attribute was never set (online only), don't add to the model
-                if not self._wlst_helper.is_set(wlst_lsa_param):
-                    _logger.finest('WLSDPLY-06157', wlst_lsa_param, str(location), class_name=_class_name,
-                                   method_name=_method_name)
+                try:
+
+                    if self._omit_from_model(location, wlst_lsa_param):
+                        _logger.finest('WLSDPLY-06157', wlst_lsa_param, str(location), class_name=_class_name,
+                                       method_name=_method_name)
+                        continue
+                except DiscoverException, de:
+                    _logger.info("WLSDPLY-06158", wlst_lsa_param, str(location), de.getLocalizedMessage(),
+                                 class_name=_class_name, method_name=_method_name)
                     continue
 
                 self._add_to_dictionary(dictionary, location, wlst_lsa_param, wlst_value, wlst_path)
@@ -144,6 +150,21 @@ def _populate_model_parameters(self, dictionary, location):
             if success:
                 self._add_to_dictionary(dictionary, location, get_attribute, wlst_value, wlst_path)
 
+    def _omit_from_model(self, location, wlst_lsa_param):
+        """
+        Determine if the specified attribute should be omitted from the model.
+        Avoid calling wlst_helper.is_set() if possible, it slows down the online discovery process.
+        :param location: the location of the attribute to be examined
+        :param wlst_lsa_param: the name of the attribute to be examined
+        :return: True if attribute should be omitted, False otherwise
+        """
+        # attributes with derived defaults need to call is_set(), since their value is dynamic.
+        # don't call is_set() if the -remote command-line argument is used.
+        if self._aliases.is_derived_default(location, wlst_lsa_param) or not self._model_context.is_remote():
+            # wlst_helper.is_set already checks for offline / online
+            return not self._wlst_helper.is_set(wlst_lsa_param)
+        return False
+
     def _get_attribute_value_with_get(self, wlst_get_param, wlst_path):
         _method_name = '_get_attribute_value_with_get'
         _logger.finest('WLSDPLY-06104', wlst_get_param, class_name=_class_name, method_name=_method_name)
@@ -153,7 +174,7 @@ def _get_attribute_value_with_get(self, wlst_get_param, wlst_path):
             wlst_value = self._wlst_helper.get(wlst_get_param)
             success = True
         except DiscoverException, pe:
-            _logger.warning('WLSDPLY-06127', wlst_get_param, wlst_path, pe.getLocalizedMessage(),
+            _logger.info('WLSDPLY-06127', wlst_get_param, wlst_path, pe.getLocalizedMessage(),
                             class_name=_class_name, method_name=_method_name)
         return success, wlst_value
 

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

@@ -204,7 +204,7 @@ def _get_required_attribute(self, dictionary, name, mapping_type, mapping_name):
         result = dictionary_utils.get_element(dictionary, name)
 
         if result is None:
-            pwe = exception_helper.create_exception(self._exception_type, '-01791', name, mapping_type,
+            pwe = exception_helper.create_exception(self._exception_type, 'WLSDPLY-01791', name, mapping_type,
                                                     mapping_name)
             self._logger.throwing(class_name=self._class_name, method_name=_method_name, error=pwe)
             raise pwe

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

@@ -60,7 +60,7 @@
         "Notes":                             [ {"version": "[10,)",        "wlst_mode": "both",    "wlst_name": "Notes",                              "wlst_path": "WP001", "default_value": null,       "wlst_type": "string"           } ],
         "OnDemandContextPaths":              [ {"version": "[10,)",        "wlst_mode": "online",  "wlst_name": "OnDemandContextPaths",               "wlst_path": "WP001", "default_value": "[]",       "wlst_type": "jarray",          "get_method": "GET", "access": "RO"  } ],
         "OnDemandDisplayRefresh":            [ {"version": "[10,)",        "wlst_mode": "online",  "wlst_name": "OnDemandDisplayRefresh",             "wlst_path": "WP001", "default_value": "false",    "wlst_type": "boolean",         "get_method": "GET", "access": "RO"  } ],
-        "ParallelDeployModules":             [ {"version": "[12.2.1,)",    "wlst_mode": "both",    "wlst_name": "ParallelDeployModules",              "wlst_path": "WP001", "default_value": "false",    "wlst_type": "boolean"          } ],
+        "ParallelDeployModules":             [ {"version": "[12.2.1,)",    "wlst_mode": "both",    "wlst_name": "ParallelDeployModules",              "wlst_path": "WP001", "default_value": "false",    "derived_default": "true", "wlst_type": "boolean"          } ],
         "PartitionName":                     [ {"version": "[12.2.1,)",    "wlst_mode": "online",  "wlst_name": "PartitionName",                      "wlst_path": "WP001", "default_value": null,       "wlst_type": "string" ,         "get_method": "GET", "access": "RO" } ],
         "PlanDir":                           [ {"version": "[10,)",        "wlst_mode": "both",    "wlst_name": "PlanDir",                            "wlst_path": "WP001", "default_value": null,       "wlst_type": "string",          "access": "${:ROD}", "uses_path_tokens": "true" } ],
         "PlanPath":                          [ {"version": "[10,)",        "wlst_mode": "both",    "wlst_name": "PlanPath",                           "wlst_path": "WP001", "default_value": null,       "wlst_type": "string",          "access": "${:ROD}", "uses_path_tokens": "true" } ],

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

@@ -9,7 +9,7 @@
   "attributes": {
     "ImplicitBeanDiscoveryEnabled":   [ {"version": "[12.2.1,)",   "wlst_mode": "both", "wlst_name": "ImplicitBeanDiscoveryEnabled",      "wlst_path": "WP001", "default_value": "true",                 "wlst_type": "boolean" } ],
     "Notes":                          [ {"version": "[12.2.1,)",   "wlst_mode": "both", "wlst_name": "Notes",                             "wlst_path": "WP001", "default_value": null,                   "wlst_type": "string"  } ],
-    "Policy":                         [ {"version": "[12.2.1.1,)", "wlst_mode": "both", "wlst_name": "Policy",                            "wlst_path": "WP001", "default_value": null,                   "wlst_type": "string"  } ]
+    "Policy":                         [ {"version": "[12.2.1.1,)", "wlst_mode": "both", "wlst_name": "Policy",                            "wlst_path": "WP001", "default_value": "${__NULL__:Enabled}",  "wlst_type": "string"  } ]
   },
   "wlst_attributes_path": "WP001",
   "wlst_paths": {

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

@@ -35,7 +35,7 @@
                 "MaximumDynamicServerCount":            [ {"version": "[12.1.2,)",   "wlst_mode": "both",    "wlst_name": "MaximumDynamicServerCount",            "wlst_path": "WP001", "default_value": 0,        "wlst_type": "integer",         "get_method": "GET"  } ],
                 "MinDynamicClusterSize":                [ {"version": "[12.2.1,)",   "wlst_mode": "both",    "wlst_name": "MinDynamicClusterSize",                "wlst_path": "WP001", "default_value": 1,        "wlst_type": "integer"          } ],
                 "Notes":                                [ {"version": "[12.1.2,)",   "wlst_mode": "both",    "wlst_name": "Notes",                                "wlst_path": "WP001", "default_value": null,     "wlst_type": "string"           } ],
-                "ServerNamePrefix":                     [ {"version": "[12.1.2,)",   "wlst_mode": "both",    "wlst_name": "ServerNamePrefix",                     "wlst_path": "WP001", "default_value": null,     "wlst_type": "string"           } ],
+                "ServerNamePrefix":                     [ {"version": "[12.1.2,)",   "wlst_mode": "both",    "wlst_name": "ServerNamePrefix",                     "wlst_path": "WP001", "default_value": null,  "derived_default": "true",   "wlst_type": "string"           } ],
                 "ServerNameStartingIndex":              [ {"version": "[14.1.1,)",   "wlst_mode": "both",    "wlst_name": "ServerNameStartingIndex",              "wlst_path": "WP001", "default_value": 1,        "wlst_type": "integer"          } ],
                 "ServerTemplate":                       [ {"version": "[12.1.2,)",   "wlst_mode": "both",    "wlst_name": "ServerTemplate",                       "wlst_path": "WP001", "default_value": null,     "wlst_type": "string",          "get_method": "${LSA:GET}", "set_method": "MBEAN.set_server_template_mbean", "set_mbean_type": "weblogic.management.configuration.ServerTemplateMBean" } ],
                 "WaitForAllSessionsDuringShutdown":     [ {"version": "[12.2.1,)",   "wlst_mode": "both",    "wlst_name": "WaitForAllSessionsDuringShutdown",     "wlst_path": "WP001", "default_value": "false",  "wlst_type": "boolean"          } ]
@@ -191,7 +191,7 @@
         "CoherenceClusterSystemResource":            [ {"version": "[12.1.2,)",     "wlst_mode": "both",    "wlst_name": "CoherenceClusterSystemResource",            "wlst_path": "WP001", "default_value": null,                         "wlst_type": "string",           "get_method": "${LSA:GET}","set_method": "${:MBEAN.set_coherence_cluster_mbean}", "set_mbean_type": "${:weblogic.management.configuration.CoherenceClusterSystemResourceMBean}", "restart_required": "true" } ],
         "ConcurrentSingletonActivationEnabled":      [ {"version": "[12.2.1.3,)",   "wlst_mode": "both",    "wlst_name": "ConcurrentSingletonActivationEnabled",      "wlst_path": "WP001", "default_value": "false",                      "wlst_type": "boolean",          "restart_required": "true" } ],
         "ConsensusParticipants":                     [ {"version": "[10,)",         "wlst_mode": "both",    "wlst_name": "ConsensusParticipants",                     "wlst_path": "WP001", "default_value": 0,                            "wlst_type": "integer",          "get_method": "GET" } ],
-        "DataSourceForAutomaticMigration":           [ {"version": "[10,)",         "wlst_mode": "both",    "wlst_name": "DataSourceForAutomaticMigration",           "wlst_path": "WP001", "default_value": "defaultCoherenceCluster",    "wlst_type": "string",           "get_method": "${LSA:GET}", "set_method": "MBEAN.set_data_source_mbean", "set_mbean_type": "weblogic.management.configuration.JDBCSystemResourceMBean", "restart_required": "true" } ],
+        "DataSourceForAutomaticMigration":           [ {"version": "[10,)",         "wlst_mode": "both",    "wlst_name": "DataSourceForAutomaticMigration",           "wlst_path": "WP001", "default_value": null,                         "wlst_type": "string",           "get_method": "${LSA:GET}", "set_method": "MBEAN.set_data_source_mbean", "set_mbean_type": "weblogic.management.configuration.JDBCSystemResourceMBean", "restart_required": "true" } ],
         "DataSourceForJobScheduler":                 [ {"version": "[10,)",         "wlst_mode": "both",    "wlst_name": "DataSourceForJobScheduler",                 "wlst_path": "WP001", "default_value": null,                         "wlst_type": "string",           "set_method": "${:MBEAN.set_data_source_mbean}", "set_mbean_type": "${:weblogic.management.configuration.JDBCSystemResourceMBean}" } ],
         "DataSourceForSessionPersistence":           [ {"version": "[10,)",         "wlst_mode": "both",    "wlst_name": "DataSourceForSessionPersistence",           "wlst_path": "WP001", "default_value": null,                         "wlst_type": "string",           "set_method": "${:MBEAN.set_data_source_mbean}", "set_mbean_type": "${:weblogic.management.configuration.JDBCSystemResourceMBean}", "restart_required": "true" } ],
         "DatabaseLeasingBasisConnectionRetryCount":  [ {"version": "[12.1.3,)",     "wlst_mode": "both",    "wlst_name": "DatabaseLeasingBasisConnectionRetryCount",  "wlst_path": "WP001", "default_value": 1,                            "wlst_type": "integer",          "get_method": "GET", "restart_required": "true" } ],