From 506bcf66f04f69c942f029b172c25ccc6397026d Mon Sep 17 00:00:00 2001
From: Abhishek Kumar <abhishek.mrt22@gmail.com>
Date: Tue, 6 Oct 2020 15:00:02 +0530
Subject: [PATCH 1/9] vm: backend migration changes support

Signed-off-by: Abhishek Kumar <abhishek.mrt22@gmail.com>
---
 src/config/section/compute.js | 2 ++
 src/locales/en.json           | 1 +
 2 files changed, 3 insertions(+)

diff --git a/src/config/section/compute.js b/src/config/section/compute.js
index a283fce97..a164deadb 100644
--- a/src/config/section/compute.js
+++ b/src/config/section/compute.js
@@ -311,6 +311,8 @@ export default {
           dataView: true,
           show: (record, store) => { return ['Stopped'].includes(record.state) && ['Admin'].includes(store.userInfo.roletype) },
           args: ['storageid', 'virtualmachineid'],
+          component: () => import('@/views/compute/MigrateVMStorage'),
+          popup: true,
           mapping: {
             storageid: {
               api: 'listStoragePools',
diff --git a/src/locales/en.json b/src/locales/en.json
index fa54ea1c4..071cc106f 100644
--- a/src/locales/en.json
+++ b/src/locales/en.json
@@ -2911,6 +2911,7 @@
 "message.migrating.failed": "Migration failed",
 "message.migrating.processing": "Migration in progress for",
 "message.migrating.vm.to.host.failed": "Failed to migrate VM to host",
+"message.migrating.vm.to.storage.failed": "Failed to migrate VM to storage",
 "message.move.acl.order": "Move ACL rule order",
 "message.move.acl.order.failed": "Failed to move ACL rule",
 "message.move.acl.order.processing": "Moving ACL rule...",

From 5910756019b959325bcf3fdf23e8dc0110b8756c Mon Sep 17 00:00:00 2001
From: Abhishek Kumar <abhishek.mrt22@gmail.com>
Date: Tue, 6 Oct 2020 15:10:34 +0530
Subject: [PATCH 2/9] add missing file

Signed-off-by: Abhishek Kumar <abhishek.mrt22@gmail.com>
---
 src/views/compute/MigrateVMStorage.vue | 202 +++++++++++++++++++++++++
 1 file changed, 202 insertions(+)
 create mode 100644 src/views/compute/MigrateVMStorage.vue

diff --git a/src/views/compute/MigrateVMStorage.vue b/src/views/compute/MigrateVMStorage.vue
new file mode 100644
index 000000000..a69c54ebd
--- /dev/null
+++ b/src/views/compute/MigrateVMStorage.vue
@@ -0,0 +1,202 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
+
+<template>
+  <div class="form-layout">
+    <a-spin :spinning="loading">
+      <a-form
+        :form="form"
+        @submit="handleSubmit"
+        layout="vertical">
+        <a-form-item>
+          <span slot="label">
+            {{ $t('label.storageid') }}
+            <a-tooltip :title="apiParams.storageid.description" v-if="!(apiParams.hostid && apiParams.hostid.required === false)">
+              <a-icon type="info-circle" style="color: rgba(0,0,0,.45)" />
+            </a-tooltip>
+          </span>
+          <a-select
+            :loading="loading"
+            v-decorator="['storageid', {
+              rules: [{ required: true, message: `${this.$t('message.error.required.input')}` }]
+            }]">
+            <a-select-option v-for="storagePool in storagePools" :key="storagePool.id">
+              {{ storagePool.name || storagePool.id }}
+            </a-select-option>
+          </a-select>
+        </a-form-item>
+
+        <div :span="24" class="action-button">
+          <a-button @click="closeAction">{{ this.$t('label.cancel') }}</a-button>
+          <a-button :loading="loading" type="primary" @click="handleSubmit">{{ this.$t('label.ok') }}</a-button>
+        </div>
+      </a-form>
+    </a-spin>
+  </div>
+</template>
+
+<script>
+import { api } from '@/api'
+
+export default {
+  name: 'MigrateVMStorage',
+  props: {
+    resource: {
+      type: Object,
+      required: true
+    }
+  },
+  data () {
+    return {
+      loading: false,
+      storagePools: []
+    }
+  },
+  beforeCreate () {
+    this.form = this.$form.createForm(this)
+    this.apiParams = {}
+    this.apiConfig = this.$store.getters.apis.migrateVirtualMachineWithVolume || {}
+    this.apiConfig.params.forEach(param => {
+      this.apiParams[param.name] = param
+    })
+    this.apiConfig = this.$store.getters.apis.migrateVirtualMachine || {}
+    this.apiConfig.params.forEach(param => {
+      if (!(param.name in this.apiParams)) {
+        this.apiParams[param.name] = param
+      }
+    })
+  },
+  created () {
+  },
+  mounted () {
+    this.fetchData()
+  },
+  methods: {
+    fetchData () {
+      this.loading = true
+      api('listStoragePools', {
+        zoneid: this.resource.zoneid
+      }).then(response => {
+        if (this.arrayHasItems(response.liststoragepoolsresponse.storagepool)) {
+          this.storagePools = response.liststoragepoolsresponse.storagepool
+        }
+      }).finally(() => {
+        this.loading = false
+      })
+    },
+    isValidValueForKey (obj, key) {
+      return key in obj && obj[key] != null
+    },
+    arrayHasItems (array) {
+      return array !== null && array !== undefined && Array.isArray(array) && array.length > 0
+    },
+    isObjectEmpty (obj) {
+      return !(obj !== null && obj !== undefined && Object.keys(obj).length > 0 && obj.constructor === Object)
+    },
+    handleSubmit (e) {
+      e.preventDefault()
+      this.form.validateFields((err, values) => {
+        if (err) {
+          return
+        }
+        this.loading = true
+        var migrateApi = 'migrateVirtualMachine'
+        var params = {
+          virtualmachineid: this.resource.id,
+          storageid: values.storageid
+        }
+        if (this.apiParams.hostid && this.apiParams.hostid.required === false) {
+          migrateApi = 'migrateVirtualMachineWithVolume'
+          var rootVolume = null
+          api('listVolumes', {
+            virtualmachineid: this.resource.id
+          }).then(response => {
+            var volumes = response.listvolumesresponse.volume
+            if (volumes && volumes.length > 0) {
+              for (var v in volumes) {
+                if (v.type === 'ROOT') {
+                  rootVolume = v
+                  break
+                }
+              }
+            }
+          })
+          if (rootVolume == null) {
+            this.$message.error('Failed to find ROOT volume for the VM ' + this.resource.id)
+            return
+          }
+          params = {
+            virtualmachineid: this.resource.id,
+            'migrateto[0].volume': rootVolume.id,
+            'migrateto[0].pool': this.selectedPoolId
+          }
+        }
+        api(migrateApi, params).then(response => {
+          var jobId = migrateApi === 'migrateVirtualMachineWithVolume' ? response.migratevirtualmachinewithvolumeresponse.jobid : response.migratevirtualmachineresponse.jobid
+          this.$store.dispatch('AddAsyncJob', {
+            title: `${this.$t('label.migrating')} ${this.resource.name}`,
+            jobid: jobId,
+            description: this.resource.name,
+            status: 'progress'
+          })
+          this.$pollJob({
+            jobId: jobId,
+            successMessage: `${this.$t('message.success.migrating')} ${this.resource.name}`,
+            successMethod: () => {
+              this.$parent.$parent.close()
+            },
+            errorMessage: this.$t('message.migrating.failed'),
+            errorMethod: () => {
+              this.$parent.$parent.close()
+            },
+            loadingMessage: `${this.$t('message.migrating.processing')} ${this.resource.name}`,
+            catchMessage: this.$t('error.fetching.async.job.result'),
+            catchMethod: () => {
+              this.$parent.$parent.close()
+            }
+          })
+          this.$parent.$parent.close()
+        }).catch(error => {
+          console.error(error)
+          this.$message.error(`${this.$t('message.migrating.vm.to.storage.failed')} ${values.storageid}`)
+        })
+      })
+    },
+    closeAction () {
+      this.$emit('close-action')
+    }
+  }
+}
+</script>
+
+<style scoped lang="less">
+  .form-layout {
+    width: 60vw;
+
+    @media (min-width: 500px) {
+      width: 450px;
+    }
+  }
+
+  .action-button {
+    text-align: right;
+
+    button {
+      margin-right: 5px;
+    }
+  }
+</style>

From 92dd3c796df5110bdadf450d43836ba712fe7087 Mon Sep 17 00:00:00 2001
From: Abhishek Kumar <abhishek.mrt22@gmail.com>
Date: Tue, 3 Nov 2020 18:01:07 +0530
Subject: [PATCH 3/9] show storage migration required

Signed-off-by: Abhishek Kumar <abhishek.mrt22@gmail.com>
---
 src/locales/en.json                 | 1 +
 src/views/compute/MigrateWizard.vue | 7 +++++++
 2 files changed, 8 insertions(+)

diff --git a/src/locales/en.json b/src/locales/en.json
index 071cc106f..4bb473cdb 100644
--- a/src/locales/en.json
+++ b/src/locales/en.json
@@ -2019,6 +2019,7 @@
 "label.storage.tags": "Storage Tags",
 "label.storage.traffic": "Storage Traffic",
 "label.storageid": "Primary Storage",
+"label.storagemigrationrequired": "Storage Migration Required",
 "label.storagemotionenabled": "Storage Motion Enabled",
 "label.storagepolicy": "Storage policy",
 "label.storagepool": "Storage Pool",
diff --git a/src/views/compute/MigrateWizard.vue b/src/views/compute/MigrateWizard.vue
index af305aedd..ed4cc097a 100644
--- a/src/views/compute/MigrateWizard.vue
+++ b/src/views/compute/MigrateWizard.vue
@@ -47,6 +47,9 @@
       <div slot="memused" slot-scope="record">
         {{ record.memoryused | byteToGigabyte }} GB
       </div>
+      <div slot="requiresstoragemigration" slot-scope="record">
+        {{ record.requiresStorageMotion ? $t('label.yes') : $t('label.no') }}
+      </div>
       <template slot="select" slot-scope="record">
         <a-radio
           class="host-item__radio"
@@ -117,6 +120,10 @@ export default {
           title: this.$t('label.memused'),
           scopedSlots: { customRender: 'memused' }
         },
+        {
+          title: this.$t('label.storagemigrationrequired'),
+          scopedSlots: { customRender: 'requiresstoragemigration' }
+        },
         {
           title: this.$t('label.select'),
           scopedSlots: { customRender: 'select' }

From 48e02d9e9fb53996e001d6cab20adab683a4a753 Mon Sep 17 00:00:00 2001
From: Abhishek Kumar <abhishek.mrt22@gmail.com>
Date: Wed, 4 Nov 2020 01:46:11 +0530
Subject: [PATCH 4/9] show cluster, pod name

Signed-off-by: Abhishek Kumar <abhishek.mrt22@gmail.com>
---
 src/views/compute/MigrateWizard.vue | 20 +++++++++++++++++---
 1 file changed, 17 insertions(+), 3 deletions(-)

diff --git a/src/views/compute/MigrateWizard.vue b/src/views/compute/MigrateWizard.vue
index ed4cc097a..c7ff952d3 100644
--- a/src/views/compute/MigrateWizard.vue
+++ b/src/views/compute/MigrateWizard.vue
@@ -47,6 +47,12 @@
       <div slot="memused" slot-scope="record">
         {{ record.memoryused | byteToGigabyte }} GB
       </div>
+      <div slot="cluster" slot-scope="record">
+        {{ record.clustername }}
+      </div>
+      <div slot="pod" slot-scope="record">
+        {{ record.podname }}
+      </div>
       <div slot="requiresstoragemigration" slot-scope="record">
         {{ record.requiresStorageMotion ? $t('label.yes') : $t('label.no') }}
       </div>
@@ -120,6 +126,14 @@ export default {
           title: this.$t('label.memused'),
           scopedSlots: { customRender: 'memused' }
         },
+        {
+          title: this.$t('label.cluster'),
+          scopedSlots: { customRender: 'cluster' }
+        },
+        {
+          title: this.$t('label.pod'),
+          scopedSlots: { customRender: 'pod' }
+        },
         {
           title: this.$t('label.storagemigrationrequired'),
           scopedSlots: { customRender: 'requiresstoragemigration' }
@@ -210,9 +224,9 @@ export default {
 <style scoped lang="scss">
 
   .form {
-    width: 85vw;
-    @media (min-width: 800px) {
-      width: 750px;
+    width: 95vw;
+    @media (min-width: 900px) {
+      width: 850px;
     }
   }
 

From 53603ac1917b75389fff4e32e5793377e8e3cc72 Mon Sep 17 00:00:00 2001
From: Abhishek Kumar <abhishek.mrt22@gmail.com>
Date: Fri, 13 Nov 2020 11:38:53 +0530
Subject: [PATCH 5/9] fix vm storage migration

Signed-off-by: Abhishek Kumar <abhishek.mrt22@gmail.com>
---
 src/views/compute/MigrateVMStorage.vue | 98 ++++++++++++++------------
 1 file changed, 52 insertions(+), 46 deletions(-)

diff --git a/src/views/compute/MigrateVMStorage.vue b/src/views/compute/MigrateVMStorage.vue
index a69c54ebd..0268be5c9 100644
--- a/src/views/compute/MigrateVMStorage.vue
+++ b/src/views/compute/MigrateVMStorage.vue
@@ -115,10 +115,6 @@ export default {
         }
         this.loading = true
         var migrateApi = 'migrateVirtualMachine'
-        var params = {
-          virtualmachineid: this.resource.id,
-          storageid: values.storageid
-        }
         if (this.apiParams.hostid && this.apiParams.hostid.required === false) {
           migrateApi = 'migrateVirtualMachineWithVolume'
           var rootVolume = null
@@ -127,53 +123,63 @@ export default {
           }).then(response => {
             var volumes = response.listvolumesresponse.volume
             if (volumes && volumes.length > 0) {
-              for (var v in volumes) {
-                if (v.type === 'ROOT') {
-                  rootVolume = v
-                  break
-                }
+              volumes = volumes.filter(item => item.type === 'ROOT')
+              console.log(volumes)
+              if (volumes && volumes.length > 0) {
+                rootVolume = volumes[0]
+              }
+              if (rootVolume == null) {
+                this.$message.error('Failed to find ROOT volume for the VM ' + this.resource.id)
+                this.closeAction()
               }
+              this.migrateVm(migrateApi, values.storageid, rootVolume.id)
             }
           })
-          if (rootVolume == null) {
-            this.$message.error('Failed to find ROOT volume for the VM ' + this.resource.id)
-            return
-          }
-          params = {
-            virtualmachineid: this.resource.id,
-            'migrateto[0].volume': rootVolume.id,
-            'migrateto[0].pool': this.selectedPoolId
-          }
+          return
         }
-        api(migrateApi, params).then(response => {
-          var jobId = migrateApi === 'migrateVirtualMachineWithVolume' ? response.migratevirtualmachinewithvolumeresponse.jobid : response.migratevirtualmachineresponse.jobid
-          this.$store.dispatch('AddAsyncJob', {
-            title: `${this.$t('label.migrating')} ${this.resource.name}`,
-            jobid: jobId,
-            description: this.resource.name,
-            status: 'progress'
-          })
-          this.$pollJob({
-            jobId: jobId,
-            successMessage: `${this.$t('message.success.migrating')} ${this.resource.name}`,
-            successMethod: () => {
-              this.$parent.$parent.close()
-            },
-            errorMessage: this.$t('message.migrating.failed'),
-            errorMethod: () => {
-              this.$parent.$parent.close()
-            },
-            loadingMessage: `${this.$t('message.migrating.processing')} ${this.resource.name}`,
-            catchMessage: this.$t('error.fetching.async.job.result'),
-            catchMethod: () => {
-              this.$parent.$parent.close()
-            }
-          })
-          this.$parent.$parent.close()
-        }).catch(error => {
-          console.error(error)
-          this.$message.error(`${this.$t('message.migrating.vm.to.storage.failed')} ${values.storageid}`)
+        this.migrateVm(migrateApi, values.storageid, rootVolume.id)
+      })
+    },
+    migrateVm (migrateApi, storageId, rootVolumeId) {
+      var params = {
+        virtualmachineid: this.resource.id,
+        storageid: storageId
+      }
+      if (rootVolumeId !== null) {
+        params = {
+          virtualmachineid: this.resource.id,
+          'migrateto[0].volume': rootVolumeId,
+          'migrateto[0].pool': storageId
+        }
+      }
+      api(migrateApi, params).then(response => {
+        var jobId = migrateApi === 'migrateVirtualMachineWithVolume' ? response.migratevirtualmachinewithvolumeresponse.jobid : response.migratevirtualmachineresponse.jobid
+        this.$store.dispatch('AddAsyncJob', {
+          title: `${this.$t('label.migrating')} ${this.resource.name}`,
+          jobid: jobId,
+          description: this.resource.name,
+          status: 'progress'
+        })
+        this.$pollJob({
+          jobId: jobId,
+          successMessage: `${this.$t('message.success.migrating')} ${this.resource.name}`,
+          successMethod: () => {
+            this.$parent.$parent.close()
+          },
+          errorMessage: this.$t('message.migrating.failed'),
+          errorMethod: () => {
+            this.$parent.$parent.close()
+          },
+          loadingMessage: `${this.$t('message.migrating.processing')} ${this.resource.name}`,
+          catchMessage: this.$t('error.fetching.async.job.result'),
+          catchMethod: () => {
+            this.$parent.$parent.close()
+          }
         })
+        this.$parent.$parent.close()
+      }).catch(error => {
+        console.error(error)
+        this.$message.error(`${this.$t('message.migrating.vm.to.storage.failed')} ${storageId}`)
       })
     },
     closeAction () {

From a4b457f19350890965b7c2775409ddec5c8ef1f5 Mon Sep 17 00:00:00 2001
From: Abhishek Kumar <abhishek.mrt22@gmail.com>
Date: Thu, 19 Nov 2020 09:49:48 +0530
Subject: [PATCH 6/9] fix

Signed-off-by: Abhishek Kumar <abhishek.mrt22@gmail.com>
---
 src/views/compute/MigrateVMStorage.vue | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/views/compute/MigrateVMStorage.vue b/src/views/compute/MigrateVMStorage.vue
index 0268be5c9..6a70b1aa6 100644
--- a/src/views/compute/MigrateVMStorage.vue
+++ b/src/views/compute/MigrateVMStorage.vue
@@ -119,6 +119,7 @@ export default {
           migrateApi = 'migrateVirtualMachineWithVolume'
           var rootVolume = null
           api('listVolumes', {
+            listAll: true,
             virtualmachineid: this.resource.id
           }).then(response => {
             var volumes = response.listvolumesresponse.volume

From 9ae20c5ab32914ef0bf0dd00227da1456bc43a20 Mon Sep 17 00:00:00 2001
From: Abhishek Kumar <abhishek.mrt22@gmail.com>
Date: Fri, 20 Nov 2020 13:09:44 +0530
Subject: [PATCH 7/9] wip changes

Signed-off-by: Abhishek Kumar <abhishek.mrt22@gmail.com>
---
 src/config/section/compute.js         | 20 ++------------------
 src/config/section/infra/ilbvms.js    | 19 ++++++++++++-------
 src/config/section/infra/routers.js   | 23 ++++++++++++-----------
 src/config/section/infra/systemVms.js | 23 ++++++++++++-----------
 src/locales/en.json                   |  6 ++++++
 src/views/compute/MigrateWizard.vue   | 18 +++++++++++++++---
 6 files changed, 59 insertions(+), 50 deletions(-)

diff --git a/src/config/section/compute.js b/src/config/section/compute.js
index a164deadb..3da5b3c9a 100644
--- a/src/config/section/compute.js
+++ b/src/config/section/compute.js
@@ -294,13 +294,7 @@ export default {
           dataView: true,
           show: (record, store) => { return ['Running'].includes(record.state) && ['Admin'].includes(store.userInfo.roletype) },
           component: () => import('@/views/compute/MigrateWizard'),
-          popup: true,
-          args: ['hostid', 'virtualmachineid'],
-          mapping: {
-            virtualmachineid: {
-              value: (record) => { return record.id }
-            }
-          }
+          popup: true
         },
         {
           api: 'migrateVirtualMachine',
@@ -310,18 +304,8 @@ export default {
           docHelp: 'adminguide/virtual_machines.html#moving-vms-between-hosts-manual-live-migration',
           dataView: true,
           show: (record, store) => { return ['Stopped'].includes(record.state) && ['Admin'].includes(store.userInfo.roletype) },
-          args: ['storageid', 'virtualmachineid'],
           component: () => import('@/views/compute/MigrateVMStorage'),
-          popup: true,
-          mapping: {
-            storageid: {
-              api: 'listStoragePools',
-              params: (record) => { return { zoneid: record.zoneid } }
-            },
-            virtualmachineid: {
-              value: (record) => { return record.id }
-            }
-          }
+          popup: true
         },
         {
           api: 'resetPasswordForVirtualMachine',
diff --git a/src/config/section/infra/ilbvms.js b/src/config/section/infra/ilbvms.js
index 8b2434e3c..393a76960 100644
--- a/src/config/section/infra/ilbvms.js
+++ b/src/config/section/infra/ilbvms.js
@@ -45,13 +45,18 @@ export default {
       icon: 'drag',
       label: 'label.action.migrate.router',
       dataView: true,
-      show: (record) => { return record.state === 'Running' },
-      args: ['virtualmachineid', 'hostid'],
-      mapping: {
-        virtualmachineid: {
-          value: (record) => { return record.id }
-        }
-      }
+      show: (record, store) => { return record.state === 'Running' && ['Admin'].includes(store.userInfo.roletype) },
+      component: () => import('@/views/compute/MigrateWizard'),
+      popup: true
+    },
+    {
+      api: 'migrateSystemVm',
+      icon: 'drag',
+      label: 'label.action.migrate.systemvm.to.ps',
+      dataView: true,
+      show: (record, store) => { return ['Stopped'].includes(record.state) && ['VMware'].includes(record.hypervisor) },
+      component: () => import('@/views/compute/MigrateVMStorage'),
+      popup: true
     }
   ]
 }
diff --git a/src/config/section/infra/routers.js b/src/config/section/infra/routers.js
index b10991409..6ffa4680a 100644
--- a/src/config/section/infra/routers.js
+++ b/src/config/section/infra/routers.js
@@ -104,17 +104,18 @@ export default {
       icon: 'drag',
       label: 'label.action.migrate.router',
       dataView: true,
-      show: (record, store) => { return ['Running'].includes(record.state) && ['Admin'].includes(store.userInfo.roletype) },
-      args: ['virtualmachineid', 'hostid'],
-      mapping: {
-        virtualmachineid: {
-          value: (record) => { return record.id }
-        },
-        hostid: {
-          api: 'findHostsForMigration',
-          params: (record) => { return { virtualmachineid: record.id } }
-        }
-      }
+      show: (record, store) => { return record.state === 'Running' && ['Admin'].includes(store.userInfo.roletype) },
+      component: () => import('@/views/compute/MigrateWizard'),
+      popup: true
+    },
+    {
+      api: 'migrateSystemVm',
+      icon: 'drag',
+      label: 'label.action.migrate.systemvm.to.ps',
+      dataView: true,
+      show: (record, store) => { return ['Stopped'].includes(record.state) && ['VMware'].includes(record.hypervisor) },
+      component: () => import('@/views/compute/MigrateVMStorage'),
+      popup: true
     },
     {
       api: 'runDiagnostics',
diff --git a/src/config/section/infra/systemVms.js b/src/config/section/infra/systemVms.js
index 8b3c66afd..bc20b904d 100644
--- a/src/config/section/infra/systemVms.js
+++ b/src/config/section/infra/systemVms.js
@@ -69,17 +69,18 @@ export default {
       icon: 'drag',
       label: 'label.action.migrate.systemvm',
       dataView: true,
-      show: (record) => { return record.state === 'Running' },
-      args: ['virtualmachineid', 'hostid'],
-      mapping: {
-        virtualmachineid: {
-          value: (record) => { return record.id }
-        },
-        hostid: {
-          api: 'findHostsForMigration',
-          params: (record) => { return { virtualmachineid: record.id } }
-        }
-      }
+      show: (record, store) => { return record.state === 'Running' && ['Admin'].includes(store.userInfo.roletype) },
+      component: () => import('@/views/compute/MigrateWizard'),
+      popup: true
+    },
+    {
+      api: 'migrateSystemVm',
+      icon: 'drag',
+      label: 'label.action.migrate.systemvm.to.ps',
+      dataView: true,
+      show: (record, store) => { return ['Stopped'].includes(record.state) && ['VMware'].includes(record.hypervisor) },
+      component: () => import('@/views/compute/MigrateVMStorage'),
+      popup: true
     },
     {
       api: 'runDiagnostics',
diff --git a/src/locales/en.json b/src/locales/en.json
index 4bb473cdb..8f6ff11b4 100644
--- a/src/locales/en.json
+++ b/src/locales/en.json
@@ -213,8 +213,10 @@
 "label.action.migrate.instance.processing": "Migrating Instance....",
 "label.action.migrate.router": "Migrate Router",
 "label.action.migrate.router.processing": "Migrating Router....",
+"label.action.migrate.router.to.ps": "Migrate router to another primary storage",
 "label.action.migrate.systemvm": "Migrate System VM",
 "label.action.migrate.systemvm.processing": "Migrating System VM....",
+"label.action.migrate.systemvm.to.ps": "Migrate system VM to another primary storage",
 "label.action.project.add.account": "Add Account to Project",
 "label.action.project.add.user": "Add User to Project",
 "label.action.reboot.instance": "Reboot Instance",
@@ -1352,6 +1354,7 @@
 "label.migrate.instance.to.host": "Migrate instance to another host",
 "label.migrate.instance.to.ps": "Migrate instance to another primary storage",
 "label.migrate.lb.vm": "Migrate LB VM",
+"label.migrate.lb.vm.to.ps": "Migrate LB VM to another primary storage",
 "label.migrate.router.to": "Migrate Router to",
 "label.migrate.systemvm.to": "Migrate System VM to",
 "label.migrate.to.host": "Migrate to host",
@@ -2904,6 +2907,9 @@
 "message.migrate.instance.select.host": "Please select a host for migration",
 "message.migrate.instance.to.host": "Please confirm that you want to migrate instance to another host.",
 "message.migrate.instance.to.ps": "Please confirm that you want to migrate instance to another primary storage.",
+"message.migrate.lb.vm.to.ps": "Please confirm that you want to migrate LB VM to another primary storage.",
+"message.migrate.router.to.ps": "Please confirm that you want to migrate router to another primary storage.",
+"message.migrate.system.vm.to.ps": "Please confirm that you want to migrate system VM to another primary storage.",
 "message.migrate.router.confirm": "Please confirm the host you wish to migrate the router to:",
 "message.migrate.systemvm.confirm": "Please confirm the host you wish to migrate the system VM to:",
 "message.migrate.volume": "Please confirm that you want to migrate volume to another primary storage.",
diff --git a/src/views/compute/MigrateWizard.vue b/src/views/compute/MigrateWizard.vue
index c7ff952d3..2981bae32 100644
--- a/src/views/compute/MigrateWizard.vue
+++ b/src/views/compute/MigrateWizard.vue
@@ -103,6 +103,7 @@ export default {
   data () {
     return {
       loading: true,
+      isUserVm: true,
       hosts: [],
       selectedHost: {},
       searchQuery: '',
@@ -145,6 +146,11 @@ export default {
       ]
     }
   },
+  beforeCreate () {
+    if (this.$route.meta.name !== 'vm') {
+      this.isUserVm = false
+    }
+  },
   mounted () {
     this.fetchData()
   },
@@ -170,18 +176,24 @@ export default {
     },
     submitForm () {
       this.loading = true
-      api(this.selectedHost.requiresStorageMotion ? 'migrateVirtualMachineWithVolume' : 'migrateVirtualMachine', {
+      var migrateApi = this.isUserVm
+        ? this.selectedHost.requiresStorageMotion ? 'migratevirtualMachineWithVolume' : 'migrateVirtualMachine'
+        : 'migrateSystemVm'
+      api(migrateApi, {
         hostid: this.selectedHost.id,
         virtualmachineid: this.resource.id
       }).then(response => {
+        var migrateResponse = this.isUserVm
+          ? this.selectedHost.requiresStorageMotion ? response.migratevirtualmachinewithvolumeresponse : response.migratevirtualmachineresponse
+          : response.migratesystemvmresponse
         this.$store.dispatch('AddAsyncJob', {
           title: `${this.$t('label.migrating')} ${this.resource.name}`,
-          jobid: response.migratevirtualmachineresponse.jobid,
+          jobid: migrateResponse.jobid,
           description: this.resource.name,
           status: 'progress'
         })
         this.$pollJob({
-          jobId: response.migratevirtualmachineresponse.jobid,
+          jobId: migrateResponse.jobid,
           successMessage: `${this.$t('message.success.migrating')} ${this.resource.name}`,
           successMethod: () => {
             this.$parent.$parent.close()

From a9099bc33787a5217b0fabcb1f21c09647d07af5 Mon Sep 17 00:00:00 2001
From: Abhishek Kumar <abhishek.mrt22@gmail.com>
Date: Fri, 20 Nov 2020 16:53:40 +0530
Subject: [PATCH 8/9] fix

Signed-off-by: Abhishek Kumar <abhishek.mrt22@gmail.com>
---
 src/views/compute/MigrateVMStorage.vue | 47 ++++++++++++++++++--------
 src/views/compute/MigrateWizard.vue    | 16 ++++-----
 2 files changed, 40 insertions(+), 23 deletions(-)

diff --git a/src/views/compute/MigrateVMStorage.vue b/src/views/compute/MigrateVMStorage.vue
index 6a70b1aa6..7744c5710 100644
--- a/src/views/compute/MigrateVMStorage.vue
+++ b/src/views/compute/MigrateVMStorage.vue
@@ -69,16 +69,25 @@ export default {
   beforeCreate () {
     this.form = this.$form.createForm(this)
     this.apiParams = {}
-    this.apiConfig = this.$store.getters.apis.migrateVirtualMachineWithVolume || {}
-    this.apiConfig.params.forEach(param => {
-      this.apiParams[param.name] = param
-    })
-    this.apiConfig = this.$store.getters.apis.migrateVirtualMachine || {}
-    this.apiConfig.params.forEach(param => {
-      if (!(param.name in this.apiParams)) {
+    if (this.$route.meta.name === 'vm') {
+      this.apiConfig = this.$store.getters.apis.migrateVirtualMachineWithVolume || {}
+      this.apiConfig.params.forEach(param => {
         this.apiParams[param.name] = param
-      }
-    })
+      })
+      this.apiConfig = this.$store.getters.apis.migrateVirtualMachine || {}
+      this.apiConfig.params.forEach(param => {
+        if (!(param.name in this.apiParams)) {
+          this.apiParams[param.name] = param
+        }
+      })
+    } else {
+      this.apiConfig = this.$store.getters.apis.migrateSystemVm || {}
+      this.apiConfig.params.forEach(param => {
+        if (!(param.name in this.apiParams)) {
+          this.apiParams[param.name] = param
+        }
+      })
+    }
   },
   created () {
   },
@@ -114,8 +123,12 @@ export default {
           return
         }
         this.loading = true
-        var migrateApi = 'migrateVirtualMachine'
-        if (this.apiParams.hostid && this.apiParams.hostid.required === false) {
+        var isUserVm = true
+        if (this.$route.meta.name !== 'vm') {
+          isUserVm = false
+        }
+        var migrateApi = isUserVm ? 'migrateVirtualMachine' : 'migrateSystemVm'
+        if (isUserVm && this.apiParams.hostid && this.apiParams.hostid.required === false) {
           migrateApi = 'migrateVirtualMachineWithVolume'
           var rootVolume = null
           api('listVolumes', {
@@ -125,7 +138,6 @@ export default {
             var volumes = response.listvolumesresponse.volume
             if (volumes && volumes.length > 0) {
               volumes = volumes.filter(item => item.type === 'ROOT')
-              console.log(volumes)
               if (volumes && volumes.length > 0) {
                 rootVolume = volumes[0]
               }
@@ -138,7 +150,7 @@ export default {
           })
           return
         }
-        this.migrateVm(migrateApi, values.storageid, rootVolume.id)
+        this.migrateVm(migrateApi, values.storageid, null)
       })
     },
     migrateVm (migrateApi, storageId, rootVolumeId) {
@@ -154,7 +166,14 @@ export default {
         }
       }
       api(migrateApi, params).then(response => {
-        var jobId = migrateApi === 'migrateVirtualMachineWithVolume' ? response.migratevirtualmachinewithvolumeresponse.jobid : response.migratevirtualmachineresponse.jobid
+        var jobId = ''
+        if (migrateApi === 'migrateVirtualMachineWithVolume') {
+          jobId = response.migratevirtualmachinewithvolumeresponse.jobid
+        } else if (migrateApi === 'migrateSystemVm') {
+          jobId = response.migratesystemvmresponse.jobid
+        } else {
+          jobId = response.migratevirtualmachine.jobid
+        }
         this.$store.dispatch('AddAsyncJob', {
           title: `${this.$t('label.migrating')} ${this.resource.name}`,
           jobid: jobId,
diff --git a/src/views/compute/MigrateWizard.vue b/src/views/compute/MigrateWizard.vue
index 2981bae32..bd3b791df 100644
--- a/src/views/compute/MigrateWizard.vue
+++ b/src/views/compute/MigrateWizard.vue
@@ -103,7 +103,6 @@ export default {
   data () {
     return {
       loading: true,
-      isUserVm: true,
       hosts: [],
       selectedHost: {},
       searchQuery: '',
@@ -146,11 +145,6 @@ export default {
       ]
     }
   },
-  beforeCreate () {
-    if (this.$route.meta.name !== 'vm') {
-      this.isUserVm = false
-    }
-  },
   mounted () {
     this.fetchData()
   },
@@ -176,14 +170,18 @@ export default {
     },
     submitForm () {
       this.loading = true
-      var migrateApi = this.isUserVm
-        ? this.selectedHost.requiresStorageMotion ? 'migratevirtualMachineWithVolume' : 'migrateVirtualMachine'
+      var isUserVm = true
+      if (this.$route.meta.name !== 'vm') {
+        isUserVm = false
+      }
+      var migrateApi = isUserVm
+        ? this.selectedHost.requiresStorageMotion ? 'migrateVirtualMachineWithVolume' : 'migrateVirtualMachine'
         : 'migrateSystemVm'
       api(migrateApi, {
         hostid: this.selectedHost.id,
         virtualmachineid: this.resource.id
       }).then(response => {
-        var migrateResponse = this.isUserVm
+        var migrateResponse = isUserVm
           ? this.selectedHost.requiresStorageMotion ? response.migratevirtualmachinewithvolumeresponse : response.migratevirtualmachineresponse
           : response.migratesystemvmresponse
         this.$store.dispatch('AddAsyncJob', {

From ef965cd3190f3ac2470ae84ec7266830ed3ed65e Mon Sep 17 00:00:00 2001
From: Abhishek Kumar <abhishek.mrt22@gmail.com>
Date: Tue, 19 Jan 2021 14:20:48 +0530
Subject: [PATCH 9/9] change storage migration reqd label key

Signed-off-by: Abhishek Kumar <abhishek.mrt22@gmail.com>
---
 src/locales/en.json                 | 2 +-
 src/views/compute/MigrateWizard.vue | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/locales/en.json b/src/locales/en.json
index 00aba6da9..875baaf8e 100644
--- a/src/locales/en.json
+++ b/src/locales/en.json
@@ -2033,7 +2033,7 @@
 "label.storage.tags": "Storage Tags",
 "label.storage.traffic": "Storage Traffic",
 "label.storageid": "Primary Storage",
-"label.storagemigrationrequired": "Storage Migration Required",
+"label.storage.migration.required": "Storage Migration Required",
 "label.storagemotionenabled": "Storage Motion Enabled",
 "label.storagepolicy": "Storage policy",
 "label.storagepool": "Storage Pool",
diff --git a/src/views/compute/MigrateWizard.vue b/src/views/compute/MigrateWizard.vue
index c22e2fad4..872bd7a0b 100644
--- a/src/views/compute/MigrateWizard.vue
+++ b/src/views/compute/MigrateWizard.vue
@@ -135,7 +135,7 @@ export default {
           scopedSlots: { customRender: 'pod' }
         },
         {
-          title: this.$t('label.storagemigrationrequired'),
+          title: this.$t('label.storage.migration.required'),
           scopedSlots: { customRender: 'requiresstoragemigration' }
         },
         {