diff options
| -rw-r--r-- | .travis.yml | 5 | ||||
| -rw-r--r-- | server/peer.go | 25 | ||||
| -rw-r--r-- | server/server.go | 16 | ||||
| -rw-r--r-- | test/scenario_test/vrf_neighbor_test2.py | 151 |
4 files changed, 190 insertions, 7 deletions
diff --git a/.travis.yml b/.travis.yml index f123aa74..b100ca32 100644 --- a/.travis.yml +++ b/.travis.yml @@ -146,6 +146,11 @@ matrix: sudo: required services: - docker + - env: + - TEST=vrf_neighbor_test2.py + sudo: required + services: + - docker cache: pip: true diff --git a/server/peer.go b/server/peer.go index ffbce86b..4c76248c 100644 --- a/server/peer.go +++ b/server/peer.go @@ -100,6 +100,29 @@ func (peer *Peer) configuredRFlist() []bgp.RouteFamily { return rfs } +func (peer *Peer) toGlobalFamilies(families []bgp.RouteFamily) []bgp.RouteFamily { + if peer.fsm.pConf.Config.Vrf != "" { + fs := make([]bgp.RouteFamily, 0, len(families)) + for _, f := range families { + switch f { + case bgp.RF_IPv4_UC: + fs = append(fs, bgp.RF_IPv4_VPN) + case bgp.RF_IPv6_UC: + fs = append(fs, bgp.RF_IPv6_VPN) + default: + log.WithFields(log.Fields{ + "Topic": "Peer", + "Key": peer.ID(), + "Family": f, + "VRF": peer.fsm.pConf.Config.Vrf, + }).Warn("invalid family configured for vrfed neighbor") + } + } + families = fs + } + return families +} + func classifyFamilies(all, part []bgp.RouteFamily) ([]bgp.RouteFamily, []bgp.RouteFamily) { a := []bgp.RouteFamily{} b := []bgp.RouteFamily{} @@ -285,7 +308,7 @@ func (peer *Peer) filterpath(path *table.Path, withdrawals []*table.Path) *table 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) { + for _, path := range peer.localRib.GetBestPathList(peer.TableID(), peer.toGlobalFamilies(rfList)) { if p := peer.filterpath(path, nil); p != nil { pathList = append(pathList, p) } else { diff --git a/server/server.go b/server/server.go index c86b2af2..263bc00c 100644 --- a/server/server.go +++ b/server/server.go @@ -427,6 +427,9 @@ func (server *BgpServer) notifyBestWatcher(best map[string][]*table.Path, multip } func (server *BgpServer) dropPeerAllRoutes(peer *Peer, families []bgp.RouteFamily) { + + families = peer.toGlobalFamilies(families) + ids := make([]string, 0, len(server.neighborMap)) if peer.isRouteServerClient() { for _, targetPeer := range server.neighborMap { @@ -512,6 +515,13 @@ func (server *BgpServer) propagateUpdate(peer *Peer, pathList []*table.Path) []* var alteredPathList, withdrawn []*table.Path var best map[string][]*table.Path + if peer != nil && peer.fsm.pConf.Config.Vrf != "" { + vrf := server.globalRib.Vrfs[peer.fsm.pConf.Config.Vrf] + for idx, path := range pathList { + pathList[idx] = path.ToGlobal(vrf) + } + } + if peer != nil && peer.isRouteServerClient() { for _, path := range pathList { path.Filter(peer.ID(), table.POLICY_DIRECTION_IMPORT) @@ -816,12 +826,6 @@ func (server *BgpServer) handleFSMMessage(peer *Peer, e *FsmMsg) { } if len(pathList) > 0 { - if v := peer.fsm.pConf.Config.Vrf; v != "" { - vrf := server.globalRib.Vrfs[v] - for idx, path := range pathList { - pathList[idx] = path.ToGlobal(vrf) - } - } altered := server.propagateUpdate(peer, pathList) if server.isWatched(WATCH_EVENT_TYPE_POST_UPDATE) { _, y := peer.fsm.capMap[bgp.BGP_CAP_FOUR_OCTET_AS_NUMBER] diff --git a/test/scenario_test/vrf_neighbor_test2.py b/test/scenario_test/vrf_neighbor_test2.py new file mode 100644 index 00000000..e7d53499 --- /dev/null +++ b/test/scenario_test/vrf_neighbor_test2.py @@ -0,0 +1,151 @@ +# Copyright (C) 2016 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. + +import unittest +from fabric.api import local +from lib import base +from lib.gobgp import * +from lib.quagga import * +import sys +import os +import time +import nose +from noseplugin import OptionParser, parser_option + +class GoBGPTestBase(unittest.TestCase): + + @classmethod + def setUpClass(cls): + gobgp_ctn_image_name = parser_option.gobgp_image + base.TEST_PREFIX = parser_option.test_prefix + + g1 = GoBGPContainer(name='g1', asn=65001, router_id='192.168.0.1', + ctn_image_name=gobgp_ctn_image_name, + log_level=parser_option.gobgp_log_level, + config_format='yaml') + g2 = GoBGPContainer(name='g2', asn=65001, router_id='192.168.0.2', + ctn_image_name=gobgp_ctn_image_name, + log_level=parser_option.gobgp_log_level, + config_format='yaml') + g3 = GoBGPContainer(name='g3', asn=65001, router_id='192.168.0.3', + ctn_image_name=gobgp_ctn_image_name, + log_level=parser_option.gobgp_log_level, + config_format='yaml') + g4 = GoBGPContainer(name='g4', asn=65001, router_id='192.168.0.4', + ctn_image_name=gobgp_ctn_image_name, + log_level=parser_option.gobgp_log_level, + config_format='yaml') + g5 = GoBGPContainer(name='g5', asn=65001, router_id='192.168.0.5', + ctn_image_name=gobgp_ctn_image_name, + log_level=parser_option.gobgp_log_level, + config_format='yaml') + + ctns = [g1, g2, g3, g4, g5] + + initial_wait_time = max(ctn.run() for ctn in ctns) + + time.sleep(initial_wait_time) + + g3.local("gobgp vrf add red rd 10:10 rt both 10:10") + g3.local("gobgp vrf add blue rd 20:20 rt both 20:20") + + g1.add_peer(g3, graceful_restart=True, llgr=True) + g3.add_peer(g1, vrf='red', is_rr_client=True, graceful_restart=True, llgr=True) + + g2.add_peer(g3, graceful_restart=True, llgr=True) + g3.add_peer(g2, vrf='red', is_rr_client=True, graceful_restart=True, llgr=True) + + g4.add_peer(g3, graceful_restart=True, llgr=True) + g3.add_peer(g4, vrf='blue', is_rr_client=True, graceful_restart=True, llgr=True) + + g5.add_peer(g3, graceful_restart=True, llgr=True) + g3.add_peer(g5, vrf='blue', is_rr_client=True, graceful_restart=True, llgr=True) + + cls.g1 = g1 + cls.g2 = g2 + cls.g3 = g3 + cls.g4 = g4 + cls.g5 = g5 + + + # test each neighbor state is turned establish + def test_01_neighbor_established(self): + self.g3.wait_for(expected_state=BGP_FSM_ESTABLISHED, peer=self.g1) + self.g3.wait_for(expected_state=BGP_FSM_ESTABLISHED, peer=self.g2) + self.g3.wait_for(expected_state=BGP_FSM_ESTABLISHED, peer=self.g4) + self.g3.wait_for(expected_state=BGP_FSM_ESTABLISHED, peer=self.g5) + + + def test_02_add_routes(self): + self.g1.local("gobgp global rib add 10.0.0.0/24") + self.g4.local("gobgp global rib add 10.0.0.0/24") + time.sleep(3) + self.assertTrue(len(self.g3.get_global_rib(rf="vpnv4")) == 2) + self.assertTrue(len(self.g2.get_global_rib()) == 1) + self.assertTrue(len(self.g5.get_global_rib()) == 1) + + + def test_03_disable(self): + self.g3.disable_peer(self.g1) + time.sleep(3) + self.assertTrue(len(self.g3.get_global_rib(rf="vpnv4")) == 1) + self.assertTrue(len(self.g2.get_global_rib()) == 0) + self.assertTrue(len(self.g5.get_global_rib()) == 1) + self.g3.enable_peer(self.g1) + self.g3.wait_for(expected_state=BGP_FSM_ESTABLISHED, peer=self.g1) + + + def test_04_softreset_in(self): + self.g3.softreset(self.g1) + time.sleep(3) + self.assertTrue(len(self.g3.get_global_rib()) == 0) + self.assertTrue(len(self.g3.get_global_rib(rf="vpnv4")) == 2) + self.assertTrue(len(self.g2.get_global_rib()) == 1) + self.assertTrue(len(self.g5.get_global_rib()) == 1) + + + def test_05_softreset_out(self): + self.g3.softreset(self.g2, type='out') + time.sleep(3) + self.assertTrue(len(self.g3.get_global_rib()) == 0) + self.assertTrue(len(self.g3.get_global_rib(rf="vpnv4")) == 2) + self.assertTrue(len(self.g2.get_global_rib()) == 1) + self.assertTrue(len(self.g5.get_global_rib()) == 1) + + + def test_06_graceful_restart(self): + self.g1.graceful_restart() + self.g3.wait_for(expected_state=BGP_FSM_ACTIVE, peer=self.g1) + + time.sleep(1) + self.assertTrue(len(self.g3.get_global_rib(rf="vpnv4")) == 2) + self.assertTrue(len(self.g2.get_global_rib()) == 1) + + time.sleep(35) + self.assertTrue(len(self.g3.get_global_rib(rf="vpnv4")) == 1) + self.assertTrue(len(self.g2.get_global_rib()) == 0) + + +if __name__ == '__main__': + if os.geteuid() is not 0: + print "you are not root." + sys.exit(1) + output = local("which docker 2>&1 > /dev/null ; echo $?", capture=True) + if int(output) is not 0: + print "docker not found" + sys.exit(1) + + nose.main(argv=sys.argv, addplugins=[OptionParser()], + defaultTest=sys.argv[0]) |