summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
Diffstat
-rw-r--r--api/gobgp.pb.go36
-rw-r--r--api/gobgp.proto1
-rw-r--r--gobgp/neighbor.go2
-rw-r--r--packet/bgp.go10
-rw-r--r--test/scenario_test/ci-scripts/jenkins-build-script.sh9
-rw-r--r--test/scenario_test/evpn_test.py148
-rw-r--r--test/scenario_test/lib/base.py1
7 files changed, 187 insertions, 20 deletions
diff --git a/api/gobgp.pb.go b/api/gobgp.pb.go
index 71e3f454..2dabd008 100644
--- a/api/gobgp.pb.go
+++ b/api/gobgp.pb.go
@@ -927,20 +927,21 @@ func (m *PmsiTunnel) String() string { return proto.CompactTextString(m) }
func (*PmsiTunnel) ProtoMessage() {}
type PathAttr struct {
- Type BGP_ATTR_TYPE `protobuf:"varint,1,opt,name=type,enum=api.BGP_ATTR_TYPE" json:"type,omitempty"`
- Value []string `protobuf:"bytes,2,rep,name=value" json:"value,omitempty"`
- Origin Origin `protobuf:"varint,3,opt,name=origin,enum=api.Origin" json:"origin,omitempty"`
- AsPaths []*AsPath `protobuf:"bytes,4,rep,name=as_paths" json:"as_paths,omitempty"`
- Nexthop string `protobuf:"bytes,5,opt,name=nexthop" json:"nexthop,omitempty"`
- Metric uint32 `protobuf:"varint,6,opt,name=metric" json:"metric,omitempty"`
- Pref uint32 `protobuf:"varint,7,opt,name=pref" json:"pref,omitempty"`
- Aggregator *Aggregator `protobuf:"bytes,8,opt,name=aggregator" json:"aggregator,omitempty"`
- Communites []uint32 `protobuf:"varint,9,rep,name=communites" json:"communites,omitempty"`
- Originator string `protobuf:"bytes,10,opt,name=originator" json:"originator,omitempty"`
- Cluster []string `protobuf:"bytes,11,rep,name=cluster" json:"cluster,omitempty"`
- Nlri []*Nlri `protobuf:"bytes,12,rep,name=nlri" json:"nlri,omitempty"`
- TunnelEncap []*TunnelEncapTLV `protobuf:"bytes,13,rep,name=tunnel_encap" json:"tunnel_encap,omitempty"`
- PmsiTunnel *PmsiTunnel `protobuf:"bytes,14,opt,name=pmsi_tunnel" json:"pmsi_tunnel,omitempty"`
+ Type BGP_ATTR_TYPE `protobuf:"varint,1,opt,name=type,enum=api.BGP_ATTR_TYPE" json:"type,omitempty"`
+ Value []string `protobuf:"bytes,2,rep,name=value" json:"value,omitempty"`
+ Origin Origin `protobuf:"varint,3,opt,name=origin,enum=api.Origin" json:"origin,omitempty"`
+ AsPaths []*AsPath `protobuf:"bytes,4,rep,name=as_paths" json:"as_paths,omitempty"`
+ Nexthop string `protobuf:"bytes,5,opt,name=nexthop" json:"nexthop,omitempty"`
+ Metric uint32 `protobuf:"varint,6,opt,name=metric" json:"metric,omitempty"`
+ Pref uint32 `protobuf:"varint,7,opt,name=pref" json:"pref,omitempty"`
+ Aggregator *Aggregator `protobuf:"bytes,8,opt,name=aggregator" json:"aggregator,omitempty"`
+ Communites []uint32 `protobuf:"varint,9,rep,name=communites" json:"communites,omitempty"`
+ Originator string `protobuf:"bytes,10,opt,name=originator" json:"originator,omitempty"`
+ Cluster []string `protobuf:"bytes,11,rep,name=cluster" json:"cluster,omitempty"`
+ Nlri []*Nlri `protobuf:"bytes,12,rep,name=nlri" json:"nlri,omitempty"`
+ TunnelEncap []*TunnelEncapTLV `protobuf:"bytes,13,rep,name=tunnel_encap" json:"tunnel_encap,omitempty"`
+ ExtendedCommunities []*ExtendedCommunity `protobuf:"bytes,16,rep,name=extended_communities" json:"extended_communities,omitempty"`
+ PmsiTunnel *PmsiTunnel `protobuf:"bytes,14,opt,name=pmsi_tunnel" json:"pmsi_tunnel,omitempty"`
}
func (m *PathAttr) Reset() { *m = PathAttr{} }
@@ -975,6 +976,13 @@ func (m *PathAttr) GetTunnelEncap() []*TunnelEncapTLV {
return nil
}
+func (m *PathAttr) GetExtendedCommunities() []*ExtendedCommunity {
+ if m != nil {
+ return m.ExtendedCommunities
+ }
+ return nil
+}
+
func (m *PathAttr) GetPmsiTunnel() *PmsiTunnel {
if m != nil {
return m.PmsiTunnel
diff --git a/api/gobgp.proto b/api/gobgp.proto
index fe3d31fe..2f20a5b9 100644
--- a/api/gobgp.proto
+++ b/api/gobgp.proto
@@ -348,6 +348,7 @@ message PathAttr {
repeated string cluster = 11;
repeated Nlri nlri = 12;
repeated TunnelEncapTLV tunnel_encap = 13;
+ repeated ExtendedCommunity extended_communities = 16;
PmsiTunnel pmsi_tunnel = 14;
}
diff --git a/gobgp/neighbor.go b/gobgp/neighbor.go
index 9774fc3d..bc88e42d 100644
--- a/gobgp/neighbor.go
+++ b/gobgp/neighbor.go
@@ -337,6 +337,8 @@ func showRoute(pathList []*api.Path, showAge bool, showBest bool, isMonitor bool
s1.WriteString(strings.Join(s2, "|"))
s1.WriteString("}")
s = append(s, s1.String())
+ case api.BGP_ATTR_TYPE_EXTENDED_COMMUNITIES:
+ s = append(s, fmt.Sprintf("{Ext Comms: %v}", a.ExtendedCommunities))
case api.BGP_ATTR_TYPE_AS4_PATH, api.BGP_ATTR_TYPE_MP_REACH_NLRI, api.BGP_ATTR_TYPE_MP_UNREACH_NLRI, api.BGP_ATTR_TYPE_NEXT_HOP, api.BGP_ATTR_TYPE_AS_PATH:
default:
s = append(s, fmt.Sprintf("{%v: %v}", a.Type, a.Value))
diff --git a/packet/bgp.go b/packet/bgp.go
index 31dde01f..9fc3366e 100644
--- a/packet/bgp.go
+++ b/packet/bgp.go
@@ -3672,16 +3672,16 @@ func (p *PathAttributeExtendedCommunities) Serialize() ([]byte, error) {
}
func (p *PathAttributeExtendedCommunities) ToApiStruct() *api.PathAttr {
- value := func(arg []ExtendedCommunityInterface) []string {
- ret := make([]string, 0, len(arg))
+ ecs := func(arg []ExtendedCommunityInterface) []*api.ExtendedCommunity {
+ ret := make([]*api.ExtendedCommunity, 0, len(arg))
for _, v := range p.Value {
- ret = append(ret, v.String())
+ ret = append(ret, v.ToApiStruct())
}
return ret
}(p.Value)
return &api.PathAttr{
- Type: api.BGP_ATTR_TYPE_EXTENDED_COMMUNITIES,
- Value: value,
+ Type: api.BGP_ATTR_TYPE_EXTENDED_COMMUNITIES,
+ ExtendedCommunities: ecs,
}
}
diff --git a/test/scenario_test/ci-scripts/jenkins-build-script.sh b/test/scenario_test/ci-scripts/jenkins-build-script.sh
index dabeb3ba..13ae6f9a 100644
--- a/test/scenario_test/ci-scripts/jenkins-build-script.sh
+++ b/test/scenario_test/ci-scripts/jenkins-build-script.sh
@@ -16,6 +16,7 @@ ls -al
git log | head -20
sudo docker rmi $(sudo docker images | grep "^<none>" | awk '{print $3}')
+sudo docker rm -f $(sudo docker ps -a -q)
sudo fab -f $GOBGP/test/scenario_test/lib/base.py make_gobgp_ctn --set tag=$GOBGP_IMAGE
@@ -54,12 +55,18 @@ PID5=$!
sudo -E python ibgp_router_test.py --gobgp-image $GOBGP_IMAGE --test-prefix ibgp -s -x --with-xunit --xunit-file=${WS}/nosetest_ibgp.xml &
PID6=$!
+# evpn test
+sudo -E python evpn_test.py --gobgp-image $GOBGP_IMAGE --test-prefix evpn -s -x --with-xunit --xunit-file=${WS}/nosetest_evpn.xml&
+PID7=$!
+
wait $PID5
RET5=$?
wait $PID6
RET6=$?
+wait $PID7
+RET7=$?
-if [ $RET1 != 0 ] || [ $RET2 != 0 ] || [ $RET3 != 0 ] || [ $RET4 != 0 ] || [ $RET5 != 0 ] || [ $RET6 != 0 ]; then
+if [ $RET1 != 0 ] || [ $RET2 != 0 ] || [ $RET3 != 0 ] || [ $RET4 != 0 ] || [ $RET5 != 0 ] || [ $RET6 != 0 ] || [ $RET7 != 0 ]; then
exit 1
fi
exit 0
diff --git a/test/scenario_test/evpn_test.py b/test/scenario_test/evpn_test.py
new file mode 100644
index 00000000..270773bb
--- /dev/null
+++ b/test/scenario_test/evpn_test.py
@@ -0,0 +1,148 @@
+# Copyright (C) 2015 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
+from itertools import combinations
+
+def get_mac_mobility_sequence(pattr):
+ for ecs in [p['extended_communities'] for p in pattr
+ if 'type' in p and \
+ p['type'] == BGP_ATTR_TYPE_EXTENDED_COMMUNITIES]:
+ for ec in [e for e in ecs if 'type' in e and e['type'] == 4]:
+ if ec['subtype'] == 5:
+ if 'sequence' not in ec:
+ return 0
+ else:
+ return ec['sequence']
+ return -1
+
+
+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=65000, router_id='192.168.0.1',
+ ctn_image_name=gobgp_ctn_image_name,
+ log_level=parser_option.gobgp_log_level)
+ 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)
+
+ time.sleep(initial_wait_time)
+
+ br01 = Bridge(name='br01', subnet='192.168.10.0/24')
+ [br01.addif(ctn) for ctn in ctns]
+
+ for a, b in combinations(ctns, 2):
+ a.add_peer(b, evpn=True)
+ b.add_peer(a, evpn=True)
+
+ cls.g1 = g1
+ cls.g2 = g2
+
+ # 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_add_evpn_route(self):
+ self.g1.local('gobgp global rib add '
+ '-a evpn macadv 11:22:33:44:55:66 10.0.0.1 1000 1000 '
+ 'rd 10:10 rt 10:10')
+ grib = self.g1.get_global_rib(rf='evpn')
+ self.assertTrue(len(grib) == 1)
+ dst = grib[0]
+ self.assertTrue(len(dst['paths']) == 1)
+ path = dst['paths'][0]
+ self.assertTrue(path['nexthop'] == '0.0.0.0')
+
+ interval = 1
+ timeout = int(30/interval)
+ done = False
+ for _ in range(timeout):
+ if done:
+ break
+ grib = self.g2.get_global_rib(rf='evpn')
+
+ if len(grib) < 1:
+ time.sleep(interval)
+ continue
+
+ self.assertTrue(len(grib) == 1)
+ dst = grib[0]
+ self.assertTrue(len(dst['paths']) == 1)
+ path = dst['paths'][0]
+ n_addrs = [i[1].split('/')[0] for i in self.g1.ip_addrs]
+ self.assertTrue(path['nexthop'] in n_addrs)
+ done = True
+
+ def test_03_check_mac_mobility(self):
+ self.g2.local('gobgp global rib add '
+ '-a evpn macadv 11:22:33:44:55:66 10.0.0.1 1000 1000 '
+ 'rd 10:20 rt 10:10')
+
+ time.sleep(3)
+
+ grib = self.g1.get_global_rib(rf='evpn')
+ self.assertTrue(len(grib) == 1)
+ dst = grib[0]
+ self.assertTrue(len(dst['paths']) == 1)
+ path = dst['paths'][0]
+ n_addrs = [i[1].split('/')[0] for i in self.g2.ip_addrs]
+ self.assertTrue(path['nexthop'] in n_addrs)
+ self.assertTrue(get_mac_mobility_sequence(path['attrs']) == 0)
+
+ def test_04_check_mac_mobility_again(self):
+ self.g1.local('gobgp global rib add '
+ '-a evpn macadv 11:22:33:44:55:66 10.0.0.1 1000 1000 '
+ 'rd 10:20 rt 10:10')
+
+ time.sleep(3)
+
+ grib = self.g2.get_global_rib(rf='evpn')
+ self.assertTrue(len(grib) == 1)
+ dst = grib[0]
+ self.assertTrue(len(dst['paths']) == 1)
+ path = dst['paths'][0]
+ n_addrs = [i[1].split('/')[0] for i in self.g1.ip_addrs]
+ self.assertTrue(path['nexthop'] in n_addrs)
+ self.assertTrue(get_mac_mobility_sequence(path['attrs']) == 1)
+
+
+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])
diff --git a/test/scenario_test/lib/base.py b/test/scenario_test/lib/base.py
index 6fc40e36..274a68cf 100644
--- a/test/scenario_test/lib/base.py
+++ b/test/scenario_test/lib/base.py
@@ -36,6 +36,7 @@ BGP_ATTR_TYPE_AS_PATH = 2
BGP_ATTR_TYPE_NEXT_HOP = 3
BGP_ATTR_TYPE_MULTI_EXIT_DISC = 4
BGP_ATTR_TYPE_LOCAL_PREF = 5
+BGP_ATTR_TYPE_EXTENDED_COMMUNITIES = 16
def get_bridges():
generated by cgit v1.2.3 (git 2.39.1) at 2024-11-15 14:58:44 +0000