From 79a461c147ed58150a3d6653fb3440fe24018c8a Mon Sep 17 00:00:00 2001 From: FUJITA Tomonori Date: Fri, 23 Nov 2018 20:51:04 +0900 Subject: api: move remote_cap and local_cap to PeerState from PeerConf Both should be in PeerState like OpenConfig. Also remove unused supported_capabilities. Signed-off-by: FUJITA Tomonori --- internal/pkg/config/util.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'internal/pkg') diff --git a/internal/pkg/config/util.go b/internal/pkg/config/util.go index 1a65e2ed..a8a49ca9 100644 --- a/internal/pkg/config/util.go +++ b/internal/pkg/config/util.go @@ -460,8 +460,6 @@ func NewPeerFromConfigStruct(pconf *Neighbor) *api.Peer { RouteFlapDamping: pconf.Config.RouteFlapDamping, Description: pconf.Config.Description, PeerGroup: pconf.Config.PeerGroup, - RemoteCap: remoteCap, - LocalCap: localCap, NeighborInterface: pconf.Config.NeighborInterface, Vrf: pconf.Config.Vrf, AllowOwnAs: uint32(pconf.AsPathOptions.Config.AllowOwnAs), @@ -499,6 +497,8 @@ func NewPeerFromConfigStruct(pconf *Neighbor) *api.Peer { PeerType: uint32(s.PeerType.ToInt()), NeighborAddress: pconf.State.NeighborAddress, Queues: &api.Queues{}, + RemoteCap: remoteCap, + LocalCap: localCap, }, EbgpMultihop: &api.EbgpMultihop{ Enabled: pconf.EbgpMultihop.Config.Enabled, -- cgit v1.2.3