Merge pull request #256 from oracle/WDT-61-set-server-groups-11g

Wdt 61 set server groups 11g

Author: rakillen

core/src/main/python/create.py

@@ -39,12 +39,15 @@
 from wlsdeploy.util import getcreds
 from wlsdeploy.util import tool_exit
 from wlsdeploy.util import variables
+from wlsdeploy.util import wlst_extended
 from wlsdeploy.util import wlst_helper
 from wlsdeploy.util.cla_utils import CommandLineArgUtil
 from wlsdeploy.util.model_context import ModelContext
 from wlsdeploy.util.model_translator import FileToPython
 from wlsdeploy.util.weblogic_helper import WebLogicHelper
 
+wlst_extended.wlst_functions = globals()
+
 _program_name = CREATE_DOMAIN
 
 _class_name = 'create'

core/src/main/python/deploy.py

@@ -39,12 +39,15 @@
 from wlsdeploy.util import getcreds
 from wlsdeploy.util import tool_exit
 from wlsdeploy.util import variables
+from wlsdeploy.util import wlst_extended
 from wlsdeploy.util.cla_utils import CommandLineArgUtil
 from wlsdeploy.util.model import Model
 from wlsdeploy.util.model_context import ModelContext
 from wlsdeploy.util.model_translator import FileToPython
 from wlsdeploy.util.weblogic_helper import WebLogicHelper
 
+wlst_extended.wlst_functions = globals()
+
 
 _program_name = 'deployApps'
 _class_name = 'deploy'

core/src/main/python/discover.py

@@ -47,12 +47,15 @@
 from wlsdeploy.util import getcreds
 from wlsdeploy.util import model_translator
 from wlsdeploy.util import tool_exit
+from wlsdeploy.util import wlst_extended
 from wlsdeploy.util import wlst_helper
 from wlsdeploy.util.cla_utils import CommandLineArgUtil
 from wlsdeploy.util.model import Model
 from wlsdeploy.util.model_context import ModelContext
 from wlsdeploy.util.weblogic_helper import WebLogicHelper
 
+wlst_extended.wlst_functions = globals()
+
 _program_name = 'discoverDomain'
 _class_name = 'discover'
 __logger = PlatformLogger(discoverer.get_discover_logger_name())

core/src/main/python/update.py

@@ -44,12 +44,14 @@
 from wlsdeploy.util import getcreds
 from wlsdeploy.util import tool_exit
 from wlsdeploy.util import variables
+from wlsdeploy.util import wlst_extended
 from wlsdeploy.util.cla_utils import CommandLineArgUtil
 from wlsdeploy.util.model import Model
 from wlsdeploy.util.model_context import ModelContext
 from wlsdeploy.util.model_translator import FileToPython
 from wlsdeploy.util.weblogic_helper import WebLogicHelper
 
+wlst_extended.wlst_functions = globals()
 
 _program_name = UPDATE_DOMAIN
 _class_name = 'update'
@@ -93,6 +95,7 @@ def __process_args(args):
     __verify_required_args_present(required_arg_map)
     __process_model_args(optional_arg_map)
     __wlst_mode = __process_online_args(optional_arg_map)
+
     __process_encryption_args(optional_arg_map)
 
     domain_type = dictionary_utils.get_element(optional_arg_map, CommandLineArgUtil.DOMAIN_TYPE_SWITCH)

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

@@ -324,13 +324,18 @@ def __extend_domain(self, domain_home):
 
         self.__configure_fmw_infra_database()
 
-        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)
+            self.wlst_helper.update_domain()
+        else:
+            # 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)
-        self.wlst_helper.update_domain()
-        self.wlst_helper.close_domain()
 
         self.logger.exiting(class_name=self.__class_name, method_name=_method_name)
         return
@@ -684,12 +689,12 @@ def __configure_fmw_infra_database(self):
 
         location.append_location(JDBC_DRIVER_PARAMS_PROPERTIES)
         token_name = self.alias_helper.get_name_token(location)
+
         if token_name is not None:
             location.add_name_token(token_name, DRIVER_PARAMS_USER_PROPERTY)
 
         stb_user = self.wls_helper.get_stb_user_name(rcu_prefix)
         self.logger.fine('WLSDPLY-12222', stb_user, class_name=self.__class_name, method_name=_method_name)
-
         wlst_path = self.alias_helper.get_wlst_attributes_path(location)
         self.wlst_helper.cd(wlst_path)
         wlst_name, wlst_value = \
