diff options
author | FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp> | 2016-09-30 05:50:25 -0700 |
---|---|---|
committer | FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp> | 2016-09-30 05:50:25 -0700 |
commit | dfe1b71fd28496110436ff15bf135feec02f181e (patch) | |
tree | 9baa416de7f16cf6bf333034f43333a68a038364 | |
parent | 8f4603b25a08046937ede81efbc3062eebf89067 (diff) |
api: add id to VrfRequest
to support VRF ID for Zebra Protocol v3.
Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
-rw-r--r-- | api/gobgp.pb.go | 161 | ||||
-rw-r--r-- | api/gobgp.proto | 1 | ||||
-rw-r--r-- | api/grpc_server.go | 2 | ||||
-rw-r--r-- | server/server.go | 4 | ||||
-rw-r--r-- | table/table_manager.go | 3 | ||||
-rw-r--r-- | table/vrf.go | 2 |
6 files changed, 89 insertions, 84 deletions
diff --git a/api/gobgp.pb.go b/api/gobgp.pb.go index b974c386..8193626f 100644 --- a/api/gobgp.pb.go +++ b/api/gobgp.pb.go @@ -2300,6 +2300,7 @@ type Vrf struct { Rd []byte `protobuf:"bytes,2,opt,name=rd,proto3" json:"rd,omitempty"` ImportRt [][]byte `protobuf:"bytes,3,rep,name=import_rt,json=importRt,proto3" json:"import_rt,omitempty"` ExportRt [][]byte `protobuf:"bytes,4,rep,name=export_rt,json=exportRt,proto3" json:"export_rt,omitempty"` + Id uint32 `protobuf:"varint,5,opt,name=id" json:"id,omitempty"` } func (m *Vrf) Reset() { *m = Vrf{} } @@ -4253,7 +4254,7 @@ var _GobgpApi_serviceDesc = grpc.ServiceDesc{ func init() { proto.RegisterFile("gobgp.proto", fileDescriptor0) } var fileDescriptor0 = []byte{ - // 5381 bytes of a gzipped FileDescriptorProto + // 5388 bytes of a gzipped FileDescriptorProto 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x09, 0x6e, 0x88, 0x02, 0xff, 0xd4, 0x3c, 0x4d, 0x73, 0x1b, 0x57, 0x72, 0x04, 0x01, 0x92, 0x40, 0x03, 0x20, 0xc1, 0x11, 0x29, 0x41, 0x90, 0x25, 0x5b, 0xb3, 0xeb, 0xb5, 0xac, 0xb5, 0xe5, 0xb5, 0x6c, 0xcb, 0x9b, 0xf5, 0x7a, 0xb3, 0x30, 0x09, 0x49, 0x58, 0xf3, @@ -4512,83 +4513,83 @@ var fileDescriptor0 = []byte{ 0xd1, 0xbd, 0x45, 0x38, 0x36, 0x74, 0x49, 0x51, 0xec, 0x16, 0x03, 0xc8, 0x40, 0x60, 0xe0, 0x41, 0x28, 0xf9, 0x9c, 0x20, 0x5a, 0x4a, 0xae, 0xbc, 0x92, 0x7a, 0x3e, 0x89, 0xb2, 0xd6, 0x6b, 0xe7, 0x7f, 0xab, 0x87, 0xda, 0xcf, 0x4f, 0x06, 0xae, 0xf5, 0xa2, 0xef, 0xef, 0xc4, 0x57, 0x4d, 0x4c, - 0x98, 0x7c, 0xd5, 0xe4, 0xbb, 0x56, 0xc1, 0x57, 0x4d, 0x44, 0xc4, 0x28, 0x7d, 0x04, 0xe5, 0xc7, - 0xfe, 0xa4, 0x50, 0x3a, 0x70, 0xf9, 0xbe, 0xc8, 0xd4, 0x34, 0x0c, 0xfc, 0xc5, 0xa1, 0x9a, 0x48, - 0xba, 0xfa, 0x22, 0xe8, 0x69, 0x60, 0xa8, 0xc6, 0x00, 0x83, 0x3f, 0x95, 0x96, 0x29, 0x5d, 0x3f, - 0xe4, 0x33, 0x41, 0xa4, 0x00, 0x18, 0xa1, 0xfe, 0x37, 0xab, 0xb0, 0x2e, 0x5e, 0x11, 0x73, 0x7b, - 0x8a, 0xfd, 0xd8, 0xf6, 0x28, 0x59, 0xa1, 0xaa, 0x00, 0xf4, 0xc7, 0xe4, 0x1a, 0x29, 0xaa, 0xb2, - 0xe7, 0x22, 0x3e, 0x2d, 0x0b, 0xd7, 0x28, 0x40, 0x1c, 0x9f, 0xbe, 0x0b, 0x2d, 0x49, 0x20, 0xed, - 0xa7, 0x14, 0x88, 0x9a, 0xb1, 0x25, 0xe0, 0xdd, 0x08, 0x9c, 0x7a, 0x7a, 0x58, 0xcb, 0x3c, 0x3d, - 0x7c, 0x1f, 0x36, 0x67, 0xde, 0x34, 0x30, 0xa7, 0xd6, 0x13, 0x7b, 0xca, 0x61, 0xa6, 0x08, 0x85, - 0x1b, 0x04, 0x3d, 0x20, 0x20, 0x45, 0x99, 0x19, 0x2a, 0x0c, 0x32, 0x37, 0xb2, 0x54, 0xd6, 0x33, - 0x4a, 0xa2, 0x90, 0x3f, 0xe0, 0x9c, 0x9a, 0x37, 0xb5, 0x4d, 0xf1, 0x44, 0x56, 0x15, 0x49, 0x14, - 0xc4, 0x1c, 0x4a, 0x04, 0xc5, 0x1d, 0xc1, 0xed, 0x3d, 0xa8, 0x46, 0x32, 0xaf, 0x01, 0x6e, 0xd2, - 0xc1, 0xf1, 0x17, 0xe8, 0x4a, 0x57, 0xb4, 0x1a, 0xac, 0x09, 0xaf, 0x5a, 0x22, 0x70, 0x77, 0xff, - 0x17, 0xe8, 0x96, 0xd1, 0xef, 0xd6, 0xd1, 0xbe, 0xe3, 0x6f, 0xfa, 0x8a, 0xbf, 0x4c, 0x1f, 0x38, - 0x3f, 0x36, 0xee, 0xb7, 0x2a, 0xb7, 0x4d, 0x7a, 0xaf, 0x8b, 0x23, 0x56, 0xea, 0x30, 0xc0, 0x9b, - 0x77, 0xff, 0x6b, 0xe4, 0xd3, 0x80, 0xea, 0x51, 0xaf, 0xff, 0xe0, 0xe1, 0x17, 0xc7, 0x06, 0xb2, - 0xc2, 0x1e, 0xc3, 0xee, 0x03, 0xc9, 0xe7, 0xc4, 0x1c, 0x74, 0x87, 0x0f, 0x91, 0x4f, 0x13, 0x6a, - 0x7b, 0xc7, 0x87, 0x87, 0x8f, 0x8e, 0xfa, 0xc3, 0x6f, 0x5a, 0x15, 0x6d, 0x1b, 0x9a, 0xe8, 0xe9, - 0xcd, 0x04, 0xb4, 0x76, 0xfb, 0x5d, 0x74, 0xb8, 0x51, 0x14, 0x4a, 0x4c, 0xba, 0x47, 0xdf, 0x88, - 0x72, 0x82, 0xee, 0x81, 0x9c, 0x61, 0xff, 0xe8, 0x71, 0xcf, 0x18, 0xb6, 0x56, 0x6f, 0xdf, 0x86, - 0x56, 0x36, 0xc6, 0xa4, 0xfa, 0x83, 0xde, 0x57, 0xd8, 0x01, 0xff, 0x3e, 0xe8, 0x21, 0x3d, 0xfe, - 0x3d, 0xe8, 0x21, 0xed, 0x07, 0xf2, 0x12, 0x21, 0xfd, 0x4e, 0x15, 0x2a, 0x32, 0x20, 0xa1, 0x25, - 0xef, 0xed, 0xf5, 0x06, 0x43, 0xc1, 0xdc, 0xe8, 0xfd, 0xa2, 0xb7, 0x47, 0xcc, 0x1f, 0xc1, 0xa5, - 0x82, 0xb8, 0x81, 0x66, 0x1c, 0xcf, 0xd6, 0xec, 0xee, 0xef, 0x23, 0x07, 0x0c, 0x50, 0x12, 0x90, - 0xd1, 0x3b, 0x3c, 0x7e, 0x4c, 0x03, 0xef, 0xc2, 0xb6, 0x0a, 0x1d, 0x1c, 0x74, 0xf7, 0x68, 0x1e, - 0xef, 0x43, 0x33, 0x15, 0x2c, 0xd0, 0xf6, 0x1c, 0xf6, 0xf6, 0xcd, 0xc3, 0x63, 0x62, 0xb5, 0x05, - 0x75, 0x6a, 0x44, 0xe4, 0xa5, 0xdb, 0xef, 0x01, 0x24, 0x56, 0x2d, 0x2e, 0xae, 0xa0, 0x4d, 0x38, - 0x1c, 0x1c, 0x1b, 0x72, 0xce, 0xbd, 0xaf, 0xf9, 0xf7, 0xea, 0xdd, 0xbf, 0x7a, 0x13, 0xaa, 0x0f, - 0x48, 0xef, 0xba, 0x9e, 0xa3, 0x1d, 0x40, 0x5d, 0x79, 0x3b, 0xd7, 0xde, 0x48, 0xd9, 0xda, 0xcc, - 0x93, 0x7c, 0xe7, 0xfa, 0x12, 0xac, 0x7c, 0x54, 0x5b, 0xd1, 0xfa, 0x00, 0xc9, 0xeb, 0xba, 0x76, - 0x4d, 0x25, 0xcf, 0x3c, 0xc4, 0x77, 0xde, 0x28, 0x46, 0xc6, 0xac, 0xee, 0x43, 0x2d, 0xfe, 0xa6, - 0x40, 0x53, 0xee, 0x0b, 0xd9, 0x8f, 0x0f, 0x3a, 0xd7, 0x0a, 0x71, 0x31, 0x1f, 0x5c, 0xa0, 0x52, - 0xc5, 0xa3, 0x2e, 0x30, 0x5f, 0x16, 0xa4, 0x2e, 0xb0, 0xa8, 0xf4, 0x67, 0x45, 0x7b, 0x04, 0x9b, - 0xe9, 0xfa, 0x1d, 0xed, 0x4d, 0xf5, 0x92, 0x56, 0x50, 0x16, 0xd4, 0x79, 0x6b, 0x39, 0x81, 0x3a, - 0x49, 0xa5, 0x62, 0x4d, 0x9d, 0x64, 0xbe, 0xbc, 0x4d, 0x9d, 0x64, 0x41, 0x99, 0x1b, 0x72, 0x33, - 0xa0, 0x99, 0x2a, 0x9f, 0xd1, 0x6e, 0xa4, 0xfc, 0x59, 0x9e, 0xe3, 0x9b, 0x4b, 0xf1, 0x31, 0xcf, - 0x3f, 0x80, 0xed, 0x5c, 0x59, 0x8e, 0xa6, 0xbf, 0xb8, 0x3c, 0xa8, 0xf3, 0xbd, 0x73, 0x69, 0x62, - 0xfe, 0xbf, 0x0b, 0xad, 0x6c, 0x91, 0x8e, 0x76, 0x53, 0xe9, 0x5a, 0x5c, 0xf5, 0xd3, 0xd1, 0xcf, - 0x23, 0x51, 0x4f, 0x2d, 0x5d, 0xb2, 0xa3, 0x9e, 0x5a, 0x61, 0xfd, 0x8f, 0x7a, 0x6a, 0x4b, 0xaa, - 0x7d, 0x56, 0xb4, 0xaf, 0x61, 0x2b, 0x53, 0xbb, 0xa3, 0xa9, 0x87, 0x5d, 0x58, 0x0a, 0xd4, 0xb9, - 0x79, 0x0e, 0x45, 0xcc, 0xf9, 0x73, 0x34, 0xbc, 0xfc, 0xb8, 0xae, 0x5d, 0x49, 0x1d, 0x76, 0xf2, - 0x60, 0xde, 0x69, 0xe7, 0x11, 0xaa, 0x38, 0x29, 0x8f, 0xde, 0xaa, 0x38, 0xe5, 0x5f, 0xde, 0x55, - 0x71, 0x2a, 0x7a, 0x29, 0x5f, 0xd1, 0x7e, 0x8e, 0xa6, 0x59, 0xd4, 0x0a, 0x6a, 0xed, 0x94, 0x7e, - 0x28, 0x35, 0x81, 0x9d, 0xab, 0x05, 0x18, 0xd5, 0x2c, 0x24, 0x95, 0x79, 0xaa, 0x59, 0xc8, 0xd5, - 0x16, 0xaa, 0x66, 0xa1, 0xa0, 0x98, 0x6f, 0x85, 0xa2, 0x5f, 0x59, 0x57, 0x43, 0x2b, 0xcb, 0x7e, - 0x63, 0xd0, 0x29, 0xfe, 0x26, 0x42, 0x5f, 0xf9, 0x51, 0x49, 0xfb, 0x2c, 0xae, 0xc8, 0x49, 0xde, - 0x71, 0x94, 0xd0, 0x32, 0x2e, 0xfa, 0xec, 0x64, 0x2a, 0xf7, 0xb8, 0x33, 0x5a, 0xa3, 0xb8, 0x44, - 0x4a, 0xb5, 0x46, 0xd9, 0x02, 0x2d, 0xd5, 0x1a, 0xe5, 0x6b, 0xaa, 0xc4, 0x4e, 0xc4, 0x05, 0x54, - 0xa9, 0x9d, 0xc8, 0xd6, 0x5a, 0xa5, 0x76, 0x22, 0x5f, 0x73, 0xb5, 0xa2, 0x3d, 0x84, 0x5a, 0x5c, - 0xf4, 0xa4, 0x4e, 0x29, 0x5b, 0x8a, 0xa5, 0x4e, 0x29, 0x5f, 0x25, 0xb5, 0x72, 0xab, 0x44, 0xd2, - 0x26, 0x4a, 0x8f, 0x54, 0x69, 0x4b, 0x55, 0x39, 0x75, 0xda, 0x79, 0x84, 0x6a, 0xa9, 0xe3, 0x2a, - 0x23, 0x75, 0x22, 0xd9, 0xe2, 0xa5, 0xce, 0xb5, 0x42, 0x9c, 0x2a, 0x67, 0xb2, 0x5a, 0x43, 0xcb, - 0x08, 0x77, 0xf2, 0x99, 0xbf, 0x2a, 0x67, 0x99, 0xd2, 0x8e, 0x58, 0x52, 0xb3, 0x1c, 0xd2, 0x55, - 0x1c, 0x19, 0x49, 0xcd, 0x70, 0x88, 0x25, 0x95, 0x99, 0xe4, 0x26, 0xac, 0xf2, 0x79, 0xa3, 0x18, - 0xa9, 0xb2, 0x4a, 0x0a, 0x29, 0xb4, 0x9c, 0x5c, 0x2c, 0x61, 0x55, 0x50, 0x7b, 0xc1, 0xfa, 0xac, - 0x54, 0x53, 0x68, 0x79, 0xc9, 0x50, 0x99, 0x5d, 0x5f, 0x82, 0x55, 0xcf, 0x2b, 0xae, 0x85, 0x50, - 0xcf, 0x2b, 0x5b, 0x52, 0xa1, 0x9e, 0x57, 0xbe, 0x78, 0x82, 0xdd, 0x4c, 0xaa, 0xae, 0x42, 0x75, - 0x33, 0x45, 0x25, 0x1a, 0xaa, 0x9b, 0x29, 0x2e, 0xc8, 0x88, 0x0d, 0x1f, 0x5e, 0x75, 0x32, 0x86, - 0x2f, 0xbe, 0x6c, 0x64, 0x0d, 0x5f, 0x72, 0xb9, 0x10, 0x1b, 0xa5, 0x94, 0x5b, 0x68, 0xb9, 0x7d, - 0x55, 0x0b, 0x3d, 0xd4, 0x8d, 0x2a, 0xaa, 0xd1, 0x58, 0x91, 0x7a, 0x41, 0x97, 0x91, 0xb4, 0x5e, - 0x24, 0xa5, 0x12, 0x19, 0xbd, 0x50, 0xcb, 0x21, 0x14, 0xbd, 0x20, 0x0e, 0x39, 0xbd, 0x50, 0x98, - 0x5c, 0x2b, 0xc4, 0x65, 0xf6, 0x24, 0x33, 0x8d, 0x54, 0xf9, 0x48, 0x66, 0x4f, 0xd2, 0xdd, 0x0d, - 0xbe, 0xad, 0x29, 0x49, 0xe6, 0x1b, 0x29, 0xe2, 0x5c, 0x71, 0x81, 0x7a, 0x4c, 0x85, 0xd5, 0x18, - 0x82, 0x67, 0xaa, 0x4a, 0x42, 0xe5, 0x59, 0x54, 0x7e, 0xa1, 0xf2, 0x2c, 0x2e, 0xaf, 0xe0, 0x08, - 0x20, 0x5b, 0x0b, 0xa1, 0x46, 0x00, 0x4b, 0x8a, 0x2f, 0xd4, 0x08, 0x60, 0x69, 0x29, 0x05, 0x87, - 0x2f, 0xb9, 0x42, 0x08, 0x35, 0x7c, 0x59, 0x56, 0x69, 0xa1, 0x86, 0x2f, 0xcb, 0x2b, 0x29, 0x56, - 0xb4, 0x63, 0x68, 0xa8, 0x45, 0x13, 0x5a, 0x3a, 0x46, 0xcb, 0xd6, 0x07, 0x74, 0x6e, 0x2c, 0x43, - 0xab, 0x0c, 0xd5, 0x72, 0x07, 0x2d, 0x1d, 0x99, 0x9e, 0xc7, 0xb0, 0xb0, 0x4a, 0x42, 0x04, 0x2b, - 0xe9, 0x42, 0x06, 0x2d, 0x17, 0x99, 0xe6, 0xd8, 0xde, 0x3c, 0x87, 0x42, 0x3d, 0xb8, 0x6c, 0xe5, - 0x82, 0x7a, 0x70, 0x4b, 0x6a, 0x24, 0x3a, 0xfa, 0x79, 0x24, 0x99, 0x6b, 0x80, 0xcc, 0x18, 0xa5, - 0xaf, 0x01, 0xa9, 0xef, 0xf0, 0x33, 0xd7, 0x80, 0xcc, 0x47, 0xef, 0xcc, 0x27, 0xfe, 0xce, 0x5b, - 0xe5, 0x93, 0x2d, 0x80, 0x50, 0xf9, 0xe4, 0x4b, 0x14, 0xf8, 0x5c, 0xd4, 0x2f, 0xb4, 0xd5, 0x73, - 0x29, 0xa8, 0x5d, 0x50, 0xcf, 0xa5, 0xb0, 0xac, 0x40, 0x06, 0xeb, 0xca, 0x27, 0xd7, 0xe9, 0x60, - 0x3d, 0x5f, 0x70, 0x90, 0x0e, 0xd6, 0x8b, 0xbe, 0xf0, 0x5f, 0xd1, 0xc6, 0x5c, 0xd9, 0x93, 0x4b, - 0x89, 0x7d, 0xbf, 0x60, 0x8b, 0x72, 0xdf, 0x8f, 0x77, 0xde, 0x7e, 0x01, 0x95, 0x3a, 0x4a, 0xc1, - 0xa7, 0xf3, 0xea, 0x28, 0xcb, 0xbf, 0xd9, 0x57, 0x47, 0x39, 0xef, 0xfb, 0xfb, 0x15, 0x6d, 0x16, - 0xd5, 0xf7, 0xe4, 0x06, 0x7a, 0xa7, 0x78, 0x6f, 0xf3, 0x63, 0xdd, 0x7a, 0x31, 0x61, 0x3c, 0x9c, - 0x17, 0x17, 0xf5, 0xe4, 0x33, 0x8a, 0x4b, 0x36, 0x3e, 0x3f, 0xe0, 0xbb, 0x17, 0xa0, 0x8c, 0x46, - 0x7c, 0xb2, 0xce, 0xff, 0xd4, 0xe4, 0xa3, 0xff, 0x0a, 0x00, 0x00, 0xff, 0xff, 0xf4, 0x7b, 0x02, - 0x10, 0xe3, 0x44, 0x00, 0x00, + 0x98, 0x7c, 0xd5, 0xe4, 0xbb, 0x56, 0xc1, 0x57, 0x4d, 0x44, 0xc4, 0x28, 0x3d, 0x80, 0xf2, 0x63, + 0x7f, 0x52, 0x28, 0x1d, 0xb8, 0x7c, 0x5f, 0x64, 0x6a, 0x1a, 0x06, 0xfe, 0xe2, 0x50, 0x4d, 0x24, + 0x5d, 0x7d, 0x11, 0xf4, 0x34, 0x30, 0x54, 0x63, 0x80, 0xc1, 0x9f, 0x4a, 0xcb, 0x94, 0xae, 0x1f, + 0xf2, 0x99, 0x20, 0x52, 0x00, 0x10, 0x29, 0x32, 0x68, 0x22, 0x9d, 0x88, 0xbf, 0xf4, 0xbf, 0x59, + 0x85, 0x75, 0xf1, 0xaa, 0x98, 0xdb, 0x63, 0xe4, 0xc3, 0xb6, 0x48, 0xc9, 0x12, 0x55, 0x05, 0xa0, + 0x3f, 0x26, 0x57, 0x49, 0x51, 0x96, 0x3d, 0x17, 0xf1, 0x6a, 0x59, 0xb8, 0x4a, 0x01, 0xe2, 0x78, + 0xf5, 0x5d, 0x68, 0x49, 0x02, 0x69, 0x4f, 0xa5, 0x80, 0xd4, 0x8c, 0x2d, 0x01, 0xef, 0x46, 0xe0, + 0xd4, 0x53, 0xc4, 0x5a, 0xe6, 0x29, 0xe2, 0xfb, 0xb0, 0x39, 0xf3, 0xa6, 0x81, 0x39, 0xb5, 0x9e, + 0xd8, 0x53, 0x0e, 0x3b, 0x45, 0x68, 0xdc, 0x20, 0xe8, 0x01, 0x01, 0x29, 0xea, 0xcc, 0x50, 0x61, + 0xd0, 0xb9, 0x91, 0xa5, 0xb2, 0x9e, 0x51, 0x52, 0x85, 0xfc, 0x03, 0xe7, 0xd8, 0xbc, 0xa9, 0x6d, + 0x8a, 0x27, 0xb3, 0xaa, 0x48, 0xaa, 0x20, 0xe6, 0x50, 0x22, 0x28, 0x0e, 0x09, 0x6e, 0xef, 0x41, + 0x35, 0xd2, 0x01, 0x0d, 0x70, 0x93, 0x0e, 0x8e, 0xbf, 0x40, 0xd7, 0xba, 0xa2, 0xd5, 0x60, 0x4d, + 0x78, 0xd9, 0x12, 0x81, 0xbb, 0xfb, 0xbf, 0x40, 0x37, 0x8d, 0x7e, 0xb8, 0x8e, 0xf6, 0x1e, 0x7f, + 0xd3, 0x57, 0xfd, 0x65, 0xfa, 0xe0, 0xf9, 0xb1, 0x71, 0xbf, 0x55, 0xb9, 0x6d, 0xd2, 0xfb, 0x5d, + 0x1c, 0xc1, 0x52, 0x87, 0x01, 0xde, 0xc4, 0xfb, 0x5f, 0x23, 0x9f, 0x06, 0x54, 0x8f, 0x7a, 0xfd, + 0x07, 0x0f, 0xbf, 0x38, 0x36, 0x90, 0x15, 0xf6, 0x18, 0x76, 0x1f, 0x48, 0x3e, 0x27, 0xe6, 0xa0, + 0x3b, 0x7c, 0x88, 0x7c, 0x9a, 0x50, 0xdb, 0x3b, 0x3e, 0x3c, 0x7c, 0x74, 0xd4, 0x1f, 0x7e, 0xd3, + 0xaa, 0x68, 0xdb, 0xd0, 0x44, 0xcf, 0x6f, 0x26, 0xa0, 0xb5, 0xdb, 0xef, 0xa2, 0x03, 0x8e, 0xa2, + 0x52, 0x62, 0xd2, 0x3d, 0xfa, 0x46, 0x94, 0x17, 0x74, 0x0f, 0xe4, 0x0c, 0xfb, 0x47, 0x8f, 0x7b, + 0xc6, 0xb0, 0xb5, 0x7a, 0xfb, 0x36, 0xb4, 0xb2, 0x31, 0x27, 0xd5, 0x23, 0xf4, 0xbe, 0xc2, 0x0e, + 0xf8, 0xf7, 0x41, 0x0f, 0xe9, 0xf1, 0xef, 0x41, 0x0f, 0x69, 0x3f, 0x90, 0x97, 0x0a, 0xe9, 0x87, + 0xaa, 0x50, 0x91, 0x01, 0x0a, 0x2d, 0x79, 0x6f, 0xaf, 0x37, 0x18, 0x0a, 0xe6, 0x46, 0xef, 0x17, + 0xbd, 0x3d, 0x62, 0xfe, 0x08, 0x2e, 0x15, 0xc4, 0x11, 0x34, 0xe3, 0x78, 0xb6, 0x66, 0x77, 0x7f, + 0x1f, 0x39, 0x60, 0xc0, 0x92, 0x80, 0x8c, 0xde, 0xe1, 0xf1, 0x63, 0x1a, 0x78, 0x17, 0xb6, 0x55, + 0xe8, 0xe0, 0xa0, 0xbb, 0x47, 0xf3, 0x78, 0x1f, 0x9a, 0xa9, 0xe0, 0x81, 0xb6, 0xe7, 0xb0, 0xb7, + 0x6f, 0x1e, 0x1e, 0x13, 0xab, 0x2d, 0xa8, 0x53, 0x23, 0x22, 0x2f, 0xdd, 0x7e, 0x0f, 0x20, 0xb1, + 0x72, 0x71, 0xb1, 0x05, 0x6d, 0xc2, 0xe1, 0xe0, 0xd8, 0x90, 0x73, 0xee, 0x7d, 0xcd, 0xbf, 0x57, + 0xef, 0xfe, 0xd5, 0x9b, 0x50, 0x7d, 0x40, 0x7a, 0xd8, 0xf5, 0x1c, 0xed, 0x00, 0xea, 0xca, 0x5b, + 0xba, 0xf6, 0x46, 0xca, 0xf6, 0x66, 0x9e, 0xe8, 0x3b, 0xd7, 0x97, 0x60, 0xe5, 0x23, 0xdb, 0x8a, + 0xd6, 0x07, 0x48, 0x5e, 0xdb, 0xb5, 0x6b, 0x2a, 0x79, 0xe6, 0x61, 0xbe, 0xf3, 0x46, 0x31, 0x32, + 0x66, 0x75, 0x1f, 0x6a, 0xf1, 0x37, 0x06, 0x9a, 0x72, 0x7f, 0xc8, 0x7e, 0x8c, 0xd0, 0xb9, 0x56, + 0x88, 0x8b, 0xf9, 0xe0, 0x02, 0x95, 0xaa, 0x1e, 0x75, 0x81, 0xf9, 0x32, 0x21, 0x75, 0x81, 0x45, + 0xa5, 0x40, 0x2b, 0xda, 0x23, 0xd8, 0x4c, 0xd7, 0xf3, 0x68, 0x6f, 0xaa, 0x97, 0xb6, 0x82, 0x32, + 0xa1, 0xce, 0x5b, 0xcb, 0x09, 0xd4, 0x49, 0x2a, 0x15, 0x6c, 0xea, 0x24, 0xf3, 0xe5, 0x6e, 0xea, + 0x24, 0x0b, 0xca, 0xde, 0x90, 0x9b, 0x01, 0xcd, 0x54, 0x39, 0x8d, 0x76, 0x23, 0xe5, 0xdf, 0xf2, + 0x1c, 0xdf, 0x5c, 0x8a, 0x8f, 0x79, 0xfe, 0x01, 0x6c, 0xe7, 0xca, 0x74, 0x34, 0xfd, 0xc5, 0xe5, + 0x42, 0x9d, 0xef, 0x9d, 0x4b, 0x13, 0xf3, 0xff, 0x5d, 0x68, 0x65, 0x8b, 0x76, 0xb4, 0x9b, 0x4a, + 0xd7, 0xe2, 0x2a, 0xa0, 0x8e, 0x7e, 0x1e, 0x89, 0x7a, 0x6a, 0xe9, 0x12, 0x1e, 0xf5, 0xd4, 0x0a, + 0xeb, 0x81, 0xd4, 0x53, 0x5b, 0x52, 0xfd, 0xb3, 0xa2, 0x7d, 0x0d, 0x5b, 0x99, 0x5a, 0x1e, 0x4d, + 0x3d, 0xec, 0xc2, 0xd2, 0xa0, 0xce, 0xcd, 0x73, 0x28, 0x62, 0xce, 0x9f, 0xa3, 0xe1, 0xe5, 0xc7, + 0x76, 0xed, 0x4a, 0xea, 0xb0, 0x93, 0x07, 0xf4, 0x4e, 0x3b, 0x8f, 0x50, 0xc5, 0x49, 0x79, 0x04, + 0x57, 0xc5, 0x29, 0xff, 0x12, 0xaf, 0x8a, 0x53, 0xd1, 0xcb, 0xf9, 0x8a, 0xf6, 0x73, 0x34, 0xcd, + 0xa2, 0x76, 0x50, 0x6b, 0xa7, 0xf4, 0x43, 0xa9, 0x11, 0xec, 0x5c, 0x2d, 0xc0, 0xa8, 0x66, 0x21, + 0xa9, 0xd4, 0x53, 0xcd, 0x42, 0xae, 0xd6, 0x50, 0x35, 0x0b, 0x05, 0xc5, 0x7d, 0x2b, 0x14, 0x0d, + 0xcb, 0x3a, 0x1b, 0x5a, 0x59, 0xf6, 0x9b, 0x83, 0x4e, 0xf1, 0x37, 0x12, 0xfa, 0xca, 0x8f, 0x4a, + 0xda, 0x67, 0x71, 0x85, 0x4e, 0xf2, 0xae, 0xa3, 0x84, 0x9a, 0x71, 0x11, 0x68, 0x27, 0x53, 0xc9, + 0xc7, 0x9d, 0xd1, 0x1a, 0xc5, 0x25, 0x53, 0xaa, 0x35, 0xca, 0x16, 0x6c, 0xa9, 0xd6, 0x28, 0x5f, + 0x63, 0x25, 0x76, 0x22, 0x2e, 0xa8, 0x4a, 0xed, 0x44, 0xb6, 0xf6, 0x2a, 0xb5, 0x13, 0xf9, 0x1a, + 0xac, 0x15, 0xed, 0x21, 0xd4, 0xe2, 0x22, 0x28, 0x75, 0x4a, 0xd9, 0xd2, 0x2c, 0x75, 0x4a, 0xf9, + 0xaa, 0xa9, 0x95, 0x5b, 0x25, 0x92, 0x36, 0x51, 0x8a, 0xa4, 0x4a, 0x5b, 0xaa, 0xea, 0xa9, 0xd3, + 0xce, 0x23, 0x54, 0x4b, 0x1d, 0x57, 0x1d, 0xa9, 0x13, 0xc9, 0x16, 0x33, 0x75, 0xae, 0x15, 0xe2, + 0x54, 0x39, 0x93, 0xd5, 0x1b, 0x5a, 0x46, 0xb8, 0x93, 0xcf, 0xfe, 0x55, 0x39, 0xcb, 0x94, 0x7a, + 0xc4, 0x92, 0x9a, 0xe5, 0x90, 0xae, 0xea, 0xc8, 0x48, 0x6a, 0x86, 0x43, 0x2c, 0xa9, 0xcc, 0x24, + 0x37, 0x61, 0x95, 0xcf, 0x1b, 0xc5, 0x48, 0x95, 0x55, 0x52, 0x58, 0xa1, 0xe5, 0xe4, 0x62, 0x09, + 0xab, 0x82, 0x5a, 0x0c, 0xd6, 0x67, 0xa5, 0xba, 0x42, 0xcb, 0x4b, 0x86, 0xca, 0xec, 0xfa, 0x12, + 0xac, 0x7a, 0x5e, 0x71, 0x6d, 0x84, 0x7a, 0x5e, 0xd9, 0x12, 0x0b, 0xf5, 0xbc, 0xf2, 0xc5, 0x14, + 0xec, 0x66, 0x52, 0x75, 0x16, 0xaa, 0x9b, 0x29, 0x2a, 0xd9, 0x50, 0xdd, 0x4c, 0x71, 0x81, 0x46, + 0x6c, 0xf8, 0xf0, 0xea, 0x93, 0x31, 0x7c, 0xf1, 0xe5, 0x23, 0x6b, 0xf8, 0x92, 0xcb, 0x86, 0xd8, + 0x28, 0xa5, 0xfc, 0x42, 0xcb, 0xed, 0xab, 0x5a, 0xf8, 0xa1, 0x6e, 0x54, 0x51, 0xcd, 0xc6, 0x8a, + 0xd4, 0x0b, 0xba, 0x9c, 0xa4, 0xf5, 0x22, 0x29, 0x9d, 0xc8, 0xe8, 0x85, 0x5a, 0x1e, 0xa1, 0xe8, + 0x05, 0x71, 0xc8, 0xe9, 0x85, 0xc2, 0xe4, 0x5a, 0x21, 0x2e, 0xb3, 0x27, 0x99, 0x69, 0xa4, 0xca, + 0x49, 0x32, 0x7b, 0x92, 0xee, 0x6e, 0xf0, 0xed, 0x4d, 0x49, 0x3a, 0xdf, 0x48, 0x11, 0xe7, 0x8a, + 0x0d, 0xd4, 0x63, 0x2a, 0xac, 0xce, 0x10, 0x3c, 0x53, 0x55, 0x13, 0x2a, 0xcf, 0xa2, 0x72, 0x0c, + 0x95, 0x67, 0x71, 0xb9, 0x05, 0x47, 0x00, 0xd9, 0xda, 0x08, 0x35, 0x02, 0x58, 0x52, 0x8c, 0xa1, + 0x46, 0x00, 0x4b, 0x4b, 0x2b, 0x38, 0x7c, 0xc9, 0x15, 0x46, 0xa8, 0xe1, 0xcb, 0xb2, 0xca, 0x0b, + 0x35, 0x7c, 0x59, 0x5e, 0x59, 0xb1, 0xa2, 0x1d, 0x43, 0x43, 0x2d, 0xa2, 0xd0, 0xd2, 0x31, 0x5a, + 0xb6, 0x5e, 0xa0, 0x73, 0x63, 0x19, 0x5a, 0x65, 0xa8, 0x96, 0x3f, 0x68, 0xe9, 0xc8, 0xf4, 0x3c, + 0x86, 0x85, 0x55, 0x13, 0x22, 0x58, 0x49, 0x17, 0x36, 0x68, 0xb9, 0xc8, 0x34, 0xc7, 0xf6, 0xe6, + 0x39, 0x14, 0xea, 0xc1, 0x65, 0x2b, 0x19, 0xd4, 0x83, 0x5b, 0x52, 0x33, 0xd1, 0xd1, 0xcf, 0x23, + 0xc9, 0x5c, 0x03, 0x64, 0x06, 0x29, 0x7d, 0x0d, 0x48, 0x7d, 0x97, 0x9f, 0xb9, 0x06, 0x64, 0x3e, + 0x82, 0x67, 0x3e, 0xf1, 0x77, 0xdf, 0x2a, 0x9f, 0x6c, 0x41, 0x84, 0xca, 0x27, 0x5f, 0xb2, 0xc0, + 0xe7, 0xa2, 0x7e, 0xb1, 0xad, 0x9e, 0x4b, 0x41, 0x2d, 0x83, 0x7a, 0x2e, 0x85, 0x65, 0x06, 0x32, + 0x58, 0x57, 0x3e, 0xc1, 0x4e, 0x07, 0xeb, 0xf9, 0x02, 0x84, 0x74, 0xb0, 0x5e, 0xf4, 0xc5, 0xff, + 0x8a, 0x36, 0xe6, 0x4a, 0x9f, 0x5c, 0x8a, 0xec, 0xfb, 0x05, 0x5b, 0x94, 0xfb, 0x9e, 0xbc, 0xf3, + 0xf6, 0x0b, 0xa8, 0xd4, 0x51, 0x0a, 0x3e, 0xa5, 0x57, 0x47, 0x59, 0xfe, 0x0d, 0xbf, 0x3a, 0xca, + 0x79, 0xdf, 0xe3, 0xaf, 0x68, 0xb3, 0xa8, 0xde, 0x27, 0x37, 0xd0, 0x3b, 0xc5, 0x7b, 0x9b, 0x1f, + 0xeb, 0xd6, 0x8b, 0x09, 0xe3, 0xe1, 0xbc, 0xb8, 0xc8, 0x27, 0x9f, 0x61, 0x5c, 0xb2, 0xf1, 0xf9, + 0x01, 0xdf, 0xbd, 0x00, 0x65, 0x34, 0xe2, 0x93, 0x75, 0xfe, 0x27, 0x27, 0x1f, 0xfd, 0x57, 0x00, + 0x00, 0x00, 0xff, 0xff, 0x86, 0x70, 0x9b, 0x00, 0xf3, 0x44, 0x00, 0x00, } diff --git a/api/gobgp.proto b/api/gobgp.proto index 8c278c7a..f86dc3b5 100644 --- a/api/gobgp.proto +++ b/api/gobgp.proto @@ -819,6 +819,7 @@ message Vrf { bytes rd = 2; repeated bytes import_rt = 3; repeated bytes export_rt = 4; + uint32 id = 5; } message Global { diff --git a/api/grpc_server.go b/api/grpc_server.go index 388131c2..3b76c58e 100644 --- a/api/grpc_server.go +++ b/api/grpc_server.go @@ -751,7 +751,7 @@ func (s *Server) AddVrf(ctx context.Context, arg *AddVrfRequest) (r *AddVrfRespo if err != nil { return &AddVrfResponse{}, err } - return &AddVrfResponse{}, s.bgpServer.AddVrf(arg.Vrf.Name, rd, im, ex) + return &AddVrfResponse{}, s.bgpServer.AddVrf(arg.Vrf.Name, arg.Vrf.Id, rd, im, ex) } func (s *Server) DeleteVrf(ctx context.Context, arg *DeleteVrfRequest) (*DeleteVrfResponse, error) { diff --git a/server/server.go b/server/server.go index 65b23ce8..37a4b6a9 100644 --- a/server/server.go +++ b/server/server.go @@ -1190,7 +1190,7 @@ func (s *BgpServer) GetVrf() (l []*table.Vrf) { return l } -func (s *BgpServer) AddVrf(name string, rd bgp.RouteDistinguisherInterface, im, ex []bgp.ExtendedCommunityInterface) (err error) { +func (s *BgpServer) AddVrf(name string, id uint32, rd bgp.RouteDistinguisherInterface, im, ex []bgp.ExtendedCommunityInterface) (err error) { ch := make(chan struct{}) defer func() { <-ch }() @@ -1205,7 +1205,7 @@ func (s *BgpServer) AddVrf(name string, rd bgp.RouteDistinguisherInterface, im, AS: s.bgpConfig.Global.Config.As, LocalID: net.ParseIP(s.bgpConfig.Global.Config.RouterId).To4(), } - if pathList, e := s.globalRib.AddVrf(name, rd, im, ex, pi); e != nil { + if pathList, e := s.globalRib.AddVrf(name, id, rd, im, ex, pi); e != nil { err = e } else if len(pathList) > 0 { s.propagateUpdate(nil, pathList) diff --git a/table/table_manager.go b/table/table_manager.go index f6bebbf7..f93c3a54 100644 --- a/table/table_manager.go +++ b/table/table_manager.go @@ -164,7 +164,7 @@ func (manager *TableManager) getNextLabel() (uint32, error) { return label, nil } -func (manager *TableManager) AddVrf(name string, rd bgp.RouteDistinguisherInterface, importRt, exportRt []bgp.ExtendedCommunityInterface, info *PeerInfo) ([]*Path, error) { +func (manager *TableManager) AddVrf(name string, id uint32, rd bgp.RouteDistinguisherInterface, importRt, exportRt []bgp.ExtendedCommunityInterface, info *PeerInfo) ([]*Path, error) { if _, ok := manager.Vrfs[name]; ok { return nil, fmt.Errorf("vrf %s already exists", name) } @@ -177,6 +177,7 @@ func (manager *TableManager) AddVrf(name string, rd bgp.RouteDistinguisherInterf }).Debugf("add vrf") manager.Vrfs[name] = &Vrf{ Name: name, + Id: id, Rd: rd, ImportRt: importRt, ExportRt: exportRt, diff --git a/table/vrf.go b/table/vrf.go index 18a5af87..83b9e353 100644 --- a/table/vrf.go +++ b/table/vrf.go @@ -22,6 +22,7 @@ import ( type Vrf struct { Name string + Id uint32 Rd bgp.RouteDistinguisherInterface ImportRt []bgp.ExtendedCommunityInterface ExportRt []bgp.ExtendedCommunityInterface @@ -62,6 +63,7 @@ func (v *Vrf) Clone() *Vrf { } return &Vrf{ Name: v.Name, + Id: v.Id, Rd: v.Rd, ImportRt: f(v.ImportRt), ExportRt: f(v.ExportRt), |