Skip to content

fix: remove dead HostIndex field and unreachable nil branch #197

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
Open

fix: remove dead HostIndex field and unreachable nil branch #197

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
7 changes: 1 addition & 6 deletions pkg/networkoperatorplugin/spectrumx/addressing.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,6 @@ type topologyEndpoint struct {
Node string `json:"node"`
Interface string `json:"interface"`
Attrs topologyAttributes `json:"attributes"`
HostIndex *int `json:"-"`
}

type topologyAttributes struct {
Expand Down Expand Up @@ -279,11 +278,7 @@ func hostLinks(topology *topologyFile, spcx *config.ProfileSpectrumX) ([]hostLin
key := hostIndexKey(host.Attrs)
index, ok := hostIndexes[key+"|"+host.Node]
if !ok {
if host.HostIndex != nil {
index = *host.HostIndex
} else {
index = countHostIndex(hostIndexes, key)
}
index = countHostIndex(hostIndexes, key)
hostIndexes[key+"|"+host.Node] = index
}
addressPlane := leaf.Attrs.Plane
Expand Down
4 changes: 2 additions & 2 deletions pkg/networkoperatorplugin/spectrumx/addressing_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -252,9 +252,9 @@ func TestBuildCIDRPoolsFromAIR3Tier(t *testing.T) {
PerNodeExclusions: []PerNodeExclusion{{StartIndex: 1, EndIndex: 1}},
Routes: []string{"10.8.0.0/13", "10.0.0.0/10"},
StaticAllocations: []StaticAllocation{{
Gateway: "10.8.66.7",
Gateway: "10.8.66.1",
NodeName: "worker-pod02-su03-h04",
Prefix: "10.8.66.6/31",
Prefix: "10.8.66.0/31",
}},
}}, pools)
}
Expand Down
3 changes: 1 addition & 2 deletions pkg/networkoperatorplugin/spectrumx/air_topology.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -305,7 +305,6 @@ func normalizeAIRHostLink(
}
hostPositions[position] = host.Node

explicitHostIndex := hostIndex
hostAttrs := topologyAttributes{
Role: "host",
Pod: hostPod,
Expand All @@ -327,7 +326,7 @@ func normalizeAIRHostLink(
HasRail: true,
}
return topologyLink{
{Node: host.Node, Interface: host.Interface, Attrs: hostAttrs, HostIndex: &explicitHostIndex},
{Node: host.Node, Interface: host.Interface, Attrs: hostAttrs},
{Node: leaf.Node, Interface: leaf.Interface, Attrs: leafAttrs},
}, nil
}
Expand Down
4 changes: 0 additions & 4 deletions pkg/networkoperatorplugin/spectrumx/air_topology_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -86,14 +86,11 @@ func TestParseAIRTopologyNormalizesOneBasedNamingContract(t *testing.T) {
require.Equal(t, "host", host.Attrs.Role)
require.Equal(t, 0, host.Attrs.Rail)
require.Equal(t, 0, host.Attrs.SU)
require.NotNil(t, host.HostIndex)
require.Equal(t, 0, *host.HostIndex)
require.Equal(t, "leaf", leaf.Attrs.Role)
require.Equal(t, 0, leaf.Attrs.Plane)
require.Equal(t, 0, leaf.Attrs.Rail)
require.Equal(t, 0, leaf.Attrs.SU)
require.Equal(t, 3, topology.Links[3][1].Attrs.Plane)
require.Equal(t, 1, *topology.Links[4][0].HostIndex)
}

func TestParseAIRTopologyNormalizes3TierNamingContract(t *testing.T) {
Expand Down Expand Up @@ -128,7 +125,6 @@ func TestParseAIRTopologyNormalizes3TierNamingContract(t *testing.T) {
require.True(t, host.Attrs.HasPod)
require.Equal(t, 2, host.Attrs.SU)
require.Equal(t, 1, host.Attrs.Rail)
require.Equal(t, 3, *host.HostIndex)
require.Equal(t, 1, leaf.Attrs.Pod)
require.Equal(t, 0, leaf.Attrs.Plane)
}
Expand Down