diff options
| author | ISHIDA Wataru <ishida.wataru@lab.ntt.co.jp> | 2016-05-24 05:47:52 +0000 |
|---|---|---|
| committer | FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp> | 2016-06-06 12:43:20 +0900 |
| commit | aca6fd6ad4409b4cb63682bff3c79fca8ca2800d (patch) | |
| tree | eb91718c87ddcdaa0d2133f3aaccfee6dbe7f7a8 /server/grpc_server.go | |
| parent | 10746e5f4b303aba553c2bb759afe3a8d4ffe3aa (diff) | |
server: refactoring for monitorbestchanged api. use watcher infra
Signed-off-by: ISHIDA Wataru <ishida.wataru@lab.ntt.co.jp>
Diffstat (limited to 'server/grpc_server.go')
| -rw-r--r-- | server/grpc_server.go | 24 |
1 files changed, 3 insertions, 21 deletions
diff --git a/server/grpc_server.go b/server/grpc_server.go index cbe642a2..5963b780 100644 --- a/server/grpc_server.go +++ b/server/grpc_server.go @@ -51,8 +51,7 @@ const ( REQ_GRPC_DELETE_NEIGHBOR REQ_UPDATE_NEIGHBOR REQ_GLOBAL_RIB - REQ_MONITOR_GLOBAL_BEST_CHANGED - REQ_MONITOR_INCOMING + REQ_MONITOR_RIB REQ_MONITOR_NEIGHBOR_PEER_STATE REQ_ENABLE_MRT REQ_DISABLE_MRT @@ -189,31 +188,14 @@ func (s *Server) GetRib(ctx context.Context, arg *api.GetRibRequest) (*api.GetRi return d.(*api.GetRibResponse), nil } -func (s *Server) MonitorBestChanged(arg *api.Arguments, stream api.GobgpApi_MonitorBestChangedServer) error { - var reqType int - switch arg.Resource { - case api.Resource_GLOBAL: - reqType = REQ_MONITOR_GLOBAL_BEST_CHANGED - default: - return fmt.Errorf("unsupported resource type: %v", arg.Resource) - } - - req := NewGrpcRequest(reqType, "", bgp.RouteFamily(arg.Family), nil) - s.bgpServerCh <- req - - return handleMultipleResponses(req, func(res *GrpcResponse) error { - return stream.Send(res.Data.(*api.Destination)) - }) -} - func (s *Server) MonitorRib(arg *api.Table, stream api.GobgpApi_MonitorRibServer) error { switch arg.Type { - case api.Resource_ADJ_IN: + case api.Resource_ADJ_IN, api.Resource_GLOBAL: default: return fmt.Errorf("unsupported resource type: %v", arg.Type) } - req := NewGrpcRequest(REQ_MONITOR_INCOMING, arg.Name, bgp.RouteFamily(arg.Family), arg) + req := NewGrpcRequest(REQ_MONITOR_RIB, arg.Name, bgp.RouteFamily(arg.Family), arg) s.bgpServerCh <- req return handleMultipleResponses(req, func(res *GrpcResponse) error { return stream.Send(res.Data.(*api.Destination)) |