Zapi version 5

VERSION

@@ -1 +1 @@
-1.31
+1.31.1

api/gobgp.proto

@@ -31,6 +31,7 @@ service GobgpApi {
   rpc GetServer(GetServerRequest) returns (GetServerResponse) {}
   rpc AddNeighbor(AddNeighborRequest) returns (AddNeighborResponse) {}
   rpc DeleteNeighbor(DeleteNeighborRequest) returns (DeleteNeighborResponse) {}
+  rpc UpdateNeighbor(UpdateNeighborRequest) returns (UpdateNeighborResponse) {}
   rpc GetNeighbor(GetNeighborRequest) returns (GetNeighborResponse) {}
   rpc ResetNeighbor(ResetNeighborRequest) returns (ResetNeighborResponse) {}
   rpc SoftResetNeighbor(SoftResetNeighborRequest) returns (SoftResetNeighborResponse) {}
@@ -157,6 +158,20 @@ message DeleteNeighborRequest {
 message DeleteNeighborResponse {
 }
 
+message UpdateNeighborRequest {
+  Peer peer = 1;
+  // Calls SoftResetIn after updating the neighbor configuration if needed.
+  bool do_soft_reset_in = 2;
+}
+
+message UpdateNeighborResponse {
+  // Indicates whether calling SoftResetIn is required due to this update. If
+  // "true" is set, the client should call SoftResetIn manually. If
+  // "do_soft_reset_in = true" is set in the request, always returned with
+  // "false".
+  bool needs_soft_reset_in = 1;
+}
+
 message ResetNeighborRequest {
   string address = 1;
   string communication = 2;

api/grpc_server.go

@@ -1343,6 +1343,21 @@ func (s *Server) DeleteNeighbor(ctx context.Context, arg *DeleteNeighborRequest)
 	}})
 }
 
