summaryrefslogtreecommitdiffhomepage
path: root/internal/pkg/config/util.go
diff options
context:
space:
mode:
authorFUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>2018-11-23 20:51:04 +0900
committerFUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>2018-11-23 21:01:03 +0900
commit79a461c147ed58150a3d6653fb3440fe24018c8a (patch)
treeb91bf21d40aff0d03b09d93ef8e89596939164e7 /internal/pkg/config/util.go
parentdbd0c21d2e97877de7a2d24ab975984c33371442 (diff)
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 <fujita.tomonori@lab.ntt.co.jp>
Diffstat (limited to 'internal/pkg/config/util.go')
-rw-r--r--internal/pkg/config/util.go4
1 files changed, 2 insertions, 2 deletions
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,