From ca8c77f8f18dbf9489411638652f4cc0abbfa69c Mon Sep 17 00:00:00 2001 From: Rohit Yadav Date: Sat, 14 Dec 2019 21:27:28 +0530 Subject: [PATCH] compute: fix usage of API based on storage motion requirement Signed-off-by: Rohit Yadav --- ui/src/config/section/compute.js | 7 ------- ui/src/views/AutogenView.vue | 1 - ui/src/views/compute/MigrateWizard.vue | 5 +++-- 3 files changed, 3 insertions(+), 10 deletions(-) diff --git a/ui/src/config/section/compute.js b/ui/src/config/section/compute.js index 51a7ffcab39..0fcd458f5b9 100644 --- a/ui/src/config/section/compute.js +++ b/ui/src/config/section/compute.js @@ -193,13 +193,6 @@ export default { } } }, - { - api: 'migrateVirtualMachineWithVolume', - icon: 'export', - label: 'Migrate VM with Volume(s)', - dataView: true, - show: (record) => { return ['Running'].includes(record.state) } - }, { api: 'migrateVirtualMachine', icon: 'drag', diff --git a/ui/src/views/AutogenView.vue b/ui/src/views/AutogenView.vue index 1e570730dd0..924b5e4c555 100644 --- a/ui/src/views/AutogenView.vue +++ b/ui/src/views/AutogenView.vue @@ -518,7 +518,6 @@ export default { this.listUuidOpts(param) } } - console.log(this.currentAction.paramFields) this.currentAction.loading = false }, listUuidOpts (param) { diff --git a/ui/src/views/compute/MigrateWizard.vue b/ui/src/views/compute/MigrateWizard.vue index 8f577c42982..ee9d858069a 100644 --- a/ui/src/views/compute/MigrateWizard.vue +++ b/ui/src/views/compute/MigrateWizard.vue @@ -112,8 +112,9 @@ export default { }, submitForm () { this.loading = true - api('migrateVirtualMachine', { - hostid: this.hosts[this.selectedIndex].id, + const host = this.hosts[this.selectedIndex] + api(host.requiresStorageMotion ? 'migrateVirtualMachineWithVolume' : 'migrateVirtualMachine', { + hostid: host.id, virtualmachineid: this.resource.id }).then(response => { this.$store.dispatch('AddAsyncJob', {