Skip to content

Commit c43b7c0

Browse files
authored
ui: fix labels when migrating instances from vmware (apache#8490)
Fixes apache#8474 Renames labels when importing from VMware
1 parent e87ce0c commit c43b7c0

3 files changed

Lines changed: 13 additions & 3 deletions

File tree

ui/public/locales/en.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2932,6 +2932,7 @@
29322932
"message.installwizard.tooltip.tungsten.provider.vrouterport": "Tungsten provider vrouter port is required",
29332933
"message.instances.managed": "Instances controlled by CloudStack.",
29342934
"message.instances.unmanaged": "Instances not controlled by CloudStack.",
2935+
"message.instances.migrate.vmware": "Instances that can be migrated from VMware.",
29352936
"message.interloadbalance.not.return.elementid": "error: listInternalLoadBalancerElements API doesn't return internal LB element ID.",
29362937
"message.ip.address.changes.effect.after.vm.restart": "IP address changes takes effect only after Instance restart.",
29372938
"message.ip.v6.prefix.delete": "IPv6 prefix deleted",

ui/src/views/tools/ManageInstances.vue

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -238,6 +238,7 @@
238238
</a-form-item>
239239
<a-form-item v-if="isDestinationKVM && isMigrateFromVmware && clusterId != undefined">
240240
<SelectVmwareVcenter
241+
@onVcenterTypeChanged="updateVmwareVcenterType"
241242
@loadingVmwareUnmanagedInstances="() => this.unmanagedInstancesLoading = true"
242243
@listedVmwareUnmanagedInstances="($e) => onListUnmanagedInstancesFromVmware($e)"
243244
/>
@@ -322,8 +323,8 @@
322323
<a-col v-if="!isDiskImport" :md="24" :lg="(!isMigrateFromVmware && showManagedInstances) ? 12 : 24">
323324
<a-card class="instances-card">
324325
<template #title>
325-
{{ $t('label.unmanaged.instances') }}
326-
<a-tooltip :title="$t('message.instances.unmanaged')">
326+
{{ (isMigrateFromVmware && vmwareVcenterType === 'existing') ? $t('label.instances') : $t('label.unmanaged.instances') }}
327+
<a-tooltip :title="(isMigrateFromVmware && vmwareVcenterType === 'existing') ? $t('message.instances.migrate.vmware') : $t('message.instances.unmanaged')">
327328
<info-circle-outlined />
328329
</a-tooltip>
329330
<a-button
@@ -731,6 +732,7 @@ export default {
731732
showUnmanageForm: false,
732733
selectedUnmanagedInstance: {},
733734
query: {},
735+
vmwareVcenterType: undefined,
734736
selectedVmwareVcenter: undefined
735737
}
736738
},
@@ -1409,6 +1411,9 @@ export default {
14091411
this.unmanagedInstances = obj.response.unmanagedinstance
14101412
this.itemCount.unmanaged = obj.response.count
14111413
this.unmanagedInstancesLoading = false
1414+
},
1415+
updateVmwareVcenterType (type) {
1416+
this.vmwareVcenterType = type
14121417
}
14131418
}
14141419
}

ui/src/views/tools/SelectVmwareVcenter.vue

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,8 @@
2828
<a-radio-group
2929
style="text-align: center; width: 100%"
3030
v-model:value="vcenterSelectedOption"
31-
buttonStyle="solid">
31+
buttonStyle="solid"
32+
@change="onVcenterTypeChange">
3233
<a-radio-button value="existing" style="width: 50%; text-align: center">
3334
{{ $t('label.existing') }}
3435
</a-radio-button>
@@ -256,6 +257,9 @@ export default {
256257
},
257258
onSelectExistingVmwareDatacenter (value) {
258259
this.selectedExistingVcenterId = value
260+
},
261+
onVcenterTypeChange () {
262+
this.$emit('onVcenterTypeChanged', this.vcenterSelectedOption)
259263
}
260264
}
261265
}

0 commit comments

Comments
 (0)