Add messages before push for pull request

Author: CarolynRountree

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
@@ -311,22 +311,41 @@ def get_file_hash(file_name):
 
 
 def save_changes(model_context):
-    if _wlst_helper.is_connected():
-        print '****** online I am'
-        _wlst_helper.save()
-        _wlst_helper.activate()
-        _wlst_helper.disconnect()
+    """
+    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:
-        print '******* offline I am'
+        _logger.fine('WLSDPLY-09111', class_name=_class_name, method_name=_method_name)
         _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()
+    """
+    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/resources/oracle/weblogic/deploy/messages/wlsdeploy_rb.properties

@@ -830,6 +830,13 @@ WLSDPLY-09106=Shared library name {0} contained {1} @ signs when only zero or on
 WLSDPLY-09107=Shared library name {0} contained {1} # signs when only zero or one are allowed
 WLSDPLY-09108=Model attribute {0} at model location {1} with value {2} references a location inside \
   the archive file but the archive file was not provided
+WLSDPLY-09109=Deploy is running in online mode, but is not connected. Bypass the update and disconnect.
+WLSDPLY-09110=Saving and activating updates to the domain in online mode and disconnecting wlst from the admin server.
+WLSDPLY-09111=Saving updates to domain in offline mode and closing the domain.
+WLSDPLY-09112=Connection with admin server already established for the domain. Bypass the connect and start edit session
+WLSDPLY-09113=Re-establish online connection with wlst to refresh with the current domain configuration and start edit \
+  session to continue the updates.
+WLSDPLY-09114=Re-read domain in offline wlst to refresh the current domain configuration and continue the updates.
 
 # wlsdeploy/tool/deploy/deployer.py
 WLSDPLY-09200=Error setting attribute {0} for {1} {2}: {3}