From b779cad54d4969af8e0976180060a44751c9ea8d Mon Sep 17 00:00:00 2001
From: davidjumani <dj.davidjumani1994@gmail.com>
Date: Tue, 5 Jan 2021 13:41:47 +0530
Subject: [PATCH 1/2] migratewizard: Display error and unfreeze form when api
 call fails

---
 src/views/compute/MigrateWizard.vue | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/src/views/compute/MigrateWizard.vue b/src/views/compute/MigrateWizard.vue
index e706b085f..4c558c1fb 100644
--- a/src/views/compute/MigrateWizard.vue
+++ b/src/views/compute/MigrateWizard.vue
@@ -177,8 +177,13 @@ export default {
         })
         this.$parent.$parent.close()
       }).catch(error => {
-        console.error(error)
-        this.$message.error(`${this.$t('message.migrating.vm.to.host.failed')} ${this.selectedHost.name}`)
+        this.$notification.error({
+          message: this.$t('message.request.failed'),
+          description: (error.response && error.response.headers && error.response.headers['x-description']) || error.message,
+          duration: 0
+        })
+      }).finally(() => {
+        this.loading = false
       })
     },
     handleChangePage (page, pageSize) {

From 1391381ac1aae1962fb26606a9652d5fb9bf1b29 Mon Sep 17 00:00:00 2001
From: davidjumani <dj.davidjumani1994@gmail.com>
Date: Wed, 6 Jan 2021 00:53:28 +0530
Subject: [PATCH 2/2] migratewizard: Fix fetching jobid from api response

---
 src/views/compute/MigrateWizard.vue | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/views/compute/MigrateWizard.vue b/src/views/compute/MigrateWizard.vue
index 4c558c1fb..87c4d638f 100644
--- a/src/views/compute/MigrateWizard.vue
+++ b/src/views/compute/MigrateWizard.vue
@@ -153,14 +153,15 @@ export default {
         hostid: this.selectedHost.id,
         virtualmachineid: this.resource.id
       }).then(response => {
+        const jobid = this.selectedHost.requiresStorageMotion ? response.migratevirtualmachinewithvolumeresponse.jobid : response.migratevirtualmachineresponse.jobid
         this.$store.dispatch('AddAsyncJob', {
           title: `${this.$t('label.migrating')} ${this.resource.name}`,
-          jobid: response.migratevirtualmachineresponse.jobid,
+          jobid: jobid,
           description: this.resource.name,
           status: 'progress'
         })
         this.$pollJob({
-          jobId: response.migratevirtualmachineresponse.jobid,
+          jobId: jobid,
           successMessage: `${this.$t('message.success.migrating')} ${this.resource.name}`,
           successMethod: () => {
             this.$parent.$parent.close()