diff options
| -rw-r--r-- | server/peer.go | 68 | ||||
| -rw-r--r-- | table/adj.go | 13 | ||||
| -rw-r--r-- | table/destination.go | 8 | ||||
| -rw-r--r-- | table/table_manager.go | 12 | ||||
| -rw-r--r-- | test/lib/base.py | 2 | ||||
| -rw-r--r-- | test/scenario_test/rtc_test.py | 144 |
6 files changed, 210 insertions, 37 deletions
diff --git a/server/peer.go b/server/peer.go index c985d771..f75b6d57 100644 --- a/server/peer.go +++ b/server/peer.go @@ -130,28 +130,48 @@ func (peer *Peer) getAccepted(rfList []bgp.RouteFamily) []*table.Path { return peer.adjRibIn.PathList(rfList, true) } -func (peer *Peer) getBestFromLocal(rfList []bgp.RouteFamily) ([]*table.Path, []*table.Path) { - pathList := []*table.Path{} - filtered := []*table.Path{} +func (peer *Peer) filterpath(path *table.Path) *table.Path { + // special handling for RTC nlri + // see comments in (*Destination).Calculate() + if path != nil && path.GetRouteFamily() == bgp.RF_RTC_UC && !path.IsWithdraw { + // if we already sent the same nlri, ignore this + if peer.adjRibOut.Exists(path) { + return nil + } + dst := peer.localRib.GetDestination(path) + path = nil + // we send a path even if it is not a best path + for _, p := range dst.GetKnownPathList(peer.TableID()) { + // just take care not to send back it + if peer.ID() != p.GetSource().Address.String() { + path = p + break + } + } + } + if filterpath(peer, path) == nil { + return nil + } + if !peer.isRouteServerClient() { + path = path.Clone(path.IsWithdraw) + path.UpdatePathAttrs(peer.fsm.gConf, peer.fsm.pConf) + } options := &table.PolicyOptions{ Neighbor: peer.fsm.peerInfo.Address, } + return peer.policy.ApplyPolicy(peer.TableID(), table.POLICY_DIRECTION_EXPORT, path, options) +} + +func (peer *Peer) getBestFromLocal(rfList []bgp.RouteFamily) ([]*table.Path, []*table.Path) { + pathList := []*table.Path{} + filtered := []*table.Path{} for _, path := range peer.localRib.GetBestPathList(peer.TableID(), rfList) { - if filterpath(peer, path) == nil { - continue - } - p := path - if !peer.isRouteServerClient() { - p = path.Clone(p.IsWithdraw) - p.UpdatePathAttrs(peer.fsm.gConf, peer.fsm.pConf) - } - p = peer.policy.ApplyPolicy(peer.TableID(), table.POLICY_DIRECTION_EXPORT, p, options) - if p == nil { + if p := peer.filterpath(path); p != nil { + pathList = append(pathList, p) + } else { filtered = append(filtered, path) - continue } - pathList = append(pathList, p) } if peer.isGracefulRestartEnabled() { for _, family := range rfList { @@ -189,24 +209,10 @@ func (peer *Peer) processOutgoingPaths(paths, withdrawals []*table.Path) []*tabl } } - options := &table.PolicyOptions{ - Neighbor: peer.fsm.peerInfo.Address, - } for _, path := range paths { - if filterpath(peer, path) == nil { - continue - } - if !peer.isRouteServerClient() { - path = path.Clone(path.IsWithdraw) - path.UpdatePathAttrs(peer.fsm.gConf, peer.fsm.pConf) + if p := peer.filterpath(path); p != nil { + outgoing = append(outgoing, p) } - - path = peer.policy.ApplyPolicy(peer.TableID(), table.POLICY_DIRECTION_EXPORT, path, options) - if path == nil { - continue - } - - outgoing = append(outgoing, path) } peer.adjRibOut.Update(outgoing) diff --git a/table/adj.go b/table/adj.go index 5e685f2e..8aa40370 100644 --- a/table/adj.go +++ b/table/adj.go @@ -156,3 +156,16 @@ func (adj *AdjRib) StaleAll(rfList []bgp.RouteFamily) { } } } + +func (adj *AdjRib) Exists(path *Path) bool { + if path == nil { + return false + } + family := path.GetRouteFamily() + table, ok := adj.table[family] + if !ok { + return false + } + _, ok = table[path.getPrefix()] + return ok +} diff --git a/table/destination.go b/table/destination.go index 91d2d89b..e02c7686 100644 --- a/table/destination.go +++ b/table/destination.go @@ -254,6 +254,14 @@ func (dest *Destination) Calculate(ids []string) (map[string]*Path, []*Path) { }() best := dest.GetBestPath(id) if best != nil && best.Equal(old) { + // RFC4684 3.2. Intra-AS VPN Route Distribution + // When processing RT membership NLRIs received from internal iBGP + // peers, it is necessary to consider all available iBGP paths for a + // given RT prefix, for building the outbound route filter, and not just + // the best path. + if best.GetRouteFamily() == bgp.RF_RTC_UC { + return best + } return nil } if best == nil { diff --git a/table/table_manager.go b/table/table_manager.go index a041c5b9..cc9784b9 100644 --- a/table/table_manager.go +++ b/table/table_manager.go @@ -358,3 +358,15 @@ func (manager *TableManager) GetPathList(id string, rfList []bgp.RouteFamily) [] } return paths } + +func (manager *TableManager) GetDestination(path *Path) *Destination { + if path == nil { + return nil + } + family := path.GetRouteFamily() + t, ok := manager.Tables[family] + if !ok { + return nil + } + return t.GetDestination(path.getPrefix()) +} diff --git a/test/lib/base.py b/test/lib/base.py index d31ec14b..ffbf03b5 100644 --- a/test/lib/base.py +++ b/test/lib/base.py @@ -39,6 +39,8 @@ BGP_ATTR_TYPE_NEXT_HOP = 3 BGP_ATTR_TYPE_MULTI_EXIT_DISC = 4 BGP_ATTR_TYPE_LOCAL_PREF = 5 BGP_ATTR_TYPE_COMMUNITIES = 8 +BGP_ATTR_TYPE_ORIGINATOR_ID = 9 +BGP_ATTR_TYPE_CLUSTER_LIST = 10 BGP_ATTR_TYPE_MP_REACH_NLRI = 14 BGP_ATTR_TYPE_EXTENDED_COMMUNITIES = 16 diff --git a/test/scenario_test/rtc_test.py b/test/scenario_test/rtc_test.py index f1f417c7..6f247213 100644 --- a/test/scenario_test/rtc_test.py +++ b/test/scenario_test/rtc_test.py @@ -39,9 +39,10 @@ class GoBGPTestBase(unittest.TestCase): g2 = GoBGPContainer(name='g2', asn=65000, router_id='192.168.0.2', ctn_image_name=gobgp_ctn_image_name, log_level=parser_option.gobgp_log_level) - ctns = [g1, g2] - initial_wait_time = max(ctn.run() for ctn in ctns) + ctns = {ctn.name: ctn for ctn in [g1, g2]} + + initial_wait_time = max(ctn.run() for ctn in ctns.values()) time.sleep(initial_wait_time) @@ -55,31 +56,162 @@ class GoBGPTestBase(unittest.TestCase): g2.local("gobgp vrf vrf1 rib add 20.0.0.0/24") g2.local("gobgp vrf vrf3 rib add 20.0.0.0/24") - for a, b in combinations(ctns, 2): + for a, b in combinations(ctns.values(), 2): a.add_peer(b, vpn=True, passwd='rtc', graceful_restart=True) b.add_peer(a, vpn=True, passwd='rtc', graceful_restart=True) cls.g1 = g1 cls.g2 = g2 + cls.ctns = ctns # test each neighbor state is turned establish def test_01_neighbor_established(self): self.g1.wait_for(expected_state=BGP_FSM_ESTABLISHED, peer=self.g2) def test_02_check_gobgp_adj_rib_out(self): - time.sleep(10) + time.sleep(2) self.assertTrue(len(self.g1.get_adj_rib_out(self.g2, rf='ipv4-l3vpn')) == 1) self.assertTrue(len(self.g2.get_adj_rib_out(self.g1, rf='ipv4-l3vpn')) == 1) def test_03_add_vrf(self): self.g1.local("gobgp vrf add vrf3 rd 300:300 rt both 300:300") - time.sleep(10) + time.sleep(2) + self.assertTrue(len(self.g1.get_adj_rib_out(self.g2, rf='rtc')) == 3) self.assertTrue(len(self.g1.get_adj_rib_in(self.g2, rf='ipv4-l3vpn')) == 2) def test_04_del_vrf(self): self.g1.local("gobgp vrf del vrf1") - time.sleep(10) + time.sleep(2) self.assertTrue(len(self.g1.get_adj_rib_in(self.g2, rf='ipv4-l3vpn')) == 1) + self.assertTrue(len(self.g1.get_adj_rib_out(self.g2, rf='rtc')) == 2) + + def test_05_rr_setup(self): + gobgp_ctn_image_name = parser_option.gobgp_image + g3 = GoBGPContainer(name='g3', asn=65000, router_id='192.168.0.3', + ctn_image_name=gobgp_ctn_image_name, + log_level=parser_option.gobgp_log_level) + g4 = GoBGPContainer(name='g4', asn=65000, router_id='192.168.0.4', + ctn_image_name=gobgp_ctn_image_name, + log_level=parser_option.gobgp_log_level) + g5 = GoBGPContainer(name='g5', asn=65000, router_id='192.168.0.5', + ctn_image_name=gobgp_ctn_image_name, + log_level=parser_option.gobgp_log_level) + + time.sleep(max(ctn.run() for ctn in [g3, g4, g5])) + + g3.add_peer(g4, vpn=True, is_rr_client=True) + g4.add_peer(g3, vpn=True) + + g3.add_peer(g5, vpn=True, is_rr_client=True) + g5.add_peer(g3, vpn=True) + + for v in [g3, g4, g5]: + self.ctns[v.name] = v + + def test_06_neighbor_established(self): + g3 = self.ctns['g3'] + g4 = self.ctns['g4'] + g5 = self.ctns['g5'] + g3.wait_for(expected_state=BGP_FSM_ESTABLISHED, peer=g4) + g3.wait_for(expected_state=BGP_FSM_ESTABLISHED, peer=g5) + + def test_07_rr_test(self): + g3 = self.ctns['g3'] + g4 = self.ctns['g4'] + g5 = self.ctns['g5'] + g4.local("gobgp vrf add vrf1 rd 100:100 rt both 100:100") + time.sleep(1) + g5.local("gobgp vrf add vrf1 rd 100:100 rt both 100:100") + + time.sleep(1) + def check(client): + rib = g3.get_adj_rib_out(client, rf='rtc') + self.assertTrue(len(rib) == 1) + path = rib[0] + self.assertTrue(path['nexthop'] == g3.peers[client]['local_addr'].split('/')[0]) + ids = [attr['value'] for attr in path['attrs'] if attr['type'] == base.BGP_ATTR_TYPE_ORIGINATOR_ID] + self.assertTrue(len(ids) == 1) + self.assertTrue(ids[0] == g3.router_id) + check(g4) + check(g5) + + g4.local("gobgp vrf vrf1 rib add 40.0.0.0/24") + g5.local("gobgp vrf vrf1 rib add 50.0.0.0/24") + time.sleep(1) + def check(client): + rib = g3.get_adj_rib_out(client, rf='ipv4-l3vpn') + self.assertTrue(len(rib) == 1) + path = rib[0] + self.assertTrue(path['nexthop'] != g3.peers[client]['local_addr'].split('/')[0]) + ids = [attr['value'] for attr in path['attrs'] if attr['type'] == base.BGP_ATTR_TYPE_ORIGINATOR_ID] + self.assertTrue(len(ids) == 1) + self.assertTrue(ids[0] != client.router_id) + check(g4) + check(g5) + + def test_08_rr_setup2(self): + g1 = self.ctns['g1'] + g2 = self.ctns['g2'] + g3 = self.ctns['g3'] + + g1.local("gobgp vrf del vrf2") + g1.local("gobgp vrf del vrf3") + g2.local("gobgp vrf del vrf1") + g2.local("gobgp vrf del vrf3") + + g3.add_peer(g1, vpn=True) + g1.add_peer(g3, vpn=True) + g3.add_peer(g2, vpn=True) + g2.add_peer(g3, vpn=True) + + g3.wait_for(expected_state=BGP_FSM_ESTABLISHED, peer=g1) + g3.wait_for(expected_state=BGP_FSM_ESTABLISHED, peer=g2) + + def test_09_rr_test2(self): + g1 = self.ctns['g1'] + g2 = self.ctns['g2'] + g3 = self.ctns['g3'] + g4 = self.ctns['g4'] + g5 = self.ctns['g5'] + + self.assertTrue(len(g1.get_adj_rib_in(g3, rf='ipv4-l3vpn')) == 0) + self.assertTrue(len(g2.get_adj_rib_in(g3, rf='ipv4-l3vpn')) == 0) + + g1.local("gobgp vrf add vrf1 rd 100:100 rt both 100:100") + g1.local("gobgp vrf vrf1 rib add 10.0.0.0/24") + + time.sleep(1) + + self.assertTrue(len(g1.get_adj_rib_in(g3, rf='ipv4-l3vpn')) == 2) + self.assertTrue(len(g2.get_adj_rib_in(g3, rf='ipv4-l3vpn')) == 0) + self.assertTrue(len(g3.get_adj_rib_in(g1, rf='ipv4-l3vpn')) == 1) + self.assertTrue(len(g3.get_adj_rib_in(g2, rf='ipv4-l3vpn')) == 0) + self.assertTrue(len(g4.get_adj_rib_in(g3, rf='ipv4-l3vpn')) == 2) + self.assertTrue(len(g5.get_adj_rib_in(g3, rf='ipv4-l3vpn')) == 2) + + g2.local("gobgp vrf add vrf2 rd 200:200 rt both 200:200") + g2.local("gobgp vrf vrf2 rib add 20.0.0.0/24") + + time.sleep(1) + + self.assertTrue(len(g1.get_adj_rib_in(g3, rf='ipv4-l3vpn')) == 2) + self.assertTrue(len(g2.get_adj_rib_in(g3, rf='ipv4-l3vpn')) == 0) + self.assertTrue(len(g3.get_adj_rib_in(g1, rf='ipv4-l3vpn')) == 1) + self.assertTrue(len(g3.get_adj_rib_in(g2, rf='ipv4-l3vpn')) == 0) + self.assertTrue(len(g4.get_adj_rib_in(g3, rf='ipv4-l3vpn')) == 2) + self.assertTrue(len(g5.get_adj_rib_in(g3, rf='ipv4-l3vpn')) == 2) + + g4.local("gobgp vrf add vrf2 rd 200:200 rt both 200:200") + + time.sleep(1) + + self.assertTrue(len(g1.get_adj_rib_in(g3, rf='ipv4-l3vpn')) == 2) + self.assertTrue(len(g2.get_adj_rib_in(g3, rf='ipv4-l3vpn')) == 0) + self.assertTrue(len(g3.get_adj_rib_in(g1, rf='ipv4-l3vpn')) == 1) + self.assertTrue(len(g3.get_adj_rib_in(g2, rf='ipv4-l3vpn')) == 1) + self.assertTrue(len(g4.get_adj_rib_in(g3, rf='ipv4-l3vpn')) == 3) + self.assertTrue(len(g5.get_adj_rib_in(g3, rf='ipv4-l3vpn')) == 2) + if __name__ == '__main__': if os.geteuid() is not 0: |