diff options
| -rw-r--r-- | table/adj.go | 4 | ||||
| -rw-r--r-- | table/adj_test.go | 51 |
2 files changed, 53 insertions, 2 deletions
diff --git a/table/adj.go b/table/adj.go index 871a6813..a0148605 100644 --- a/table/adj.go +++ b/table/adj.go @@ -119,9 +119,9 @@ func (adj *AdjRib) DropStale(rfList []bgp.RouteFamily) []*Path { pathList := make([]*Path, 0, adj.Count(rfList)) for _, rf := range rfList { if table, ok := adj.table[rf]; ok { - for _, p := range table { + for k, p := range table { if p.IsStale() { - delete(table, p.getPrefix()) + delete(table, k) if !p.IsAsLooped() { adj.accepted[rf]-- } diff --git a/table/adj_test.go b/table/adj_test.go new file mode 100644 index 00000000..45ebcb48 --- /dev/null +++ b/table/adj_test.go @@ -0,0 +1,51 @@ +// Copyright (C) 2018 Nippon Telegraph and Telephone Corporation. +// +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or +// implied. +// See the License for the specific language governing permissions and +// limitations under the License. + +package table + +import ( + "testing" + "time" + + "github.com/osrg/gobgp/packet/bgp" + "github.com/stretchr/testify/assert" +) + +func TestStaleAll(t *testing.T) { + pi := &PeerInfo{} + attrs := []bgp.PathAttributeInterface{bgp.NewPathAttributeOrigin(0)} + + nlri1 := bgp.NewIPAddrPrefix(24, "20.20.20.0") + nlri1.SetPathIdentifier(1) + p1 := NewPath(pi, nlri1, false, attrs, time.Now(), false) + nlri2 := bgp.NewIPAddrPrefix(24, "20.20.20.0") + nlri2.SetPathIdentifier(2) + p2 := NewPath(pi, nlri2, false, attrs, time.Now(), false) + family := p1.GetRouteFamily() + families := []bgp.RouteFamily{family} + + adj := NewAdjRib(families) + adj.Update([]*Path{p1, p2}) + assert.Equal(t, len(adj.table[family]), 2) + + adj.StaleAll(families) + + for _, p := range adj.table[family] { + assert.True(t, p.IsStale()) + } + + adj.DropStale(families) + assert.Equal(t, len(adj.table[family]), 0) +} |