@@ -698,7 +703,8 @@ 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)
-        self.wlst_helper.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)
         return

core/src/main/python/wlsdeploy/tool/deploy/deployer_utils.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 sets import Set
@@ -308,3 +308,44 @@ def get_file_hash(file_name):
         raise ex
     _logger.exiting(class_name=_class_name, method_name=_method_name, result=result)
     return result
+
+
+def save_changes(model_context):
+    """
+    Call this if necessary to save changes and disconnect from the domain.
+    This works in both offline and online.
+    :param model_context: contains information about the current tool settings
+    """
+    _method_name = 'save_changes'
+    if model_context.get_target_wlst_mode() == WlstModes.ONLINE:
+        if _wlst_helper.is_connected():
+            _logger.fine('WLSDPLY-09110', class_name=_class_name, method_name=_method_name)
+            _wlst_helper.save()
+            _wlst_helper.activate()
+            _wlst_helper.disconnect()
+        else:
+            _logger.fine('WLSDPLY-09109', class_name=_class_name, method_name=_method_name)
+    else:
+        _logger.fine('WLSDPLY-09111', class_name=_class_name, method_name=_method_name)
+        _wlst_helper.update_domain()
+
+
+def read_again(model_context):
+    """
+    Establish connection with the domain and start editing in both online and offline wlst mode.
+    :param model_context: contains information about the current tool settings
+    """
+    _method_name = 'read_again'
+    if model_context.get_target_wlst_mode() == WlstModes.ONLINE:
+        if not _wlst_helper.is_connected():
+            _logger.fine('WLSDPLY-09113', class_name=_class_name, method_name=_method_name)
+            _wlst_helper.connect(model_context.get_admin_user(), model_context.get_admin_password(),
+                                 model_context.get_admin_url())
+            _wlst_helper.edit()
+            _wlst_helper.start_edit()
+        else:
+            _logger.fine('WLSDPLY-09112', class_name=_class_name, method_name=_method_name)
+    else:
+        _logger.fine('WLSDPLY-09114', class_name=_class_name, method_name=_method_name)
+        _wlst_helper.close_domain()
+        _wlst_helper.read_domain(model_context.get_domain_home())

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

@@ -107,8 +107,13 @@ 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:
+            deployer_utils.save_changes(self.model_context)
+            self.target_helper.target_jrf_groups_to_clusters_servers(self.model_context.get_domain_home())
+            deployer_utils.read_again(self.model_context)
 
         # files referenced in attributes are extracted as attributes are processed
 

core/src/main/python/wlsdeploy/tool/util/target_helper.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
 """
 
@@ -38,6 +38,49 @@ def __init__(self, model, model_context, aliases, exception_type, logger):
         else:
             self._admin_server_name = DEFAULT_ADMIN_SERVER_NAME
 
+    def target_jrf_groups_to_clusters_servers(self, domain_home, should_update=True):
+        """
+        Use the apply_jrf only for those versions of wlst that do not have server groups.
+        This assigns the JRF resources to all managed servers. If the managed server is in a
+        cluster, this method assigns the JRF resources are assigned to the cluster. Else, if
+        the managed server is stand-alone, the resources are assigned to the managed server.
+        :param domain_home: the directory for the domain_home
+        """
+        _method_name = 'target_jrf_groups_to_clusters_servers'
+
+        self.logger.entering(domain_home, class_name=self.__class_name, method_name=_method_name)
+
+        location = LocationContext()
+        root_path = self.alias_helper.get_wlst_attributes_path(location)
+        self.wlst_helper.cd(root_path)
+        admin_server_name = self.wlst_helper.get(ADMIN_SERVER_NAME)
+
+        # We need to get the effective list of servers for the domain.  Since any servers
+        # referenced in the model have already been created but the templates may have
+        # defined new servers not listed in the model, get the list from WLST.
+        server_names = self.get_existing_server_names()
+        if admin_server_name in server_names:
+            server_names.remove(admin_server_name)
+
+        # Get the clusters and and their members
+        cluster_map = self._get_clusters_and_members_map()
+
+        # Get the clusters and and their members
+        for cluster_name, cluster_servers in cluster_map.iteritems():
+            self.logger.info('WLSDPLY-12233', 'Cluster', cluster_name, class_name=self.__class_name,
+                             method_name=_method_name)
+            self.wlst_helper.apply_jrf(cluster_name, domain_home, should_update=should_update)
+            for member in cluster_servers:
+                if member in server_names:
+                    server_names.remove(member)
+        for ms_name in server_names:
+            self.logger.info('WLSDPLY-12233', 'Managed Server', ms_name, class_name=self.__class_name,
+                             method_name=_method_name)
+            self.wlst_helper.apply_jrf(ms_name, domain_home, should_update=should_update)
+
+        self.logger.exiting(class_name=self.__class_name, method_name=_method_name)
+        return
+
     def target_server_groups_to_servers(self, server_groups_to_target):
         """
         Target the server groups to the servers.
