Skip to content

[x-port] [9.1] Clear EthCard SubnetID during VPC restore #1433

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
bryanv merged 1 commit into from
Feb 3, 2026
+9 −4
Merged

[x-port] [9.1] Clear EthCard SubnetID during VPC restore #1433

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
6 changes: 4 additions & 2 deletions pkg/providers/vsphere/network/nsxt.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -181,13 +181,15 @@ func VPCPostRestoreBackingFixup(
if ethCard.ExternalId != result.ExternalID {
vmCtx.Logger.Info(
"Updating network device ExternalID for restored/failed-over VM",
"name", result.Name,
"macAddress", result.MacAddress,
"oldExternalID", ethCard.ExternalId,
"newExternalID", result.ExternalID)
"newExternalID", result.ExternalID,
"oldSubnetID", ethCard.SubnetId)

// Update the device's ExternalID.
ethCard.ExternalId = result.ExternalID
ethCard.Backing = result.Device.GetVirtualDevice().Backing
ethCard.SubnetId = ""

deviceChanges = append(deviceChanges, &vimtypes.VirtualDeviceConfigSpec{
Device: dev,
Expand Down
7 changes: 5 additions & 2 deletions pkg/providers/vsphere/network/nsxt_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,9 @@ import (
var _ = Describe("VPCPostRestoreBackingFixup", Label(testlabels.VCSim), func() {

const (
macAddress1 = "01:02:03:04:05:06"
macAddress2 = "01:02:03:04:05:07"
macAddress1 = "01:02:03:04:05:06"
macAddress2 = "01:02:03:04:05:07"
dummySubnetID = "/projects/project-quality/vpcs/foo"
)

var (
Expand Down Expand Up @@ -71,6 +72,7 @@ var _ = Describe("VPCPostRestoreBackingFixup", Label(testlabels.VCSim), func() {
dev.Backing = backing
dev.MacAddress = macAddress1
dev.ExternalId = builder.GetVPCTLogicalSwitchUUID(idx)
dev.SubnetId = dummySubnetID
return dev
}

Expand Down Expand Up @@ -132,5 +134,6 @@ var _ = Describe("VPCPostRestoreBackingFixup", Label(testlabels.VCSim), func() {
Expect(ok).To(BeTrue())
Expect(ethCard.ExternalId).To(Equal(dev1Restored.ExternalId))
Expect(ethCard.MacAddress).To(Equal(dev1Restored.MacAddress))
Expect(ethCard.SubnetId).To(BeEmpty())
})
})
Loading