continued work on server groups

Author: CarolynRountree

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

@@ -335,16 +335,13 @@ def __extend_domain(self, domain_home):
         if self.wls_helper.is_set_server_groups_supported():
             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()
         else:
-            # need to update this before can target it
-            # might want to replace this later with
-            # self.wlst_helper.update_domain()
-            # self.wlst_helper.close_domain()
-            # # we might want to replace this later to extend a domain in update
-            # self.wlst_helper.read_domain(domain_home)
+            # Update the domain to apply the extension templates.
+            self.wlst_helper.update_domain()
             self.target_helper.target_jrf_groups_to_clusters_servers(domain_home)
 
-
+        self.wlst_helper.close_domain()
         self.logger.info('WLSDPLY-12209', self._domain_name,
                          class_name=self.__class_name, method_name=_method_name)
 
@@ -718,7 +715,7 @@ def __configure_fmw_infra_database(self):
                                        JDBC_DRIVER_PARAMS_PROPERTIES, DRIVER_PARAMS_USER_PROPERTY)
 
         self.logger.info('WLSDPLY-12223', class_name=self.__class_name, method_name=_method_name)
-        if self._domain_typedef.is_get_database_defaults():
+        if self.wls_helper.is_database_defaults_supported():
             self.wlst_helper.get_database_defaults()
 
         self.logger.exiting(class_name=self.__class_name, method_name=_method_name)

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

@@ -107,8 +107,11 @@ def update(self):
         for folder_name in remaining:
             self._process_section(self._topology, folder_list, folder_name, location)
 
-        server_groups_to_target = self._domain_typedef.get_server_groups_to_target()
-        self.target_helper.target_server_groups_to_servers(server_groups_to_target)
+        if self.wls_helper.is_set_server_groups_supported():
+            server_groups_to_target = self._domain_typedef.get_server_groups_to_target()
+            self.target_helper.target_server_groups_to_servers(server_groups_to_target)
+        else:
+            self.target_helper.target_jrf_groups_to_clusters_servers(self.model_context.get_domain_name())
 
         # files referenced in attributes are extracted as attributes are processed
 

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

@@ -64,8 +64,6 @@ def target_jrf_groups_to_clusters_servers(self, domain_home):
 
         # Get the clusters and and their members
         cluster_map = self.get_clusters_and_members_map()
-        self.wlst_helper.update_domain()
-        self.wlst_helper.close_domain()
 
         # Get the clusters and and their members
         for cluster_name, cluster_servers in cluster_map.iteritems():
@@ -153,9 +151,7 @@ def target_server_groups_to_servers(self, domain_home, server_groups_to_target):
                 server_name = self.wlst_helper.get_quoted_name_for_wlst(server_names[0])
                 self.wlst_helper.set_server_groups(server_name, server_groups_to_target)
 
-        # might want to replace this later with
-        self.wlst_helper.update_domain()
-        self.wlst_helper.close_domain()
+
         self.logger.exiting(class_name=self.__class_name, method_name=_method_name)
         return
 

core/src/main/typedefs/JRF.json

@@ -1,5 +1,5 @@
 {
-    "copyright": "Copyright (c) 2017, 2018, Oracle and/or its affiliates. All rights reserved.",
+    "copyright": "Copyright (c) 2017, 2019, Oracle and/or its affiliates. All rights reserved.",
     "license": "The Universal Permissive License (UPL), Version 1.0",
     "name": "JRF",
     "description": "JRF type domain definitions",
@@ -20,7 +20,7 @@
                 "@@ORACLE_HOME@@/oracle_common/common/templates/applications/oracle.wsmpm_template_11.1.1.jar",
                 "@@ORACLE_HOME@@/oracle_common/common/templates/applications/oracle.em_11_1_1_0_0_template.jar"
             ],
-            "serverGroupsToTarget" : [ "JRF-MAN-SVR", "WSMPM-MAN-SVR" ],
+            "serverGroupsToTarget" : [ ],
             "rcuSchemas": [ "MDS", "IAU", "IAU_VIEWER", "IAU_APPEND", "OPSS" ]
         },
         "JRF_1212" : {