Merge remote-tracking branch 'origin/master'

Author: ddsharpe

core/src/main/java/oracle/weblogic/deploy/yaml/AbstractYamlTranslator.java

@@ -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
  */
 package oracle.weblogic.deploy.yaml;
@@ -72,7 +72,11 @@ public void enterAssign(YamlParser.AssignContext ctx) {
         PyObject value = getAssignValue(name, ctx);
 
         PyDictionary container = currentDict.peek();
-        container.__setitem__(new PyString(name), value);
+
+        // null indicates not parsable, Py.None would be returned for legitimate cases
+        if (value != null) {
+            container.__setitem__(new PyString(name), value);
+        }
     }
 
     /**

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

@@ -52,7 +52,6 @@
 from wlsdeploy.aliases.alias_constants import WLST_TYPE
 from wlsdeploy.aliases.alias_constants import WLST_SUBFOLDERS_PATH
 from wlsdeploy.aliases.model_constants import ARGUMENTS
-from wlsdeploy.aliases.model_constants import MODEL_LIST_DELIMITER
 from wlsdeploy.aliases.model_constants import SERVER
 from wlsdeploy.aliases.model_constants import SERVER_START
 
@@ -683,13 +682,10 @@ def convert_from_type(data_type, value, preferred=None, delimiter=None):
     elif value is not None and isinstance(value, ObjectName):
         new_value = value.getKeyProperty('Name')
     else:
-        new_value = _jconvert_to_type(data_type, value, delimiter)
-
+        model_type = data_type
         if preferred:
-            # now put it into the preferred model type, but the model delimiter should ALWAYS be the
-            # model default delimiter
-            delimiter = MODEL_LIST_DELIMITER
-            new_value = _jconvert_to_type(preferred, new_value, delimiter)
+            model_type = preferred
+        new_value = _jconvert_to_type(model_type, value, delimiter)
 
     return new_value
 

core/src/main/python/wlsdeploy/tool/create/domain_creator.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
 """
 import javaos as os
@@ -146,7 +146,7 @@ def create(self):
         self.__run_rcu()
         self.__fail_mt_1221_domain_creation()
         self.__create_domain()
-        self.__deploy_resources_and_apps()
+        self.__deploy()
         self.logger.exiting(class_name=self.__class_name, method_name=_method_name)
         return
 
@@ -165,6 +165,14 @@ def _create_named_mbeans(self, type_name, model_nodes, base_location, log_create
 
         Creator._create_named_mbeans(self, type_name, model_nodes, base_location, log_created=log_created)
 
+    # Override
+    def _create_mbean(self, type_name, model_nodes, base_location, log_created=False):
+        Creator._create_mbean(self, type_name, model_nodes, base_location, log_created)
+
+        # check for file paths that need to be qualified
+        self.topology_helper.qualify_nm_properties(type_name, model_nodes, base_location, self.model_context,
+                                                   self.attribute_setter)
+
     def __run_rcu(self):
         """
         The method that runs RCU to drop and then create the schemas.
@@ -249,20 +257,28 @@ def __create_domain(self):
         self.logger.exiting(class_name=self.__class_name, method_name=_method_name)
         return
 
+    def __deploy(self):
+        """
+        Update the domain with domain attributes, resources and deployments.
+        :raises: CreateException: if an error occurs while reading or updating the domain.
+        """
+        self.model_context.set_domain_home(self._domain_home)
+        self.wlst_helper.read_domain(self._domain_home)
+        self.__set_domain_attributes()
+        self.__deploy_resources_and_apps()
+        self.wlst_helper.update_domain()
+        self.wlst_helper.close_domain()
+        return
+
     def __deploy_resources_and_apps(self):
         """
         Deploy the resources and applications.
-        :raises: CreateException: if an error occurs while reading or updating the domain.
         :raises: DeployException: if an error occurs while deploy the resources or applications
         """
         _method_name = '__deploy_resources_and_apps'
 
         self.logger.entering(class_name=self.__class_name, method_name=_method_name)
-        self.model_context.set_domain_home(self._domain_home)
-        self.wlst_helper.read_domain(self._domain_home)
         model_deployer.deploy_resources_and_apps_for_create(self.model, self.model_context, self.aliases)
-        self.wlst_helper.update_domain()
-        self.wlst_helper.close_domain()
         self.logger.exiting(class_name=self.__class_name, method_name=_method_name)
         return
 
@@ -383,6 +399,7 @@ def __apply_base_domain_config(self, topology_folder_list):
         location.add_name_token(domain_name_token, self._domain_name)
 
         self.__set_core_domain_params()
+
         self.__create_security_folder(location)
         topology_folder_list.remove(SECURITY)
 
@@ -408,6 +425,7 @@ def __apply_base_domain_config(self, topology_folder_list):
         topology_folder_list.remove(MIGRATABLE_TARGET)
 
         self.__create_other_domain_artifacts(location, topology_folder_list)
+
         self.logger.exiting(class_name=self.__class_name, method_name=_method_name)
         return
 
@@ -811,3 +829,19 @@ def __set_admin_server_name(self):
         else:
             self._admin_server_name = self.__default_admin_server_name
         return
+
+    def __set_domain_attributes(self):
+        """
+        Set the Domain attributes, which are in the top folder
+        :param location: current location context
+        """
+        _method_name = '__set_domain_attributes'
+        self.logger.finer('WLSDPLY-12231', self._domain_name, class_name=self.__class_name, method_name=_method_name)
+        attrib_dict = dictionary_utils.get_dictionary_attributes(self.model.get_model_topology())
+        if DOMAIN_NAME in attrib_dict:
+            del attrib_dict[DOMAIN_NAME]
+        location = LocationContext()
+        attribute_path = self.alias_helper.get_wlst_attributes_path(location)
+        self.wlst_helper.cd(attribute_path)
+        self._set_attributes(location, attrib_dict)
+        return

core/src/main/python/wlsdeploy/tool/deploy/applications_deployer.py

@@ -4,44 +4,40 @@
 """
 import copy
 import javaos as os
-from sets import Set
-
+from java.io import ByteArrayOutputStream
 from java.io import File
-from java.io import IOException
 from java.io import FileNotFoundException
-from java.util.zip import ZipException
+from java.io import IOException
+from java.lang import IllegalStateException
 from java.security import NoSuchAlgorithmException
 from java.util.jar import JarFile
-from java.util.jar import Manifest
-from java.lang import IllegalStateException
-from java.io import ByteArrayOutputStream
-
-import oracle.weblogic.deploy.util.FileUtils as FileUtils
-import oracle.weblogic.deploy.util.PyOrderedDict as OrderedDict
-
+from java.util.zip import ZipException
+from sets import Set
 from wlsdeploy.aliases.location_context import LocationContext
-from wlsdeploy.aliases.wlst_modes import WlstModes
-from wlsdeploy.exception import exception_helper
-from wlsdeploy.tool.deploy import deployer_utils
-from wlsdeploy.tool.deploy.deployer import Deployer
-from wlsdeploy.util import dictionary_utils
-from wlsdeploy.util import string_utils
-
 from wlsdeploy.aliases.model_constants import ABSOLUTE_SOURCE_PATH
-from wlsdeploy.aliases.model_constants import APP_DEPLOYMENTS
 from wlsdeploy.aliases.model_constants import APPLICATION
+from wlsdeploy.aliases.model_constants import APP_DEPLOYMENTS
 from wlsdeploy.aliases.model_constants import DEPLOYMENT_ORDER
 from wlsdeploy.aliases.model_constants import LIBRARY
 from wlsdeploy.aliases.model_constants import PARTITION
 from wlsdeploy.aliases.model_constants import PLAN_PATH
 from wlsdeploy.aliases.model_constants import PLAN_STAGE_MODE
+from wlsdeploy.aliases.model_constants import RESOURCES
 from wlsdeploy.aliases.model_constants import RESOURCE_GROUP
 from wlsdeploy.aliases.model_constants import RESOURCE_GROUP_TEMPLATE
-from wlsdeploy.aliases.model_constants import RESOURCES
 from wlsdeploy.aliases.model_constants import SECURITY_DD_MODEL
 from wlsdeploy.aliases.model_constants import SOURCE_PATH
 from wlsdeploy.aliases.model_constants import TARGET
 from wlsdeploy.aliases.model_constants import TARGETS
+from wlsdeploy.aliases.wlst_modes import WlstModes
+from wlsdeploy.exception import exception_helper
+from wlsdeploy.tool.deploy import deployer_utils
+from wlsdeploy.tool.deploy.deployer import Deployer
+from wlsdeploy.util import dictionary_utils
+from wlsdeploy.util import string_utils
+
+import oracle.weblogic.deploy.util.FileUtils as FileUtils
+import oracle.weblogic.deploy.util.PyOrderedDict as OrderedDict
 
 
 class ApplicationsDeployer(Deployer):
@@ -158,6 +154,27 @@ def __add_applications(self):
 
             application = \
                 copy.deepcopy(dictionary_utils.get_dictionary_element(applications, application_name))
+
+            app_source_path = dictionary_utils.get_element(application, SOURCE_PATH)
+            if string_utils.is_empty(app_source_path):
+                ex = exception_helper.create_deploy_exception('WLSDPLY-09302', application_name, SOURCE_PATH)
+                self.logger.throwing(ex, class_name=self._class_name, method_name=_method_name)
+                raise ex
+
+            if deployer_utils.is_path_into_archive(app_source_path):
+                if self.archive_helper is not None:
+                    self.archive_helper.extract_file(app_source_path)
+                else:
+                    ex = exception_helper.create_deploy_exception('WLSDPLY-09303', application_name)
+                    self.logger.throwing(ex, class_name=self._class_name, method_name=_method_name)
+                    raise ex
+                full_source_path = File(File(self.model_context.get_domain_home()), app_source_path).getAbsolutePath()
+            else:
+                full_source_path = File(self.model_context.replace_token_string(app_source_path)).getAbsolutePath()
+
+            application_name = \
+                self.__get_deployable_library_versioned_name(full_source_path, application_name)
+
             quoted_application_name = self.wlst_helper.get_quoted_name_for_wlst(application_name)
             application_location.add_name_token(application_token, quoted_application_name)
 
@@ -732,9 +749,9 @@ def __deploy_app_online(self, application_name, source_path, targets, plan=None,
             self.logger.throwing(ex, class_name=self._class_name, method_name=_method_name)
             raise ex
 
-        if options is not None and 'libraryModule' in options and string_utils.to_boolean(options['libraryModule']):
-            computed_name = self.__get_deployable_library_versioned_name(source_path, application_name)
-            application_name = computed_name
+        # if options is not None and 'libraryModule' in options and string_utils.to_boolean(options['libraryModule']):
+        computed_name = self.__get_deployable_library_versioned_name(source_path, application_name)
+        application_name = computed_name
 
         # build the dictionary of named arguments to pass to the deploy_application method
         args = list()

core/src/main/python/wlsdeploy/tool/deploy/topology_updater.py

@@ -1,9 +1,10 @@
 """
-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 wlsdeploy.aliases.location_context import LocationContext
 from wlsdeploy.aliases.model_constants import CLUSTER
+from wlsdeploy.aliases.model_constants import DOMAIN_NAME
 from wlsdeploy.aliases.model_constants import MACHINE
 from wlsdeploy.aliases.model_constants import MIGRATABLE_TARGET
 from wlsdeploy.aliases.model_constants import SECURITY
@@ -58,6 +59,14 @@ def _add_named_elements(self, type_name, model_nodes, location):
 
         Deployer._add_named_elements(self, type_name, model_nodes, location)
 
+    # Override
+    def _add_model_elements(self, type_name, model_nodes, location):
+        Deployer._add_model_elements(self, type_name, model_nodes, location)
+
+        # check for file paths that need to be qualified
+        self._topology_helper.qualify_nm_properties(type_name, model_nodes, location, self.model_context,
+                                                    self.attribute_setter)
+
     def update(self):
         """
         Deploy resource model elements at the domain level, including multi-tenant elements.
@@ -75,6 +84,9 @@ def update(self):
         self._security_provider_creator.create_security_configuration(location)
         folder_list.remove(SECURITY_CONFIGURATION)
 
+        # set the domain attributes
+        self._set_domain_attributes()
+
         self._process_section(self._topology, folder_list, MACHINE, location)
         self._process_section(self._topology, folder_list, UNIX_MACHINE, location)
 
@@ -114,3 +126,15 @@ def _process_section(self, folder_dict, folder_list, key, location):
 
         if key in folder_list:
             folder_list.remove(key)
+
+    def _set_domain_attributes(self):
+        _method_name = '_set_domain_attributes'
+        self.logger.fine('WLSDPLY-09700', self.model_context.get_domain_name(), class_name=self._class_name,
+                         method_name=_method_name)
+        attrib_dict = dictionary_utils.get_dictionary_attributes(self._topology)
+        if DOMAIN_NAME in attrib_dict:
+            del attrib_dict[DOMAIN_NAME]
+        location = LocationContext()
+        attribute_path = self.alias_helper.get_wlst_attributes_path(location)
+        self.wlst_helper.cd(attribute_path)
+        self.set_attributes(location, attrib_dict)

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/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
 """
 import javaos as os
@@ -143,7 +143,7 @@ def _get_attributes_for_current_location_online(self, location):
         path = self._alias_helper.get_wlst_attributes_path(location)
         try:
             lsa_attributes = wlst_helper.lsa(path)
-            mbi_attributes = _get_mbi_attribute_list()
+            mbi_attributes = _get_mbi_attribute_list(path)
             if mbi_attributes:
                 for lsa_attribute_name in lsa_attributes:
                     if lsa_attribute_name in lsa_attributes and lsa_attribute_name not in mbi_attributes:
@@ -659,9 +659,9 @@ def convert_to_absolute_path(relative_to, file_name):
     return file_name
 
 
-def _get_mbi_attribute_list():
+def _get_mbi_attribute_list(path):
     attribute_list = []
-    for mbean_attribute_info in wlst_helper.get_mbi().getAttributes():
+    for mbean_attribute_info in wlst_helper.get_mbi(path).getAttributes():
         if _is_attribute(mbean_attribute_info):
             attribute_list.append(mbean_attribute_info.getName())
     return attribute_list
@@ -705,7 +705,7 @@ def _massage_online_folders(lsc_folders):
     location = wlst_helper.get_pwd()
     folder_list = []
     mbi_folder_list = []
-    for mbean_attribute_info in wlst_helper.get_mbi().getAttributes():
+    for mbean_attribute_info in wlst_helper.get_mbi(location).getAttributes():
         if _is_containment(mbean_attribute_info):
             mbi_folder_list.append(mbean_attribute_info.getName())
     for lsc_folder in lsc_folders:

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

@@ -321,10 +321,14 @@ def _get_group_params(self, location):
                                     class_name=_class_name, method_name=_method_name)
                 else:
                     group_param_name = attributes[wlst_subdeployment]
-                    _logger.finer('WLSDPLY-06487', group_param_name, self._alias_helper.get_model_folder_path(location),
-                                  class_name=_class_name, method_name=_method_name)
-                    subfolder_result[group_param_name] = OrderedDict()
-                    self._populate_model_parameters(subfolder_result[group_param_name], location)
+                    if group_param_name is None:
+                        _logger.warning('WLSDPLY-06486', folder_name, self._alias_helper.get_model_folder_path(location),
+                                        class_name=_class_name, method_name=_method_name)
+                    else:
+                        _logger.finer('WLSDPLY-06487', group_param_name, self._alias_helper.get_model_folder_path(location),
+                                      class_name=_class_name, method_name=_method_name)
+                        subfolder_result[group_param_name] = OrderedDict()
+                        self._populate_model_parameters(subfolder_result[group_param_name], location)
                 location.remove_name_token(name_token)
         location.pop_location()
         _logger.exiting(class_name=_class_name, method_name=_method_name, result=subfolder_result)