This is an automated email from the ASF dual-hosted git repository.
rohit pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/cloudstack-primate.git
The following commit(s) were added to refs/heads/master by this push:
new 80a8642 compute: fix usage of API based on storage motion requirement
80a8642 is described below
commit 80a86425c86c56c8d5b05c2077f67ab976d55617
Author: Rohit Yadav <rohit.ya...@shapeblue.com>
AuthorDate: Sat Dec 14 21:27:28 2019 +0530
compute: fix usage of API based on storage motion requirement
Signed-off-by: Rohit Yadav <rohit.ya...@shapeblue.com>
---
src/config/section/compute.js | 7 -------
src/views/AutogenView.vue | 1 -
src/views/compute/MigrateWizard.vue | 5 +++--
3 files changed, 3 insertions(+), 10 deletions(-)
diff --git a/src/config/section/compute.js b/src/config/section/compute.js
index 51a7ffc..0fcd458 100644
--- a/src/config/section/compute.js
+++ b/src/config/section/compute.js
@@ -194,13 +194,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',
label: 'label.migrate.instance.to.ps',
diff --git a/src/views/AutogenView.vue b/src/views/AutogenView.vue
index 1e57073..924b5e4 100644
--- a/src/views/AutogenView.vue
+++ b/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/src/views/compute/MigrateWizard.vue
b/src/views/compute/MigrateWizard.vue
index 8f577c4..ee9d858 100644
--- a/src/views/compute/MigrateWizard.vue
+++ b/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', {
