Skip to content

fix: consolidate custom network interface when nic type is preconfigured #588

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

Open
adi-IL wants to merge 1 commit into
base: main
Choose a base branch
from
Open

fix: consolidate custom network interface when nic type is preconfigured #588

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: 6 additions & 0 deletions fixtures.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -880,6 +880,9 @@ func (t *TestVM) AddCustomNetworkWithStackType(network *Network, subnetwork *Sub
}
if t.instance.NetworkInterfaces == nil {
t.instance.NetworkInterfaces = []*compute.NetworkInterface{&networkInterface}
} else if len(t.instance.NetworkInterfaces) == 1 && t.instance.NetworkInterfaces[0].Network == "" {
networkInterface.NicType = t.instance.NetworkInterfaces[0].NicType
t.instance.NetworkInterfaces[0] = &networkInterface
} else {
t.instance.NetworkInterfaces = append(t.instance.NetworkInterfaces, &networkInterface)
}
Expand All @@ -893,6 +896,9 @@ func (t *TestVM) AddCustomNetworkWithStackType(network *Network, subnetwork *Sub
}
if t.instancebeta.NetworkInterfaces == nil {
t.instancebeta.NetworkInterfaces = []*computeBeta.NetworkInterface{&networkInterface}
} else if len(t.instancebeta.NetworkInterfaces) == 1 && t.instancebeta.NetworkInterfaces[0].Network == "" {
networkInterface.NicType = t.instancebeta.NetworkInterfaces[0].NicType
t.instancebeta.NetworkInterfaces[0] = &networkInterface
} else {
t.instancebeta.NetworkInterfaces = append(t.instancebeta.NetworkInterfaces, &networkInterface)
}
Expand Down
72 changes: 72 additions & 0 deletions fixtures_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1026,3 +1026,75 @@ func TestMachineMaintenancePolicy(t *testing.T) {
})
}
}

func TestAddCustomNetworkGVNICConsolidation(t *testing.T) {
twf := NewTestWorkflowForUnitTest("name", "image", "30m")
net, err := twf.CreateNetwork("custom-net", false)
if err != nil {
t.Fatalf("failed to create network: %v", err)
}
subnet, err := net.CreateSubnetwork("custom-subnet", "10.0.0.0/24")
if err != nil {
t.Fatalf("failed to create subnetwork: %v", err)
}

// Case 1: UseGVNIC then AddCustomNetwork on standard instance
tvm1, err := twf.CreateTestVM("vm1")
if err != nil {
t.Fatalf("failed to create test vm: %v", err)
}
tvm1.UseGVNIC()
if err := tvm1.AddCustomNetwork(net, subnet); err != nil {
t.Fatalf("failed to add custom network: %v", err)
}
if len(tvm1.instance.NetworkInterfaces) != 1 {
t.Errorf("expected 1 network interface after UseGVNIC + AddCustomNetwork, got %d", len(tvm1.instance.NetworkInterfaces))
}
if tvm1.instance.NetworkInterfaces[0].NicType != "GVNIC" {
t.Errorf("expected NicType GVNIC, got %q", tvm1.instance.NetworkInterfaces[0].NicType)
}
if tvm1.instance.NetworkInterfaces[0].Network != "custom-net" {
t.Errorf("expected Network custom-net, got %q", tvm1.instance.NetworkInterfaces[0].Network)
}
if tvm1.instance.NetworkInterfaces[0].Subnetwork != "custom-subnet" {
t.Errorf("expected Subnetwork custom-subnet, got %q", tvm1.instance.NetworkInterfaces[0].Subnetwork)
}

// Case 2: AddCustomNetwork then UseGVNIC on standard instance
tvm2, err := twf.CreateTestVM("vm2")
if err != nil {
t.Fatalf("failed to create test vm: %v", err)
}
if err := tvm2.AddCustomNetwork(net, subnet); err != nil {
t.Fatalf("failed to add custom network: %v", err)
}
tvm2.UseGVNIC()
if len(tvm2.instance.NetworkInterfaces) != 1 {
t.Errorf("expected 1 network interface after AddCustomNetwork + UseGVNIC, got %d", len(tvm2.instance.NetworkInterfaces))
}
if tvm2.instance.NetworkInterfaces[0].NicType != "GVNIC" {
t.Errorf("expected NicType GVNIC, got %q", tvm2.instance.NetworkInterfaces[0].NicType)
}
if tvm2.instance.NetworkInterfaces[0].Network != "custom-net" {
t.Errorf("expected Network custom-net, got %q", tvm2.instance.NetworkInterfaces[0].Network)
}

// Case 3: UseGVNIC then AddCustomNetwork on beta instance
tvmBeta, err := twf.CreateTestVMBeta("vmbeta")
if err != nil {
t.Fatalf("failed to create test vm beta: %v", err)
}
tvmBeta.UseGVNIC()
if err := tvmBeta.AddCustomNetwork(net, subnet); err != nil {
t.Fatalf("failed to add custom network to beta vm: %v", err)
}
if len(tvmBeta.instancebeta.NetworkInterfaces) != 1 {
t.Errorf("expected 1 network interface on beta vm, got %d", len(tvmBeta.instancebeta.NetworkInterfaces))
}
if tvmBeta.instancebeta.NetworkInterfaces[0].NicType != "GVNIC" {
t.Errorf("expected NicType GVNIC on beta vm, got %q", tvmBeta.instancebeta.NetworkInterfaces[0].NicType)
}
if tvmBeta.instancebeta.NetworkInterfaces[0].Network != "custom-net" {
t.Errorf("expected Network custom-net on beta vm, got %q", tvmBeta.instancebeta.NetworkInterfaces[0].Network)
}
}