diff --git a/pkg/harvester/pages/c/_cluster/forklift/configure-mappings.vue b/pkg/harvester/pages/c/_cluster/forklift/configure-mappings.vue index 8cdf31ad..a2654f2e 100644 --- a/pkg/harvester/pages/c/_cluster/forklift/configure-mappings.vue +++ b/pkg/harvester/pages/c/_cluster/forklift/configure-mappings.vue @@ -333,12 +333,17 @@ const init = async() => { // Provider may already be in store from previous step } + const allProviders = store.getters[`${ inStore }/all`](HCI.FORKLIFT_PROVIDER) || []; + const provider = allProviders.find((p) => p.metadata.name === providerName.value && p.metadata.namespace === NAMESPACE); + const vmsParam = route.query.vms; if (vmsParam) { try { const vmIds = JSON.parse(vmsParam); - const baseUrl = `https://forklift-apir.13.48.147.135.sslip.io/providers/vsphere/67e67481-48f1-4d9b-8fb6-b4c5c58d3232`; + const providerUid = provider?.metadata?.uid; + const providerType = provider?.spec?.type || 'vsphere'; + const baseUrl = `https://forklift-apir.13.48.147.135.sslip.io/providers/${ providerType }/${ providerUid }`; const [allVms, networksData, datastoresData] = await Promise.all([ fetch(`${ baseUrl }/vms`).then((r) => r.json()).catch(() => []), diff --git a/pkg/harvester/pages/c/_cluster/forklift/review-migration.vue b/pkg/harvester/pages/c/_cluster/forklift/review-migration.vue index 0e7a48ce..1e038852 100644 --- a/pkg/harvester/pages/c/_cluster/forklift/review-migration.vue +++ b/pkg/harvester/pages/c/_cluster/forklift/review-migration.vue @@ -222,13 +222,21 @@ const startMigration = async(buttonCb) => { }; const init = async() => { + const inStore = store.getters['currentProduct'].inStore; + + await store.dispatch(`${ inStore }/findAll`, { type: HCI.FORKLIFT_PROVIDER }).catch(() => {}); + + const allProviders = store.getters[`${ inStore }/all`](HCI.FORKLIFT_PROVIDER) || []; + const provider = allProviders.find((p) => p.metadata.name === providerName.value && p.metadata.namespace === NAMESPACE); + const vmsParam = route.query.vms; if (vmsParam) { try { const vmIds = JSON.parse(vmsParam); - const baseUrl = `https://forklift-apir.13.48.147.135.sslip.io/providers/vsphere/67e67481-48f1-4d9b-8fb6-b4c5c58d3232`; - + const providerUid = provider?.metadata?.uid; + const providerType = provider?.spec?.type || 'vsphere'; + const baseUrl = `https://forklift-apir.13.48.147.135.sslip.io/providers/${ providerType }/${ providerUid }`; const allVms = await fetch(`${ baseUrl }/vms`).then((r) => r.json()).catch(() => []); const vmList = Array.isArray(allVms) ? allVms : (allVms?.data || []); diff --git a/pkg/harvester/pages/c/_cluster/forklift/select-vms.vue b/pkg/harvester/pages/c/_cluster/forklift/select-vms.vue index 9ac6876f..dcce0efc 100644 --- a/pkg/harvester/pages/c/_cluster/forklift/select-vms.vue +++ b/pkg/harvester/pages/c/_cluster/forklift/select-vms.vue @@ -198,7 +198,9 @@ const init = async() => { if (provider.value) { try { - const baseUrl = `https://forklift-apir.13.48.147.135.sslip.io/providers/vsphere/67e67481-48f1-4d9b-8fb6-b4c5c58d3232`; + const providerUid = provider.value.metadata.uid; + const providerType = provider.value.spec?.type || 'vsphere'; + const baseUrl = `https://forklift-apir.13.48.147.135.sslip.io/providers/${ providerType }/${ providerUid }`; const [vmsResp, networksResp, datastoresResp] = await Promise.all([ fetch(`${ baseUrl }/vms`).then((r) => r.json()),