@@ -148,6 +191,21 @@ def _get_clusters_and_members_map(self):
         self.logger.exiting(class_name=self.__class_name, method_name=_method_name, result=cluster_map)
         return cluster_map
 
+    def get_existing_server_names(self):
+        """
+        Get the list of server names from WLST.
+        :return: the list of server names
+        :raises: BundleAwareException of the specified type: is an error occurs reading from the aliases or WLST
+        """
+        _method_name = '_get_existing_server_names'
+
+        self.logger.entering(class_name=self.__class_name, method_name=_method_name)
+        server_location = LocationContext().append_location(SERVER)
+        server_list_path = self.alias_helper.get_wlst_list_path(server_location)
+        result = self.wlst_helper.get_existing_object_list(server_list_path)
+        self.logger.exiting(class_name=self.__class_name, method_name=_method_name, result=result)
+        return result
+
     def _get_server_group_targeting_limits(self, server_group_targeting_limits, clusters_map):
         """
         Get any server group targeting limits specified in the model, converting any cluster

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

@@ -5,6 +5,7 @@
 from oracle.weblogic.deploy.util import PyWLSTException
 
 from wlsdeploy.exception import exception_helper
+from wlsdeploy.util import wlst_extended
 from wlsdeploy.util import wlst_helper
 
 
@@ -41,6 +42,25 @@ def assign(self, source_type, source_name, target_type, target_name):
             self.__logger.throwing(ex, class_name=self.__class_name, method_name=_method_name)
             raise ex
 
+    def apply_jrf(self, jrf_target, domain_home, should_update=False):
+        """
+        For those installs that require populating the JRF server group information to the managed servers
+        :param jrf_target: The entity to which to target the JRF applications and services
+        :param domain_home: The domain home directory
+        :param should_update: If True the applyJRF will update the domain after apply
+        :raises: Exception specific to tool type
+        """
+        _method_name = 'apply_jrf'
+
+        try:
+            wlst_extended.apply_jrf(jrf_target, domain_home, should_update)
+        except PyWLSTException, pwe:
+            ex = exception_helper.create_exception(self.__exception_type, 'WLSDPLY-00071',
+                                                   jrf_target, domain_home,
+                                                   pwe.getLocalizedMessage(), error=pwe)
+            self.__logger.throwing(ex, class_name=self.__class_name, method_name=_method_name)
+            raise ex
+
     def cd(self, wlst_path):
         """
         Change WLST directories to the specified path
@@ -860,6 +880,13 @@ def domain_runtime(self):
             raise ex
         return
 
+    def is_connected(self):
+        """
+        Determine if the wlst session is currently connected to the admin server.
+        :return: True if connected
+        """
+        return wlst_helper.is_connected()
+
     def custom(self):
         """
         Change to the custom MBean tree.

core/src/main/python/wlsdeploy/util/weblogic_helper.py

@@ -72,6 +72,20 @@ def is_select_template_supported(self):
         """
         return self.is_weblogic_version_or_above('12.2.1')
 
+    def is_database_defaults_supported(self):
+        """
+        Is setDatabaseDefaults() supported by the version of JRF?
+        :return: true if use the method to prime the JRF database defaults
+        """
+        return self.is_weblogic_version_or_above('12.1.2')
+
+    def is_set_server_groups_supported(self):
+        """
+        Is setServerGroups() supported by the version of WLST?
+        :return: true if the setServerGroups() is supported
+        """
+        return self.is_weblogic_version_or_above('12.1.2')
+
     def is_dynamic_clusters_supported(self):
         """
         Is dynamic clusters supported in this version of WLS?
@@ -107,7 +121,9 @@ def get_jrf_service_table_datasource_name(self):
         Get the JRF DataSource name for the service table schema.
         :return: the JRF DataSource name
         """
-        return 'LocalSvcTblDataSource'
+        if self.is_weblogic_version_or_above('12.1.2'):
+            return 'LocalSvcTblDataSource'
+        return 'mds-owsm'
 
     def get_default_admin_username(self):
         """