diff options
| author | ISHIDA Wataru <ishida.wataru@lab.ntt.co.jp> | 2016-08-16 14:26:17 +0000 |
|---|---|---|
| committer | FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp> | 2016-08-17 23:32:05 +0900 |
| commit | 41ef4e2d77c3e3cd8c527ad0ad0a27e9db012d4c (patch) | |
| tree | 13740584dbe62ee445d5fa116036ca4856ba6a26 | |
| parent | 4a5828daf195c998b6844fbdf9bbc101f4734358 (diff) | |
Revert "server: add missing default policy setting in (*BgpServer).Start()"
This reverts commit 7bf91ea437181b85ecc3a1473adc3fbc0da80cbe.
This commit causes misleading error message "failed to get policy info"
when global policy is configured at startup.
| -rw-r--r-- | server/server.go | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/server/server.go b/server/server.go index 280194d6..aaae63bc 100644 --- a/server/server.go +++ b/server/server.go @@ -1185,7 +1185,8 @@ func (s *BgpServer) Start(c *config.Global) (err error) { rfs, _ := config.AfiSafis(c.AfiSafis).ToRfList() s.globalRib = table.NewTableManager(rfs, c.MplsLabelRange.MinLabel, c.MplsLabelRange.MaxLabel) - if err = s.policy.Reset(&config.RoutingPolicy{}, map[string]config.ApplyPolicy{table.GLOBAL_RIB_NAME: c.ApplyPolicy}); err != nil { + + if err = s.policy.Reset(&config.RoutingPolicy{}, map[string]config.ApplyPolicy{}); err != nil { return } s.bgpConfig.Global = *c |