Skip to content

#1694 : Preserve IP for a powered on VM is getting wrong IPs for no IP interfaces #1704

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
sarika-pf9 merged 5 commits into from
Mar 17, 2026
Merged

#1694 : Preserve IP for a powered on VM is getting wrong IPs for no IP interfaces #1704

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
5c5b524
Fix: Handle null ip state with multiple IP addresses correctly in mig…
AbhijeetThakur Mar 17, 2026
16598c1
Fix: Use displayIPs for assignedIPsCsv to ensure consistency in IP ad…
AbhijeetThakur Mar 17, 2026
7a16bc4
Revert "Fix: Use displayIPs for assignedIPsCsv to ensure consistency …
AbhijeetThakur Mar 17, 2026
2513b7f
Resolved review comment
AbhijeetThakur Mar 17, 2026
724d455
Fix: Preserve user-entered IP addresses when toggling Preserve IP che…
AbhijeetThakur Mar 17, 2026
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
45 changes: 34 additions & 11 deletions ui/src/features/migration/RollingMigrationForm.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -807,6 +807,12 @@ export default function RollingMigrationFormDrawer({
return matches?.[0] || ''
}

const hasMultipleIPv4 = (value: string): boolean => {
if (!value) return false
const matches = value.match(IPV4_MATCH_REGEX)
return (matches?.length || 0) > 1
}

const parseIpList = (value: string): string[] => {
const trimmed = value.trim()
if (!trimmed) return []
Expand Down Expand Up @@ -2460,9 +2466,22 @@ export default function RollingMigrationFormDrawer({

if (!value) {
// Preserve IP disabled: keep the current value so the user can edit/override it.
const current = bulkEditIPs?.[vmId]?.[interfaceIndex] ?? ''
const trimmed = current.trim()

const { status, message } = !trimmed
? { status: 'empty' as const, message: '' }
: !isValidIPAddressList(trimmed)
? ({ status: 'invalid' as const, message: 'Invalid IP format' } as const)
: ({ status: 'valid' as const, message: '' } as const)

setBulkValidationStatus((prev) => ({
...prev,
[vmId]: { ...prev[vmId], [interfaceIndex]: status }
}))
setBulkValidationMessages((prev) => ({
...prev,
[vmId]: { ...prev[vmId], [interfaceIndex]: '' }
[vmId]: { ...prev[vmId], [interfaceIndex]: message }
}))
}
}
Expand Down Expand Up @@ -2749,7 +2768,7 @@ export default function RollingMigrationFormDrawer({
}

await patchVMwareMachine(
vmId,
vm.id,
{
spec: {
vms: {
Expand Down Expand Up @@ -2797,14 +2816,16 @@ export default function RollingMigrationFormDrawer({
if (!vm) throw new Error('VM not found')

if (vm.networkInterfaces && vm.networkInterfaces[interfaceIndex]) {
const existingIp = bulkExistingIPs?.[vmId]?.[interfaceIndex] || ''
const parsedExisting = existingIp.trim() !== '' ? parseIpList(existingIp) : []
const updatedInterfaces = [...vm.networkInterfaces]
updatedInterfaces[interfaceIndex] = {
...updatedInterfaces[interfaceIndex],
ipAddress: []
ipAddress: parsedExisting
}

await patchVMwareMachine(
vmId,
vm.id,
{
spec: {
vms: {
Expand Down Expand Up @@ -2981,11 +3002,9 @@ export default function RollingMigrationFormDrawer({

if (vm.networkInterfaces && vm.networkInterfaces.length > 0) {
vm.networkInterfaces.forEach((nic, index) => {
const tableIp = vm.ip && vm.ip !== '—' ? vm.ip : ''
const fallbackIp =
index === 0 && tableIp && !tableIp.includes(',') && !nic.ipAddress ? tableIp : ''
const existingIp =
extractFirstIPv4((nic.ipAddress || []).join(',')) || extractFirstIPv4(fallbackIp) || ''
const existingIp = (Array.isArray(nic.ipAddress) ? nic.ipAddress : [])
.filter((ip) => ip && ip.trim() !== '')
.join(', ')
initialBulkExistingIPs[vm.id][index] = existingIp
initialBulkEditIPs[vm.id][index] = existingIp

Expand Down Expand Up @@ -3959,12 +3978,16 @@ export default function RollingMigrationFormDrawer({
fontFamily: 'monospace'
}}
>
{(networkInterface && Array.isArray(networkInterface.ipAddress)
{(Array.isArray(networkInterface?.ipAddress)
? networkInterface.ipAddress
.filter((v) => v && v.trim() !== '')
.join(', ')
: '') ||
(interfaceIndex === 0 ? vm.ip || '' : '') ||
(!networkInterface &&
interfaceIndex === 0 &&
!hasMultipleIPv4(vm.ip || '')
? extractFirstIPv4(vm.ip || '')
: '') ||
'—'}
</Box>
</Box>
Expand Down
Loading
Loading