Wdt 343 ds assigned to admin because not targeted (#546)

* remove extra updates

* Datasource targeted to datasource by create domain

* fix for create domain order of applying templates

* fix integration test now exposed problem from rearrange of code

* fix the rest of the integration test mismatches

* Fix for update domain when adding new server or cluster along with targeted resources

Author: CarolynRountree

core/src/main/python/update.py

@@ -239,6 +239,23 @@ def __update_online(model, model_context, aliases):
 
     exit_code = 0
 
+    __update_online_domain(model_context)
+
+    topology_updater.set_server_groups()
+    __update_online_domain(model_context)
+    model_deployer.deploy_applications(model, model_context, aliases, wlst_mode=__wlst_mode)
+
+    try:
+        __wlst_helper.disconnect()
+    except BundleAwareException, ex:
+        # All the changes are made and active so don't raise an error that causes the program
+        # to indicate a failure...just log the error since the process is going to exit anyway.
+        __logger.warning('WLSDPLY-09009', _program_name, ex.getLocalizedMessage(), error=ex,
+                         class_name=_class_name, method_name=_method_name)
+    return exit_code
+
+
+def __update_online_domain(model_context):
     try:
         # First we enable the stdout again and then redirect the stdoout to a string output stream
         # call isRestartRequired to get the output, capture the string and then silence wlst output again
@@ -263,17 +280,6 @@ def __update_online(model, model_context, aliases):
         __release_edit_session_and_disconnect()
         raise ex
 
-    model_deployer.deploy_applications(model, model_context, aliases, wlst_mode=__wlst_mode)
-
-    try:
-        __wlst_helper.disconnect()
-    except BundleAwareException, ex:
-        # All the changes are made and active so don't raise an error that causes the program
-        # to indicate a failure...just log the error since the process is going to exit anyway.
-        __logger.warning('WLSDPLY-09009', _program_name, ex.getLocalizedMessage(), error=ex,
-                         class_name=_class_name, method_name=_method_name)
-    return exit_code
-
 
 def __update_offline(model, model_context, aliases):
     """
@@ -298,11 +304,11 @@ def __update_offline(model, model_context, aliases):
         rcu_helper = RCUHelper(model, model_context, aliases)
         rcu_helper.update_rcu_password()
 
-    try:
-        __wlst_helper.update_domain()
-    except BundleAwareException, ex:
-        __close_domain_on_error()
-        raise ex
+    __update_offline_domain()
+
+    topology_updater.set_server_groups()
+
+    __update_offline_domain()
 
     model_deployer.deploy_model_after_update(model, model_context, aliases, wlst_mode=__wlst_mode)
 
@@ -316,6 +322,14 @@ def __update_offline(model, model_context, aliases):
     return 0
 
 
+def __update_offline_domain():
+
+    try:
+        __wlst_helper.update_domain()
+    except BundleAwareException, ex:
+        __close_domain_on_error()
+        raise ex
+
 def __release_edit_session_and_disconnect():
     """
     An online error recovery method.

core/src/main/python/wlsdeploy/tool/create/creator.py

@@ -1,5 +1,5 @@
 """
-Copyright (c) 2017, 2020, Oracle Corporation and/or its affiliates.  All rights reserved.
+Copyright (c) 2017, 2020, Oracle Corporation and/or its affiliates.
 Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl.
 """
 

core/src/main/python/wlsdeploy/tool/create/domain_creator.py

@@ -174,7 +174,9 @@ def create(self):
         self.__fail_mt_1221_domain_creation()
         self.__create_domain()
         self.__deploy()
+        self.__deploy_after_update()
         self.__create_boot_dot_properties()
+
         self.logger.exiting(class_name=self.__class_name, method_name=_method_name)
         return
 
@@ -339,11 +341,12 @@ def __create_domain(self):
         self.model_context.set_domain_home(self._domain_home)
 
         if self.wls_helper.is_select_template_supported():
-            self.__create_domain_with_select_template(self._domain_home)
+            self.__create_base_domain_with_select_template(self._domain_home)
         else:
             self.__create_base_domain(self._domain_home)
-            self.__extend_domain(self._domain_home)
 
+        topology_folder_list = self.alias_helper.get_model_topology_top_level_folder_names()
+        self.__apply_base_domain_config(topology_folder_list)
         if len(self.files_to_extract_from_archive) > 0:
             for file_to_extract in self.files_to_extract_from_archive:
                 self.archive_helper.extract_file(file_to_extract)
@@ -356,23 +359,48 @@ def __create_domain(self):
         self.logger.exiting(class_name=self.__class_name, method_name=_method_name)
         return
 
+    def __extend_domain_svrgrps(self):
+        """
+        Create the domain.
+        :raises: CreateException: if an error occurs
+        """
+        _method_name = '__create_domain'
+
+        self.logger.entering(class_name=self.__class_name, method_name=_method_name)
+        domain_type = self.model_context.get_domain_type()
+        self.logger.info('WLSDPLY-12203', domain_type, class_name=self.__class_name, method_name=_method_name)
+
+        self.wlst_helper.read_domain(self._domain_home)
+
+        if self.wls_helper.is_select_template_supported():
+            self.__extend_domain_with_select_template(self._domain_home)
+        else:
+            self.__extend_domain(self._domain_home)
+
+        self.wlst_helper.update_domain()
+        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.
+        Check for the correct method of updating the domain for creation.
         :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._configure_security_configuration()
         self.__deploy_resources_and_apps()
         self.wlst_helper.update_domain()
-
-        model_deployer.deploy_model_after_update(self.model, self.model_context, self.aliases)
-
         self.wlst_helper.close_domain()
+
         return
 
+    def __deploy_after_update(self):
+
+        self.__extend_domain_svrgrps()
+        model_deployer.deploy_model_after_update(self.model, self.model_context, self.aliases)
+
     def __deploy_resources_and_apps(self):
         """
         Deploy the resources and applications.
@@ -397,15 +425,15 @@ def __create_base_domain(self, domain_home):
         base_template = self._domain_typedef.get_base_template()
         self.logger.info('WLSDPLY-12204', base_template, class_name=self.__class_name, method_name=_method_name)
         self.wlst_helper.read_template(base_template)
-        self.__apply_base_domain_config(self.__topology_folder_list)
+        self.__set_core_domain_params()
 
         self.logger.info('WLSDPLY-12205', self._domain_name, domain_home,
                          class_name=self.__class_name, method_name=_method_name)
         self.wlst_helper.write_domain(domain_home)
 
         self.logger.info('WLSDPLY-12206', self._domain_name, class_name=self.__class_name, method_name=_method_name)
         self.wlst_helper.close_template()
-
+        self.wlst_helper.read_domain(domain_home)
         self.logger.exiting(class_name=self.__class_name, method_name=_method_name)
         return
 
@@ -418,14 +446,14 @@ def __extend_domain(self, domain_home):
         _method_name = '__extend_domain'
 
         self.logger.entering(domain_home, class_name=self.__class_name, method_name=_method_name)
+
         extension_templates = self._domain_typedef.get_extension_templates()
         custom_templates = self._domain_typedef.get_custom_extension_templates()
         if (len(extension_templates) == 0) and (len(custom_templates) == 0):
             return
 
         self.logger.info('WLSDPLY-12207', self._domain_name, domain_home,
                          class_name=self.__class_name, method_name=_method_name)
-        self.wlst_helper.read_domain(domain_home)
         self.__set_app_dir()
 
         for extension_template in extension_templates:
@@ -444,56 +472,74 @@ def __extend_domain(self, domain_home):
             # 12c versions set server groups directly
             server_groups_to_target = self._domain_typedef.get_server_groups_to_target()
             self.target_helper.target_server_groups_to_servers(server_groups_to_target)
-            self.wlst_helper.update_domain()
 
         elif self._domain_typedef.is_jrf_domain_type() or \
                 (self._domain_typedef.get_targeting() == TargetingType.APPLY_JRF):
             # for 11g, if template list includes JRF, or if specified in domain typedef, use applyJRF
-            self.target_helper.target_jrf_groups_to_clusters_servers(domain_home)
-
-        else:
-            # for 11g, if no targeting was needed, just update the domain
-            self.wlst_helper.update_domain()
+            self.target_helper.target_jrf_groups_to_clusters_servers()
 
-        self.wlst_helper.close_domain()
         self.logger.info('WLSDPLY-12209', self._domain_name,
                          class_name=self.__class_name, method_name=_method_name)
 
         self.logger.exiting(class_name=self.__class_name, method_name=_method_name)
         return
 
-    def __create_domain_with_select_template(self, domain_home):
+    def __create_base_domain_with_select_template(self, domain_home):
         """
         Create and extend the domain, as needed, for WebLogic Server versions 12.2.1 and above.
         :param domain_home: the domain home directory
         :raises: CreateException: if an error occurs
         """
-        _method_name = '__create_domain_with_select_template'
+        _method_name = '__create_base_domain_with_select_template'
 
         self.logger.entering(domain_home, class_name=self.__class_name, method_name=_method_name)
         base_template = self._domain_typedef.get_base_template()
         self.logger.info('WLSDPLY-12210', base_template,
                          class_name=self.__class_name, method_name=_method_name)
 
         self.wlst_helper.select_template(base_template)
+        self.wlst_helper.load_templates()
+
+        self.__set_core_domain_params()
+        self.logger.info('WLSDPLY-12205', self._domain_name, domain_home,
+                         class_name=self.__class_name, method_name=_method_name)
+        self.wlst_helper.write_domain(domain_home)
+        self.wlst_helper.close_template()
+        self.logger.info('WLSDPLY-12206', self._domain_name, domain_home,
+                         class_name=self.__class_name, method_name=_method_name)
+        self.wlst_helper.read_domain(domain_home)
+
+        self.logger.exiting(class_name=self.__class_name, method_name=_method_name)
+        return
+
+    def __extend_domain_with_select_template(self, domain_home):
+        """
+        Create and extend the domain, as needed, for WebLogic Server versions 12.2.1 and above.
+        :param domain_home: the domain home directory
+        :raises: CreateException: if an error occurs
+        """
+        _method_name = '__extend_domain_with_select_template'
+
+        self.logger.entering(domain_home, class_name=self.__class_name, method_name=_method_name)
 
         extension_templates = self._domain_typedef.get_extension_templates()
+        custom_templates = self._domain_typedef.get_custom_extension_templates()
+        if (len(extension_templates) == 0) and (len(custom_templates) == 0):
+            return
+
         for extension_template in extension_templates:
             self.logger.info('WLSDPLY-12211', extension_template,
                              class_name=self.__class_name, method_name=_method_name)
             self.wlst_helper.select_template(extension_template)
 
-        custom_templates = self._domain_typedef.get_custom_extension_templates()
         for custom_template in custom_templates:
             self.logger.info('WLSDPLY-12245', custom_template,
                              class_name=self.__class_name, method_name=_method_name)
             self.wlst_helper.select_custom_template(custom_template)
 
         self.logger.info('WLSDPLY-12212', class_name=self.__class_name, method_name=_method_name)
-        self.wlst_helper.load_templates()
-
-        topology_folder_list = self.alias_helper.get_model_topology_top_level_folder_names()
-        self.__apply_base_domain_config(topology_folder_list)
+        if len(extension_templates) > 0 or len(custom_templates) > 0:
+            self.wlst_helper.load_templates()
 
         if len(extension_templates) > 0:
             self.__set_app_dir()
@@ -509,9 +555,6 @@ def __create_domain_with_select_template(self, domain_home):
 
         self.__configure_opss_secrets()
 
-        self.wlst_helper.write_domain(domain_home)
-        self.wlst_helper.close_template()
-
         if len(dynamic_assigns) > 0:
             self.target_helper.target_server_groups_to_dynamic_clusters(dynamic_assigns)
 
@@ -533,8 +576,6 @@ def __apply_base_domain_config(self, topology_folder_list):
         domain_name_token = self.alias_helper.get_name_token(location)
         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)
 
@@ -718,7 +759,6 @@ def __create_clusters_and_servers(self, location):
         # create placeholders for JDBC resources that may be referenced in cluster definition.
         resources_dict = self.model.get_model_resources()
         self.topology_helper.create_placeholder_jdbc_resources(resources_dict)
-
         cluster_nodes = dictionary_utils.get_dictionary_element(self._topology, CLUSTER)
         if len(cluster_nodes) > 0:
             self._create_named_mbeans(CLUSTER, cluster_nodes, location, log_created=True)

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

@@ -1,5 +1,5 @@
 """
-Copyright (c) 2017, 2019, Oracle Corporation and/or its affiliates.  All rights reserved.
+Copyright (c) 2017, 2020, Oracle Corporation and/or its affiliates.
 Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl.
 """
 from wlsdeploy.aliases.location_context import LocationContext
@@ -125,23 +125,22 @@ def update(self):
         for folder_name in remaining:
             self._process_section(self._topology, folder_list, folder_name, location)
 
+        self.library_helper.install_domain_libraries()
+        self.library_helper.extract_classpath_libraries()
+        self.library_helper.install_domain_scripts()
+
+    def set_server_groups(self):
         if self.wls_helper.is_set_server_groups_supported():
             server_groups_to_target = self._domain_typedef.get_server_groups_to_target()
             server_assigns, dynamic_assigns = \
                 self.target_helper.target_server_groups_to_servers(server_groups_to_target)
             if len(dynamic_assigns) > 0:
-                self.wlst_helper.save_and_close(self.model_context)
                 self.target_helper.target_server_groups_to_dynamic_clusters(dynamic_assigns)
-                self.wlst_helper.reopen(self.model_context)
             if len(server_assigns) > 0:
                 self.target_helper.target_server_groups(server_assigns)
         elif self._domain_typedef.is_jrf_domain_type():
             self.target_helper.target_jrf_groups_to_clusters_servers()
 
-        self.library_helper.install_domain_libraries()
-        self.library_helper.extract_classpath_libraries()
-        self.library_helper.install_domain_scripts()
-
     def _process_section(self, folder_dict, folder_list, key, location):
         if key in folder_dict:
             nodes = dictionary_utils.get_dictionary_element(folder_dict, key)