+func (s *Server) UpdateNeighbor(ctx context.Context, arg *UpdateNeighborRequest) (*UpdateNeighborResponse, error) {
+	c, err := NewNeighborFromAPIStruct(arg.Peer)
+	if err != nil {
+		return nil, err
+	}
+	needsSoftResetIn, err := s.bgpServer.UpdateNeighbor(c)
+	if err != nil {
+		return nil, err
+	}
+	if arg.DoSoftResetIn && needsSoftResetIn {
+		return &UpdateNeighborResponse{NeedsSoftResetIn: false}, s.bgpServer.SoftResetIn("", bgp.RouteFamily(0))
+	}
+	return &UpdateNeighborResponse{NeedsSoftResetIn: needsSoftResetIn}, nil
+}
+
 func NewPrefixFromApiStruct(a *Prefix) (*table.Prefix, error) {
 	_, prefix, err := net.ParseCIDR(a.IpPrefix)
 	if err != nil {

client/client.go

@@ -198,8 +198,11 @@ func (cli *Client) DeleteNeighbor(c *config.Neighbor) error {
 	return err
 }
 
-//func (cli *Client) UpdateNeighbor(c *config.Neighbor) (bool, error) {
-//}
+func (cli *Client) UpdateNeighbor(c *config.Neighbor, doSoftResetIn bool) (bool, error) {
+	peer := api.NewPeerFromConfigStruct(c)
+	response, err := cli.cli.UpdateNeighbor(context.Background(), &api.UpdateNeighborRequest{Peer: peer, DoSoftResetIn: doSoftResetIn})
+	return response.NeedsSoftResetIn, err
+}
 
 func (cli *Client) ShutdownNeighbor(addr, communication string) error {
 	_, err := cli.cli.ShutdownNeighbor(context.Background(), &api.ShutdownNeighborRequest{Address: addr, Communication: communication})

config/bgp_configs.go

@@ -1116,13 +1116,18 @@ type ZebraState struct {
 	// original -> gobgp:redistribute-route-type
 	RedistributeRouteTypeList []InstallProtocolType `mapstructure:"redistribute-route-type-list" json:"redistribute-route-type-list,omitempty"`
 	// original -> gobgp:version
-	// Configure version of zebra protocol.  Default is 2. Supported up to 3.
+	// Configure version of zebra protocol. Default is 2.
+	// Supported version are 2 or 3 for Quagga and 4 for FRRouting.
 	Version uint8 `mapstructure:"version" json:"version,omitempty"`
 	// original -> gobgp:nexthop-trigger-enable
 	// gobgp:nexthop-trigger-enable's original type is boolean.
 	NexthopTriggerEnable bool `mapstructure:"nexthop-trigger-enable" json:"nexthop-trigger-enable,omitempty"`
 	// original -> gobgp:nexthop-trigger-delay
 	NexthopTriggerDelay uint8 `mapstructure:"nexthop-trigger-delay" json:"nexthop-trigger-delay,omitempty"`
+	// original -> gobgp:mpls-label-range-size
+	// Configure MPLS label range size which will be requested to
+	// FRR/Zebra.
+	MplsLabelRangeSize uint32 `mapstructure:"mpls-label-range-size" json:"mpls-label-range-size,omitempty"`
 }
 
 // struct for container gobgp:config.
@@ -1137,13 +1142,18 @@ type ZebraConfig struct {
 	// original -> gobgp:redistribute-route-type
 	RedistributeRouteTypeList []InstallProtocolType `mapstructure:"redistribute-route-type-list" json:"redistribute-route-type-list,omitempty"`
 	// original -> gobgp:version
-	// Configure version of zebra protocol.  Default is 2. Supported up to 3.
+	// Configure version of zebra protocol. Default is 2.
+	// Supported version are 2 or 3 for Quagga and 4 for FRRouting.
 	Version uint8 `mapstructure:"version" json:"version,omitempty"`
 	// original -> gobgp:nexthop-trigger-enable
 	// gobgp:nexthop-trigger-enable's original type is boolean.
 	NexthopTriggerEnable bool `mapstructure:"nexthop-trigger-enable" json:"nexthop-trigger-enable,omitempty"`
 	// original -> gobgp:nexthop-trigger-delay
 	NexthopTriggerDelay uint8 `mapstructure:"nexthop-trigger-delay" json:"nexthop-trigger-delay,omitempty"`
+	// original -> gobgp:mpls-label-range-size
+	// Configure MPLS label range size which will be requested to
+	// FRR/Zebra.
+	MplsLabelRangeSize uint32 `mapstructure:"mpls-label-range-size" json:"mpls-label-range-size,omitempty"`
 }
 
 func (lhs *ZebraConfig) Equal(rhs *ZebraConfig) bool {
@@ -1173,6 +1183,9 @@ func (lhs *ZebraConfig) Equal(rhs *ZebraConfig) bool {
 	if lhs.NexthopTriggerDelay != rhs.NexthopTriggerDelay {
 		return false
 	}
+	if lhs.MplsLabelRangeSize != rhs.MplsLabelRangeSize {
+		return false
+	}
 	return true
 }
 

config/default.go

@@ -314,8 +314,8 @@ func setDefaultConfigValuesWithViper(v *viper.Viper, b *BgpConfigSet) error {
 	}
 	if b.Zebra.Config.Version < 2 {
 		b.Zebra.Config.Version = 2
-	} else if b.Zebra.Config.Version > 4 {
-		b.Zebra.Config.Version = 4
+	} else if b.Zebra.Config.Version > 5 {
+		b.Zebra.Config.Version = 5
 	}
 	if !v.IsSet("zebra.config.nexthop-trigger-enable") && !b.Zebra.Config.NexthopTriggerEnable && b.Zebra.Config.Version > 2 {
 		b.Zebra.Config.NexthopTriggerEnable = true

gobgp/cmd/neighbor.go

@@ -987,53 +987,82 @@ func modNeighbor(cmdType string, args []string) error {
 		params["replace-peer-as"] = PARAM_FLAG
 		usage += " as <VALUE> [ family <address-families-list> | vrf <vrf-name> | route-reflector-client [<cluster-id>] | route-server-client | allow-own-as <num> | remove-private-as (all|replace) | replace-peer-as ]"
 	}
-
 	m, err := extractReserved(args, params)
 	if err != nil || (len(m[""]) != 1 && len(m["interface"]) != 1) {
 		return fmt.Errorf("%s", usage)
 	}
+
 	unnumbered := len(m["interface"]) > 0
 	if !unnumbered {
 		if _, err := net.ResolveIPAddr("ip", m[""][0]); err != nil {
 			return err
 		}
 	}
 
-	getConf := func(asn uint32) (*config.Neighbor, error) {
-		peer := &config.Neighbor{
-			Config: config.NeighborConfig{
-				PeerAs: asn,
-			},
-		}
+	getNeighborAddress := func() (string, error) {
 		if unnumbered {
-			peer.Config.NeighborInterface = m["interface"][0]
-			addr, err := config.GetIPv6LinkLocalNeighborAddress(peer.Config.NeighborInterface)
+			return config.GetIPv6LinkLocalNeighborAddress(m["interface"][0])
+		}
+		return m[""][0], nil
+	}
+
+	getNeighborConfig := func() (*config.Neighbor, error) {
+		var peer *config.Neighbor
+		switch cmdType {
+		case CMD_ADD, CMD_DEL:
+			peer = &config.Neighbor{}
+			addr, err := getNeighborAddress()
 			if err != nil {
 				return nil, err
 			}
+			if unnumbered {
+				peer.Config.NeighborInterface = m["interface"][0]
+			} else {
+				peer.Config.NeighborAddress = addr
+			}
 			peer.State.NeighborAddress = addr
-		} else {
-			peer.Config.NeighborAddress = m[""][0]
-			peer.State.NeighborAddress = m[""][0]
+		case CMD_UPDATE:
+			addr, err := getNeighborAddress()
+			if err != nil {
+				return nil, err
+			}
+			peer, err = client.GetNeighbor(addr)
+			if err != nil {
+				return nil, err
+			}
+		default:
+			return nil, fmt.Errorf("invalid command: %s", cmdType)
+		}
+		return peer, nil
+	}
+
+	updateNeighborConfig := func(peer *config.Neighbor) error {
+		if len(m["as"]) > 0 {
+			as, err := strconv.ParseUint(m["as"][0], 10, 32)
+			if err != nil {
+				return err
+			}
+			peer.Config.PeerAs = uint32(as)
 		}
 		if len(m["family"]) == 1 {
+			peer.AfiSafis = make([]config.AfiSafi, 0) // for the case of CMD_UPDATE
 			for _, family := range strings.Split(m["family"][0], ",") {
 				afiSafiName := config.AfiSafiType(family)
 				if afiSafiName.ToInt() == -1 {
-					return nil, fmt.Errorf("invalid family value: %s", family)
+					return fmt.Errorf("invalid family value: %s", family)
 				}
 				peer.AfiSafis = append(peer.AfiSafis, config.AfiSafi{Config: config.AfiSafiConfig{AfiSafiName: afiSafiName}})
 			}
 		}
 		if len(m["vrf"]) == 1 {
 			peer.Config.Vrf = m["vrf"][0]
 		}
-		if rr, ok := m["route-reflector-client"]; ok {
+		if option, ok := m["route-reflector-client"]; ok {
 			peer.RouteReflector.Config = config.RouteReflectorConfig{
 				RouteReflectorClient: true,
 			}
-			if len(rr) == 1 {
-				peer.RouteReflector.Config.RouteReflectorClusterId = config.RrClusterIdType(rr[0])
+			if len(option) == 1 {
+				peer.RouteReflector.Config.RouteReflectorClusterId = config.RrClusterIdType(option[0])
 			}
 		}
 		if _, ok := m["route-server-client"]; ok {
@@ -1044,7 +1073,7 @@ func modNeighbor(cmdType string, args []string) error {
 		if option, ok := m["allow-own-as"]; ok {
 			as, err := strconv.ParseUint(option[0], 10, 8)
 			if err != nil {
-				return nil, err
+				return err
 			}
 			peer.AsPathOptions.Config.AllowOwnAs = uint8(as)
 		}
@@ -1055,36 +1084,34 @@ func modNeighbor(cmdType string, args []string) error {
 			case "replace":
 				peer.Config.RemovePrivateAs = config.REMOVE_PRIVATE_AS_OPTION_REPLACE
 			default:
-				return nil, fmt.Errorf("invalid remove-private-as value: all or replace")
+				return fmt.Errorf("invalid remove-private-as value: all or replace")
 			}
 		}
 		if _, ok := m["replace-peer-as"]; ok {
 			peer.AsPathOptions.Config.ReplacePeerAs = true
 		}
-		return peer, nil
-	}
-
-	var as uint64
-	if len(m["as"]) > 0 {
-		var err error
-		if as, err = strconv.ParseUint(m["as"][0], 10, 32); err != nil {
-			return err
-		}
+		return nil
 	}
 
-	n, err := getConf(uint32(as))
+	n, err := getNeighborConfig()
 	if err != nil {
 		return err
 	}
 
 	switch cmdType {
 	case CMD_ADD:
-		if len(m[""]) > 0 && len(m["as"]) != 1 {
-			return fmt.Errorf("%s", usage)
+		if err := updateNeighborConfig(n); err != nil {
+			return err
 		}
 		return client.AddNeighbor(n)
 	case CMD_DEL:
 		return client.DeleteNeighbor(n)
+	case CMD_UPDATE:
+		if err := updateNeighborConfig(n); err != nil {
+			return err
+		}
+		_, err := client.UpdateNeighbor(n, true)
+		return err
 	}
 	return nil
 }
@@ -1220,7 +1247,7 @@ func NewNeighborCmd() *cobra.Command {
 		},
 	}
 
-	for _, v := range []string{CMD_ADD, CMD_DEL} {
+	for _, v := range []string{CMD_ADD, CMD_DEL, CMD_UPDATE} {
 		cmd := &cobra.Command{
 			Use: v,
 			Run: func(c *cobra.Command, args []string) {

server/peer.go

@@ -363,24 +363,50 @@ func (peer *Peer) filterpath(path, old *table.Path) *table.Path {
 		} else {
 			return nil
 		}
+		log.WithFields(log.Fields{
+			"Topic": "Path",
+			"Path":  path,
+			"Peer":  peer.ID(),
+			"Vrf":   peer.fsm.pConf.Config.Vrf,
+		}).Debug("Peer.filterpath(): localized path for VRF")
 	}
 
 	// replace-peer-as handling
 	if path != nil && !path.IsWithdraw && peer.fsm.pConf.AsPathOptions.State.ReplacePeerAs {
 		path = path.ReplaceAS(peer.fsm.pConf.Config.LocalAs, peer.fsm.pConf.Config.PeerAs)
+		log.WithFields(log.Fields{
+			"Topic": "Path",
+			"Path":  path,
+			"Peer":  peer.ID(),
+		}).Debug("Peer.filterpath(): after calling ReplaceAS()")
 	}
 
 	if path = filterpath(peer, path, old); path == nil {
 		return nil
 	}
+	log.WithFields(log.Fields{
+		"Topic": "Path",
+		"Path":  path,
+		"Peer":  peer.ID(),
+	}).Debug("Peer.filterpath(): after calling filterpath()")
 
 	path = table.UpdatePathAttrs(peer.fsm.gConf, peer.fsm.pConf, peer.fsm.peerInfo, path)
+	log.WithFields(log.Fields{
+		"Topic": "Path",
+		"Path":  path,
+		"Peer":  peer.ID(),
+	}).Debug("Peer.filterpath(): after calling UpdatePathAttrs()")
 
 	options := &table.PolicyOptions{
 		Info: peer.fsm.peerInfo,
 	}
 	path = peer.policy.ApplyPolicy(peer.TableID(), table.POLICY_DIRECTION_EXPORT, path, options)
-	// When 'path' is filtered (path == nil), check 'old' has been sent to this peer.
+	log.WithFields(log.Fields{
+		"Topic": "Path",
+		"Path":  path,
+		"Peer":  peer.ID(),
+	}).Debug("Peer.filterpath(): after calling ApplyPolicy()")
+	// When 'path' is filetered (path == nil), check 'old' has been sent to this peer.
 	// If it has, send withdrawal to the peer.
 	if path == nil && old != nil {
 		o := peer.policy.ApplyPolicy(peer.TableID(), table.POLICY_DIRECTION_EXPORT, old, options)
@@ -409,6 +435,11 @@ func (peer *Peer) filterpath(path, old *table.Path) *table.Path {
 	if path != nil && !peer.isIBGPPeer() && !peer.isRouteServerClient() {
 		path.RemoveLocalPref()
 	}
+	log.WithFields(log.Fields{
+		"Topic": "Path",
+		"Path":  path,
+		"Peer":  peer.ID(),
+	}).Debugf("Peer.filterpath(): exit after removing local-pref")
 	return path
 }