Write rollback changed information to rollback.file (#773)

* Write rollback changed information to rollback.file

* Rename exiting CLA argument rollback_if_require_restart to rollback_if_restart_required

* JIRA WDT-501 - Name change in system test

Author: CarolynRountree

core/src/main/python/deploy.py

@@ -154,8 +154,9 @@ def __deploy_online(model, model_context, aliases):
         __wlst_helper.silence()
         if model_context.is_rollback_if_restart_required() and restart_required:
             __wlst_helper.cancel_edit()
-            __logger.severe('WLSDPLY_09015', is_restartreq_output)
+            __logger.warning('WLSDPLY_09015', is_restartreq_output)
             exit_code = CommandLineArgUtil.PROG_ROLLBACK_IF_RESTART_EXIT_CODE
+            deployer_utils.list_rollback_changes(model_context, is_restartreq_output)
         else:
             __wlst_helper.save()
             __wlst_helper.activate(model_context.get_model_config().get_activate_timeout())

core/src/main/python/update.py

@@ -192,8 +192,9 @@ def __check_update_require_domain_restart(model_context):
         __wlst_helper.silence()
         if model_context.is_rollback_if_restart_required() and restart_required:
             __wlst_helper.cancel_edit()
-            __logger.severe('WLSDPLY_09015', is_restartreq_output)
+            __logger.warning('WLSDPLY_09015', is_restartreq_output)
             exit_code = CommandLineArgUtil.PROG_ROLLBACK_IF_RESTART_EXIT_CODE
+            deployer_utils.list_rollback_changes(model_context, is_restartreq_output)
         else:
             __wlst_helper.save()
             __wlst_helper.activate(model_context.get_model_config().get_activate_timeout())

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

@@ -480,6 +480,22 @@ def list_restarts(model_context, exit_code):
     return result
 
 
+def list_rollback_changes(model_context, rollback_string):
+    """
+    If output dir is present in the model context, write the restart data to the output dir as rollback.file.
+    :param model_context: Current context with the run parameters.
+    :param rollback_string: java.lang.String of changes that were rolled back
+    """
+    _method_name = 'list_rollback_changes'
+    _logger.entering(class_name=_class_name, method_name=_method_name)
+    output_dir = model_context.get_output_dir()
+    if len(str(rollback_string)) > 0 and output_dir is not None:
+        file_name = os.path.join(output_dir, 'rollback.file')
+        pw = FileUtils.getPrintWriter(file_name)
+        pw.println(rollback_string)
+        pw.close()
+
+
 def get_list_of_restarts():
     """
     Return the restart checklist from the online domain instance. Log each instance of the restart checklist
@@ -501,7 +517,7 @@ def get_list_of_restarts():
             prt_cluster = cluster_name
             if cluster_name == '':
                 prt_cluster = 'standalone'
-            for resource in server.getPendingRestartSystemResources():
+            for resource in resources:
                 line = list()
                 line.append(cluster_name)
                 line.append(server_name)

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

@@ -1390,6 +1390,30 @@ def get_pwd(self):
         self.__logger.finest('WLSDPLY-00035', path, class_name=self.__class_name, method_name=_method_name)
         return path
 
+    def get_object_name_name(self, object_name):
+        """
+        Get the object name from the ObjectName instance using javax.management.ObjectName methods.
+        :param object_name: ObjectName instance
+        :return: ObjectName name value
+        """
+        _method_name = 'get_object_name_name'
+        self.__logger.entering(object_name, class_name=self.__class_name, method_name=_method_name)
+        name = object_name.getKeyProperty('Name')
+        self.__logger.exiting(class_name=self.__class_name, method_name=_method_name, resul=name)
+        return name
+
+    def get_object_name_type(self, object_name):
+        """
+        Get the type of the object from the ObjectName instance using javax.management.ObjectName methods.
+        :param object_name: ObjectName instance
+        :return: ObjectName Type value
+        """
+        _method_name = 'get_object_name_name'
+        self.__logger.entering(object_name, class_name=self.__class_name, method_name=_method_name)
+        name_type = object_name.getKeyProperty('Type')
+        self.__logger.exiting(class_name=self.__class_name, method_name=_method_name, resul=name)
+        return name_type
+
     def silence(self):
         """
         Silence the STDOUT chatter from WLST.

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

@@ -64,7 +64,7 @@ class CommandLineArgUtil(object):
     ENCRYPT_MANUAL_SWITCH      = '-manual'
     # phony arg used as a key to store the password
     ONE_PASS_SWITCH            = '-password'
-    ROLLBACK_IF_RESTART_REQ_SWITCH = '-rollback_if_require_restart'
+    ROLLBACK_IF_RESTART_REQ_SWITCH = '-rollback_if_restart_required'
     USE_ENCRYPTION_SWITCH      = '-use_encryption'
     RUN_RCU_SWITCH             = '-run_rcu'
     TARGET_VERSION_SWITCH      = '-target_version'

core/src/main/resources/oracle/weblogic/deploy/messages/wlsdeploy_rb.properties

@@ -1007,7 +1007,7 @@ WLSDPLY-09012=While handling an error, failed to stop the current edit session a
 WLSDPLY-09013=While handling an error, failed to close the domain: {0}
 WLSDPLY-09014={0} was unable to load the model from {1} due to a translation error: {2}
 WLSDPLY-09015={0} deployment failed: {1}
-WLSDPLY_09015=Online update has been rollback because the flag rollback_if_require_restart is set and the update requires \
+WLSDPLY_09015=Online update has been rollback because the flag rollback_if_restart_required is set and the update requires \
   restart: {0}
 WLSDPLY-09016=There are outstanding changes but -discard_current_edit has been specified, all changes have been \
   discarded before processing update.

installer/src/main/bin/deployApps.cmd

@@ -77,7 +77,7 @@ ECHO              [-model_file ^<model_file^>]
 ECHO              [-variable_file ^<variable_file^>]
 ECHO              [-domain_type ^<domain_type^>]
 ECHO              [-wlst_path ^<wlst_path^>]
-ECHO              [-rollback_if_require_restart]
+ECHO              [-rollback_if_restart_required]
 ECHO              [-discard_current_edit]
 ECHO              [-output_dir]
 ECHO              [-admin_url ^<admin_url^>
@@ -115,11 +115,12 @@ ECHO         admin_url       - the admin server URL (used for online deploy)
 ECHO.
 ECHO         admin_user      - the admin username (used for online deploy)
 ECHO.
-ECHO         rollback_if_require_restart      - rollback the changes if the update requires domain restart
+ECHO         rollback_if_restart_required - rollback the changes if the update requires domain restart
 ECHO.
 ECHO         discard_current_edit      - discard all existing changes before starting update
 ECHO.
-ECHO         output_dir      - if present, write restart information to this directory as restart.file
+ECHO         output_dir      - if present, write restart information to this directory as restart.file, or,
+ECHO                           if rollback_if_restart_required used, write rollback information to rollback.file
 ECHO.
 ECHO    The -use_encryption switch tells the program that one or more of the
 ECHO    passwords in the model or variables files are encrypted.  The program will

installer/src/main/bin/deployApps.sh

@@ -38,7 +38,7 @@ usage() {
   echo "          [-variable_file <variable_file>]"
   echo "          [-domain_type <domain_type>]"
   echo "          [-wlst_path <wlst_path>]"
-  echo "          [-rollback_if_require_restart]"
+  echo "          [-rollback_if_restart_required]"
   echo "          [-discard_current_edit]"
   echo "          [-output_dir]"
   echo "          [-admin_url <admin_url>"
@@ -76,11 +76,12 @@ usage() {
   echo ""
   echo "        admin_user      - the admin username (used for online deploy)"
   echo ""
-  echo "        rollback_if_require_restart      - rollback the changes if the update requires domain restart"
+  echo "        rollback_if_restart_required  - rollback the changes if the update requires domain restart"
   echo ""
   echo "        discard_current_edit  - discard all existing changes before starting update"
   echo ""
-  echo "        output_dir      - if present, write restart information to this directory in restart.file"
+  echo "        output_dir      - if present, write restart information to this directory in restart.file, or,"
+  echo "                          if rollback_if_restart_required used, write rollback information to rollback.file"
   echo ""
   echo "    The -use_encryption switch tells the program that one or more of the"
   echo "    passwords in the model or variables files are encrypted.  The program will"

installer/src/main/bin/shared.cmd

@@ -351,7 +351,7 @@ GOTO :EOF
 
     IF "%RETURN_CODE%" == "104" (
       ECHO.
-      ECHO %SCRIPT_NAME% completed successfully but the domain changes have been rolled back because -rollback_if_require_restart is specified  ^(exit code = %RETURN_CODE%^)
+      ECHO %SCRIPT_NAME% completed successfully but the domain changes have been rolled back because -rollback_if_restart_required is specified  ^(exit code = %RETURN_CODE%^)
       EXIT /B %RETURN_CODE%
     )
     IF "%RETURN_CODE%" == "103" (

installer/src/main/bin/shared.sh

@@ -305,7 +305,7 @@ checkExitCode() {
 
     if [ $returnCode -eq 104 ]; then
       echo ""
-      echo "$scriptName completed successfully but the domain changes have been rolled back because -rollback_if_require_restart is specified (exit code = ${RETURN_CODE})"
+      echo "$scriptName completed successfully but the domain changes have been rolled back because -rollback_if_restart_required is specified (exit code = ${RETURN_CODE})"
     elif [ $returnCode -eq 103 ]; then
       echo ""
       echo "$scriptName completed successfully but the domain requires a restart for the changes to take effect (exit code = ${RETURN_CODE})"