Skip to content

fix: IPv4 CIDRPool tests expect wrong gatewayIndex for /31 #201

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
andrewwhitecdw wants to merge 1 commit into
base: main
Choose a base branch
from
+5 −4
Open

fix: IPv4 CIDRPool tests expect wrong gatewayIndex for /31 #201

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
2 changes: 1 addition & 1 deletion pkg/networkoperatorplugin/spectrumx/addressing.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -592,7 +592,7 @@ func poolSettings(spcx *config.ProfileSpectrumX) cidrPoolSettings {
}
}
return cidrPoolSettings{
gatewayIndex: 0,
gatewayIndex: 1,
perNodeNetworkPrefix: 31,
perNodeExclusions: []PerNodeExclusion{{StartIndex: 1, EndIndex: 1}},
}
Expand Down
7 changes: 4 additions & 3 deletions pkg/networkoperatorplugin/spectrumx/addressing_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -98,7 +98,7 @@ func TestBuildCIDRPools2TierSWPLB(t *testing.T) {
require.Len(t, pools, 4)
require.Equal(t, "rail-0-plane-0-gpu-model", pools[0].Name)
require.Equal(t, "172.16.0.0/18", pools[0].CIDR)
require.Equal(t, 0, pools[0].GatewayIndex)
require.Equal(t, 1, pools[0].GatewayIndex)
Comment thread
greptile-apps[bot] marked this conversation as resolved.
require.Equal(t, 31, pools[0].PerNodeNetworkPrefix)
require.Equal(t, []PerNodeExclusion{{StartIndex: 1, EndIndex: 1}}, pools[0].PerNodeExclusions)
require.Equal(t, []string{"172.16.0.0/18", "172.16.0.0/14"}, pools[0].Routes)
Expand Down Expand Up @@ -142,7 +142,7 @@ func TestBuildCIDRPools3Tier(t *testing.T) {
require.Equal(t, []CIDRPool{{
Name: "rail-0",
CIDR: "10.0.0.0/13",
GatewayIndex: 0,
GatewayIndex: 1,
PerNodeNetworkPrefix: 31,
PerNodeExclusions: []PerNodeExclusion{{StartIndex: 1, EndIndex: 1}},
Routes: []string{
Expand Down Expand Up @@ -205,6 +205,7 @@ func TestBuildCIDRPoolsFromAIR2Tier(t *testing.T) {
require.NoError(t, err)
require.Len(t, pools, tt.wantPools)
require.Equal(t, tt.wantFirstName, pools[0].Name)
require.Equal(t, 1, pools[0].GatewayIndex)
require.Equal(t, []StaticAllocation{
{Gateway: "172.16.0.1", NodeName: "worker-su01-rack01-h01", Prefix: "172.16.0.0/31"},
{Gateway: "172.16.0.3", NodeName: "worker-su01-rack01-h02", Prefix: "172.16.0.2/31"},
Expand Down Expand Up @@ -247,7 +248,7 @@ func TestBuildCIDRPoolsFromAIR3Tier(t *testing.T) {
require.Equal(t, []CIDRPool{{
Name: "rail-1",
CIDR: "10.8.0.0/13",
GatewayIndex: 0,
GatewayIndex: 1,
PerNodeNetworkPrefix: 31,
PerNodeExclusions: []PerNodeExclusion{{StartIndex: 1, EndIndex: 1}},
Routes: []string{"10.8.0.0/13", "10.0.0.0/10"},
Expand Down