Skip to content

Remove support for empty NI name per gRIBI spec. #122

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
robshakir merged 2 commits into from
Mar 3, 2022
Merged

Remove support for empty NI name per gRIBI spec. #122

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9c71609
Remove support for empty NI name per gRIBI spec.
robshakir Mar 2, 2022
1f52525
Remove rewrite of "" to default NI name.
robshakir Mar 2, 2022
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
10 changes: 8 additions & 2 deletions compliance/compliance.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -617,8 +617,14 @@ func AddIPv4EntryDifferentNINHG(c *fluent.GRIBIClient, wantACK fluent.Programmin
WithNetworkInstance(vrfName).
WithNextHopGroup(1).
WithNextHopGroupNetworkInstance(defaultNetworkInstanceName))
c.Modify().AddEntry(t, fluent.NextHopGroupEntry().WithID(1).AddNextHop(1, 1))
c.Modify().AddEntry(t, fluent.NextHopEntry().WithIndex(1).WithIPAddress("2.2.2.2"))
c.Modify().AddEntry(t, fluent.NextHopGroupEntry().
WithNetworkInstance(defaultNetworkInstanceName).
WithID(1).
AddNextHop(1, 1))
c.Modify().AddEntry(t, fluent.NextHopEntry().
WithNetworkInstance(defaultNetworkInstanceName).
WithIndex(1).
WithIPAddress("2.2.2.2"))
},
}

Expand Down
36 changes: 20 additions & 16 deletions server/server.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -759,7 +759,15 @@ func (s *Server) doModify(cid string, ops []*spb.AFTOperation, resCh chan *spb.M
for _, o := range ops {
ni := o.GetNetworkInstance()
if ni == "" {
ni = DefaultNetworkInstanceName
resCh <- &spb.ModifyResponse{
Result: []*spb.AFTResult{{
Id: o.Id,
Status: spb.AFTResult_FAILED,
ErrorDetails: &spb.AFTErrorDetails{
ErrorMessage: `invalid network instance name "" specified`,
},
}},
}
}
if _, ok := s.masterRIB.NetworkInstanceRIB(ni); !ok {
// this is an unknown network instance, we should not return
Expand All @@ -770,6 +778,9 @@ func (s *Server) doModify(cid string, ops []*spb.AFTOperation, resCh chan *spb.M
Result: []*spb.AFTResult{{
Id: o.Id,
Status: spb.AFTResult_FAILED,
ErrorDetails: &spb.AFTErrorDetails{
ErrorMessage: fmt.Sprintf(`unknown network instance "%s" specified`, ni),
},
}},
}
return
Expand Down Expand Up @@ -818,30 +829,23 @@ func modifyEntry(r *rib.RIB, ni string, op *spb.AFTOperation, fibACK bool, elect
return nil, status.Newf(codes.Internal, "invalid nil operation received").Err()
}

if r == nil {
return nil, status.New(codes.Internal, "invalid RIB state").Err()
res, ok, err := checkElectionForModify(op.Id, op.ElectionId, election)
if err != nil {
return nil, err
}
if !ok {
return res, err
}

// Callers should have rewritten to the default network instance name, but
// we ensure that we are tolerant to this error by also rewriting. This helps
// with testing also.
if ni == "" {
ni = DefaultNetworkInstanceName
if r == nil {
return nil, status.New(codes.Internal, "invalid RIB state").Err()
}

niR, ok := r.NetworkInstanceRIB(ni)
if !ok || !niR.IsValid() {
return nil, status.Newf(codes.Internal, "invalid RIB state for network instance name: '%s'", ni).Err()
}

res, ok, err := checkElectionForModify(op.Id, op.ElectionId, election)
if err != nil {
return nil, err
}
if !ok {
return res, err
}

results := []*spb.AFTResult{}
okACK := spb.AFTResult_RIB_PROGRAMMED
// TODO(robjs): today we just say anything that hit
Expand Down
19 changes: 11 additions & 8 deletions server/server_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -805,7 +805,7 @@ func TestDoModify(t *testing.T) {
inCID: "testclient",
inOps: []*spb.AFTOperation{{
Id: 1,
NetworkInstance: "",
NetworkInstance: DefaultNetworkInstanceName,
Op: spb.AFTOperation_ADD,
ElectionId: &spb.Uint128{High: 42, Low: 42},
Entry: &spb.AFTOperation_NextHop{
Expand Down Expand Up @@ -862,6 +862,9 @@ func TestDoModify(t *testing.T) {
Result: []*spb.AFTResult{{
Id: 42,
Status: spb.AFTResult_FAILED,
ErrorDetails: &spb.AFTErrorDetails{
ErrorMessage: `unknown network instance "FISH" specified`,
},
}},
},
}},
Expand All @@ -887,7 +890,7 @@ func TestDoModify(t *testing.T) {
inCID: "testclient",
inOps: []*spb.AFTOperation{{
Id: 84,
NetworkInstance: "",
NetworkInstance: DefaultNetworkInstanceName,
Op: spb.AFTOperation_ADD,
ElectionId: &spb.Uint128{High: 42, Low: 42},
Entry: &spb.AFTOperation_Ipv4{
Expand Down Expand Up @@ -926,7 +929,7 @@ func TestDoModify(t *testing.T) {
inCID: "testclient",
inOps: []*spb.AFTOperation{{
Id: 1,
NetworkInstance: "",
NetworkInstance: DefaultNetworkInstanceName,
Op: spb.AFTOperation_ADD,
ElectionId: &spb.Uint128{High: 42, Low: 42},
Entry: &spb.AFTOperation_NextHop{
Expand All @@ -937,7 +940,7 @@ func TestDoModify(t *testing.T) {
},
}, {
Id: 2,
NetworkInstance: "",
NetworkInstance: DefaultNetworkInstanceName,
Op: spb.AFTOperation_ADD,
ElectionId: &spb.Uint128{High: 42, Low: 42},
Entry: &spb.AFTOperation_NextHop{
Expand Down Expand Up @@ -984,7 +987,7 @@ func TestDoModify(t *testing.T) {
inCID: "testclient",
inOps: []*spb.AFTOperation{{
Id: 1,
NetworkInstance: "",
NetworkInstance: DefaultNetworkInstanceName,
Op: spb.AFTOperation_ADD,
ElectionId: &spb.Uint128{High: 42, Low: 42},
Entry: &spb.AFTOperation_NextHop{
Expand All @@ -995,7 +998,7 @@ func TestDoModify(t *testing.T) {
},
}, {
Id: 2,
NetworkInstance: "",
NetworkInstance: DefaultNetworkInstanceName,
Op: spb.AFTOperation_ADD,
ElectionId: &spb.Uint128{High: 42, Low: 42},
Entry: &spb.AFTOperation_NextHop{
Expand All @@ -1006,7 +1009,7 @@ func TestDoModify(t *testing.T) {
},
}, {
Id: 3,
NetworkInstance: "",
NetworkInstance: DefaultNetworkInstanceName,
Op: spb.AFTOperation_ADD,
ElectionId: &spb.Uint128{High: 42, Low: 42},
Entry: &spb.AFTOperation_NextHopGroup{
Expand All @@ -1025,7 +1028,7 @@ func TestDoModify(t *testing.T) {
},
}, {
Id: 4,
NetworkInstance: "",
NetworkInstance: DefaultNetworkInstanceName,
Op: spb.AFTOperation_ADD,
ElectionId: &spb.Uint128{High: 42, Low: 42},
Entry: &spb.AFTOperation_Ipv4{
Expand Down