Latest changes

Author: CarolynRountree

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/deploy/deployer_utils.py

@@ -308,3 +308,25 @@ 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):
+    if _wlst_helper.is_connected():
+        print '****** online I am'
+        _wlst_helper.save()
+        _wlst_helper.activate()
+        _wlst_helper.disconnect()
+    else:
+        print '******* offline I am'
+        _wlst_helper.update_domain()
+
+
+def read_again(model_context):
+    if _wlst_helper.is_connected():
+        _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:
+        _wlst_helper.close_domain()
+        _wlst_helper.read_domain(model_context.get_domain_home())

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

@@ -111,7 +111,9 @@ def update(self):
             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())
+            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/discover/topology_discoverer.py

@@ -289,6 +289,7 @@ def discover_security_configuration(self):
         security_configuration = self._find_singleton_name_in_folder(location)
         if security_configuration is not None:
             _logger.info('WLSDPLY-06622', class_name=_class_name, method_name=_method_name)
+            location.add_name_token(self._alias_helper.get_name_token(location), security_configuration)
             self._populate_model_parameters(result, location)
             self._discover_subfolders(result, location)
         _logger.exiting(class_name=_class_name, method_name=_method_name)

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

@@ -38,7 +38,7 @@ 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):
+    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
@@ -69,19 +69,19 @@ def target_jrf_groups_to_clusters_servers(self, domain_home):
         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=True)
+            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=True)
+            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, domain_home, server_groups_to_target):
+    def target_server_groups_to_servers(self, server_groups_to_target):
         """
         Target the server groups to the servers.
         :param server_groups_to_target: the list of server groups to target
@@ -151,7 +151,6 @@ 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)
 
-
         self.logger.exiting(class_name=self.__class_name, method_name=_method_name)
         return
 

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

@@ -880,6 +880,14 @@ 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
+        """
+        print 'IAMINCONNECED 999999999999999999999999999999999999999'
+        return wlst_helper.is_connected()
+
     def custom(self):
         """
         Change to the custom MBean tree.

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

@@ -423,7 +423,7 @@ def get_cmo():
     _method_name = 'get_cmo'
     _logger.entering(class_name=_class_name, method_name=_method_name)
 
-    if wlst.connected == 'true':
+    if is_connected():
         if wlst.cmo is None:
             pwe = exception_helper.create_pywlst_exception('WLSDPLY-00070')
             _logger.throwing(class_name=_class_name, method_name=_method_name, error=pwe)
@@ -440,6 +440,15 @@ def get_cmo():
     return wlst.cmo
 
 
+def is_connected():
+    """
+    Determine if wlst is currently conntected to the admin server - from the WlstContext
+    :return: Return True if currently connected
+    """
+    print '******* wlst connected ', wlst.connected
+    return wlst.connected == 'true'
+
+
 def get_mbean_for_wlst_path(path):
     """
     Return the mbean object for the provided path.

core/src/main/typedefs/RestrictedJRF.json

@@ -17,7 +17,7 @@
         },
         "RJRF_12213": {
             "baseTemplate": "Basic WebLogic Server Domain",
-            "extensionTemplates": [ "Oracle Restricted JRF",  "Oracle Enterprise Manager-Restricted JRF" ],
+            "extensionTemplates": [ "Oracle Restricted JRF" ],
             "serverGroupsToTarget": [ "JRF-MAN-SVR", "WSM-CACHE-SVR", "JRF-WS-CORE-MAN-SVR" ],
             "rcuSchemas": [ ]
         },