Skip to content
Draft
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 11 additions & 4 deletions ui/src/features/migration/hooks/useVmsSelectionState.ts
Original file line number Diff line number Diff line change
Expand Up @@ -382,11 +382,18 @@ export function useVmsSelectionState(props: VmsSelectionStepProps) {
allIPs = existingVm.ipAddress ?? allIPs
}

let preferredNetworkInterfaces = vm.networkInterfaces
if (existingVm && existingVm.networkInterfaces && existingVm.networkInterfaces.length > 0) {
preferredNetworkInterfaces = existingVm.networkInterfaces
// Base is the freshly fetched NIC list (source of truth for IP presence, e.g. after
// revalidate). Only override per-NIC ipAddress where the user made a custom
// assignment (preserveIp[i] === false) — never blanket-keep the stale existing list,
// or newly-discovered IPs after a revalidate would never surface.
let preferredNetworkInterfaces = normalizeNetworkInterfaces(vm.networkInterfaces)
if (existingVm?.networkInterfaces?.length) {
preferredNetworkInterfaces = mergeNicIpOverrides(
preferredNetworkInterfaces ?? [],
normalizeNetworkInterfaces(existingVm.networkInterfaces) ?? [],
existingVm.preserveIp ?? {},
)
}
preferredNetworkInterfaces = normalizeNetworkInterfaces(preferredNetworkInterfaces)

return {
...vm,
Expand Down
Loading