Merge pull request #888 from mturley/885-download-wrapper-log

[#885] Add Virt-v2v-wrapper log download menu item
ManageIQ · Mar 5, 2019 · 55ee3b8 · 55ee3b8
2 parents e8713e2 + 5180bab
commit 55ee3b8
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 6 deletions.
diff --git a/app/javascript/react/screens/App/Plan/PlanActions.js b/app/javascript/react/screens/App/Plan/PlanActions.js
@@ -161,7 +161,7 @@ export const resetPlanStateAction = () => ({
   type: RESET_PLAN_STATE
 });
 
-export const downloadLogAction = task => dispatch => {
+export const downloadLogAction = (task, logType = 'v2v') => dispatch => {
   dispatch({
     type: DOWNLOAD_LOG_CLICKED,
     payload: task.id
@@ -170,18 +170,21 @@ export const downloadLogAction = task => dispatch => {
     type: FETCH_V2V_MIGRATION_TASK_LOG,
     payload: new Promise((resolve, reject) => {
       http
-        .get(`/migration_log/download_migration_log/${task.id}`)
+        .get(`/migration_log/download_migration_log/${task.id}?log_type=${logType}`)
         .then(response => {
           resolve(response);
           dispatch({
             type: DOWNLOAD_LOG_COMPLETED,
             payload: task.id
           });
-          const v2vLogFileName = `${task.vmName}.log`;
+          let filenameSuffix = '';
+          if (logType === 'v2v') filenameSuffix = 'virt-v2v';
+          if (logType === 'wrapper') filenameSuffix = 'virt-v2v-wrapper';
+          const v2vLogFileName = `${task.vmName}-${filenameSuffix}.log`;
           if (response.data.status === 'Ok') {
             const file = new File([response.data.log_contents], v2vLogFileName, { type: 'text/plain;charset=utf-8' });
             saveAs(file);
-            const successMsg = sprintf(__('"%s" download successful'), `${task.vmName}.log`);
+            const successMsg = sprintf(__('"%s" download successful'), v2vLogFileName);
             dispatch({
               type: V2V_NOTIFICATION_ADD,
               message: successMsg,
@@ -191,7 +194,7 @@ export const downloadLogAction = task => dispatch => {
           } else {
             const failureMsg = sprintf(
               __('Failed to download "%s". Reason - "%s"'),
-              `${task.vmName}.log`,
+              v2vLogFileName,
               parseComplexErrorMessages(response.data.status_message)
             );
             dispatch({

diff --git a/...vascript/react/screens/App/Plan/components/PlanRequestDetailList/PlanRequestDetailList.js b/...vascript/react/screens/App/Plan/components/PlanRequestDetailList/PlanRequestDetailList.js
@@ -40,7 +40,9 @@ class PlanRequestDetailList extends React.Component {
   onSelect = (eventKey, task) => {
     const { downloadLogAction, fetchOrchestrationStackUrl, fetchOrchestrationStackAction } = this.props;
     if (eventKey === 'migration') {
-      downloadLogAction(task);
+      downloadLogAction(task, 'v2v');
+    } else if (eventKey === 'wrapper') {
+      downloadLogAction(task, 'wrapper');
     } else {
       fetchOrchestrationStackAction(fetchOrchestrationStackUrl, eventKey, task);
     }
@@ -416,6 +418,12 @@ class PlanRequestDetailList extends React.Component {
                       >
                         {__('Migration log')}
                       </MenuItem>
+                      <MenuItem
+                        eventKey="wrapper"
+                        disabled={downloadLogInProgressTaskIds && downloadLogInProgressTaskIds.indexOf(task.id) > -1}
+                      >
+                        {__('Virt-v2v-wrapper log')}
+                      </MenuItem>
                       {task.options.postPlaybookComplete && (
                         <MenuItem
                           eventKey="postMigration"