diff options
| author | FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp> | 2016-11-02 00:03:41 -0700 |
|---|---|---|
| committer | FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp> | 2016-11-03 02:49:59 -0700 |
| commit | be9918a163a20a7a885dc9206a733d983ee76b3a (patch) | |
| tree | c73975d94321a1a02429fb6ad0d3e0373c3f4813 /config | |
| parent | c7653aa9d4276098a7a6b5ade5ffce5bf5d089e8 (diff) | |
remove label allocation completely
Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
Diffstat (limited to 'config')
| -rw-r--r-- | config/bgp_configs.go | 26 | ||||
| -rw-r--r-- | config/default.go | 11 |
2 files changed, 0 insertions, 37 deletions
diff --git a/config/bgp_configs.go b/config/bgp_configs.go index f4c3b3fd..76b7e379 100644 --- a/config/bgp_configs.go +++ b/config/bgp_configs.go @@ -2780,27 +2780,6 @@ func (lhs *Neighbor) Equal(rhs *Neighbor) bool { return true } -//struct for container gobgp:mpls-label-range -type MplsLabelRange struct { - // original -> gobgp:min-label - MinLabel uint32 `mapstructure:"min-label"` - // original -> gobgp:max-label - MaxLabel uint32 `mapstructure:"max-label"` -} - -func (lhs *MplsLabelRange) Equal(rhs *MplsLabelRange) bool { - if lhs == nil || rhs == nil { - return false - } - if lhs.MinLabel != rhs.MinLabel { - return false - } - if lhs.MaxLabel != rhs.MaxLabel { - return false - } - return true -} - //struct for container gobgp:state type LongLivedGracefulRestartState struct { // original -> gobgp:enabled @@ -4289,8 +4268,6 @@ type Global struct { AfiSafis []AfiSafi `mapstructure:"afi-safis"` // original -> rpol:apply-policy ApplyPolicy ApplyPolicy `mapstructure:"apply-policy"` - // original -> gobgp:mpls-label-range - MplsLabelRange MplsLabelRange `mapstructure:"mpls-label-range"` } func (lhs *Global) Equal(rhs *Global) bool { @@ -4334,9 +4311,6 @@ func (lhs *Global) Equal(rhs *Global) bool { if !lhs.ApplyPolicy.Equal(&(rhs.ApplyPolicy)) { return false } - if !lhs.MplsLabelRange.Equal(&(rhs.MplsLabelRange)) { - return false - } return true } diff --git a/config/default.go b/config/default.go index e9b972cf..05fe2db8 100644 --- a/config/default.go +++ b/config/default.go @@ -13,8 +13,6 @@ const ( DEFAULT_HOLDTIME = 90 DEFAULT_IDLE_HOLDTIME_AFTER_RESET = 30 DEFAULT_CONNECT_RETRY = 120 - DEFAULT_MPLS_LABEL_MIN = 16000 - DEFAULT_MPLS_LABEL_MAX = 1048575 ) func defaultAfiSafi(typ AfiSafiType, enable bool) AfiSafi { @@ -211,16 +209,7 @@ func SetDefaultGlobalConfigValues(g *Global) error { if len(g.Config.LocalAddressList) == 0 { g.Config.LocalAddressList = []string{"0.0.0.0", "::"} } - - if g.MplsLabelRange.MinLabel == 0 { - g.MplsLabelRange.MinLabel = DEFAULT_MPLS_LABEL_MIN - } - - if g.MplsLabelRange.MaxLabel == 0 { - g.MplsLabelRange.MaxLabel = DEFAULT_MPLS_LABEL_MAX - } return nil - } func SetDefaultConfigValues(b *BgpConfigSet) error { |