diff options
| author | Hitoshi Irino <irino@sfc.wide.ad.jp> | 2020-07-26 22:37:04 +0900 |
|---|---|---|
| committer | Hitoshi Irino <irino@sfc.wide.ad.jp> | 2020-07-26 22:37:04 +0900 |
| commit | efeb8c51fbab58d378c7c5a8cb29099e9ae89449 (patch) | |
| tree | 6cd2002518341f81ef149285921b2540e6ade00e /internal/pkg/config | |
| parent | 6178fc524f320a7fcd72f634659bb00eac6477a6 (diff) | |
zebra: refactoring and fix bug and add processing messageBackupNexthop (added in frr7.4)
- Move function for checking softwareName from internal/pkg/config/default.go to internal/pkg/zebra/zapi.go.
- Delete support for frr7.1.
- Fix bug by inverse processing MessageMTU and messageTag, and add messageTableId in decodeFromBytes and serialize of IPRouteBody.
- Add processing messageBackupNexthop (which is added in frr7.4) in decodeFromBytes and serialize of IPRouteBody.
- Update document.
Diffstat (limited to 'internal/pkg/config')
| -rw-r--r-- | internal/pkg/config/default.go | 11 |
1 files changed, 1 insertions, 10 deletions
diff --git a/internal/pkg/config/default.go b/internal/pkg/config/default.go index 7727bf78..3d723cd9 100644 --- a/internal/pkg/config/default.go +++ b/internal/pkg/config/default.go @@ -421,16 +421,7 @@ func setDefaultConfigValuesWithViper(v *viper.Viper, b *BgpConfigSet) error { b.Zebra.Config.NexthopTriggerDelay = 5 } - //SoftwareName for Zebra - allowableZebraSoftwareName := []string{"", "quagga", "frr3", "frr4", "frr5", "frr6", "frr7", "frr7.1", "frr7.2", "frr7.3", "cumulus"} - isAllowable := false - for _, allowable := range allowableZebraSoftwareName { - if b.Zebra.Config.SoftwareName == allowable { - isAllowable = true - break - } - } - if !isAllowable { + if !zebra.IsAllowableSoftwareName(b.Zebra.Config.Version, b.Zebra.Config.SoftwareName) { b.Zebra.Config.SoftwareName = "" } |