change cli flag of asn

Author: micho7

cmd/db-controller/cli.go

@@ -34,17 +34,17 @@ var (
 	globalInterfaceNameFlag string
 	// chainNameForDBAclFlag is a cli-flag that specifies the nftables chain name for DB access control list.
 	chainNameForDBAclFlag string
-	// bgpMyAsNumberFlag is a cli-flag that specifies the my as number
-	bgpMyAsNumberFlag int
+	// bgpLocalAsnFlag is a cli-flag that specifies the my as number
+	bgpLocalAsnFlag int
 	// bgpServingPortFlag is a cli-flag that specifies the port of bgp
 	bgpServingPortFlag int
 	// bgpKeepaliveIntervalSecFlag is a cli-flag that specifies the interval seconds of bgp keepalive
 	bgpKeepaliveIntervalSecFlag int
 	// bgpPeerXAddrFlag and bgpPeerXAsn is a cli-flag that specifies neighbor address and asn of bgp peer.
 	bgpPeer1AddrFlag string
-	bgpPeer1AsnFlag  string
+	bgpPeer1AsnFlag  int
 	bgpPeer2AddrFlag string
-	bgpPeer2AsnFlag  string
+	bgpPeer2AsnFlag  int
 	// gobgpGrpcPortFlag is a cli-flag that specifies port of gobgp gRPC
 	gobgpGrpcPortFlag int
 
@@ -74,16 +74,16 @@ func parseAllFlags(args []string) error {
 	fs.StringVar(&chainNameForDBAclFlag, "chain-name-for-db-acl", "mariadb", "the chain name for DB access control")
 	fs.StringVar(&dbReplicaUserNameFlag, "db-replica-user-name", "repl", "the username for replication")
 	fs.StringVar(&bgpPeer1AddrFlag, "bgp-peer1-addr", "", "the address of bgp peer#1")
-	fs.StringVar(&bgpPeer1AsnFlag, "bgp-peer1-asn", "", "the asn of bgp peer#1")
 	fs.StringVar(&bgpPeer2AddrFlag, "bgp-peer2-addr", "", "the address of bgp peer#2")
-	fs.StringVar(&bgpPeer2AsnFlag, "bgp-peer2-asn", "", "the asn of bgp peer#2")
 
 	fs.IntVar(&mainPollingSpanSecondFlag, "main-polling-span-second", 4, "the span seconds of the loop in main.go")
 	fs.IntVar(&httpAPIServerPortFlag, "http-api-server-port", 54545, "the port the http api server listens")
 	fs.IntVar(&prometheusExporterPortFlag, "prometheus-exporter-port", 50505, "the port the prometheus exporter listens")
 	fs.IntVar(&dbReplicaSourcePortFlag, "db-replica-source-port", 13306, "the port of primary as replication source")
 	fs.IntVar(&dbServingPortFlag, "db-serving-port", 3306, "the port of database service")
-	fs.IntVar(&bgpMyAsNumberFlag, "bgp-my-as-number", 65001, "the my as number")
+	fs.IntVar(&bgpLocalAsnFlag, "bgp-local-asn", 0, "the as number of local")
+	fs.IntVar(&bgpPeer1AsnFlag, "bgp-peer1-asn", 0, "the asn of bgp peer#1")
+	fs.IntVar(&bgpPeer2AsnFlag, "bgp-peer2-asn", 0, "the asn of bgp peer#2")
 	fs.IntVar(&bgpServingPortFlag, "bgp-serving-port", 179, "the port of bgp")
 	fs.IntVar(&bgpKeepaliveIntervalSecFlag, "bgp-keepalive-interval-sec", 3, "the interval seconds of bgp keepalive")
 	fs.IntVar(&gobgpGrpcPortFlag, "gobgp-grpc-port", 50051, "the listen port of gobgp gRPC")
@@ -104,8 +104,12 @@ func validateAllFlags() error {
 		return fmt.Errorf("--prometheus-exporter-port must be the range of uint16(tcp port)")
 	}
 
-	if bgpPeer1AddrFlag == "" || bgpPeer1AsnFlag == "" || bgpPeer2AddrFlag == "" || bgpPeer2AsnFlag == "" {
-		return fmt.Errorf("insufficient bgp peer addresses")
+	if bgpLocalAsnFlag == 0 {
+		return fmt.Errorf("--bgp-local-asan must be specified")
+	}
+
+	if bgpPeer1AddrFlag == "" || bgpPeer1AsnFlag == 0 || bgpPeer2AddrFlag == "" || bgpPeer2AsnFlag == 0 {
+		return fmt.Errorf("insufficient bgp peer")
 	}
 
 	return nil

cmd/db-controller/main.go

@@ -23,7 +23,6 @@ import (
 	"os"
 	"os/signal"
 	"path/filepath"
-	"strconv"
 	"strings"
 	"sync"
 	"syscall"
@@ -84,33 +83,25 @@ func main() {
 
 	var bgpPeers []bgpserver.Peer
 	{
-		asn, err := strconv.Atoi(bgpPeer1AsnFlag)
-		if err != nil {
-			panic("invalid bgp peer1 asn")
-		}
 		bgpPeers = append(bgpPeers, bgpserver.Peer{
 			Neighbor:             bgpPeer1AddrFlag,
-			RemoteAS:             uint32(asn),
+			RemoteAS:             uint32(bgpPeer1AsnFlag),
 			RemotePort:           uint32(bgpServingPortFlag),
 			KeepaliveIntervalSec: uint64(bgpKeepaliveIntervalSecFlag),
 		})
 	}
 	{
-		asn, err := strconv.Atoi(bgpPeer2AsnFlag)
-		if err != nil {
-			panic("invalid bgp peer2 asn")
-		}
 		bgpPeers = append(bgpPeers, bgpserver.Peer{
 			Neighbor:             bgpPeer2AddrFlag,
-			RemoteAS:             uint32(asn),
+			RemoteAS:             uint32(bgpPeer2AsnFlag),
 			RemotePort:           uint32(bgpServingPortFlag),
 			KeepaliveIntervalSec: uint64(bgpKeepaliveIntervalSecFlag),
 		})
 	}
 
 	bgpServerConnect := bgpserver.NewDefaultConnector(
 		logger,
-		bgpserver.WithAsn(uint32(bgpMyAsNumberFlag)),
+		bgpserver.WithLocalAsn(uint32(bgpLocalAsnFlag)),
 		bgpserver.WithRouterId(myHostAddress),
 		bgpserver.WithListenPort(int32(bgpServingPortFlag)),
 		bgpserver.WithGrpcPort(gobgpGrpcPortFlag),

pkg/bgpserver/connector.go

@@ -53,7 +53,7 @@ type Connector interface {
 type bgpServerConnector struct {
 	logger     *slog.Logger
 	server     *gobgpserver.BgpServer
-	asn        uint32
+	localAsn   uint32
 	routerId   string
 	listenPort int32
 	grpcPort   int
@@ -74,9 +74,9 @@ func NewDefaultConnector(logger *slog.Logger, configs ...func(*bgpServerConnecto
 	return bs
 }
 
-func WithAsn(asn uint32) func(*bgpServerConnector) {
+func WithLocalAsn(localAsn uint32) func(*bgpServerConnector) {
 	return func(c *bgpServerConnector) {
-		c.asn = asn
+		c.localAsn = localAsn
 	}
 }
 
@@ -109,7 +109,7 @@ func (bs *bgpServerConnector) Start() error {
 
 	err := bs.server.StartBgp(context.Background(), &gobgpapi.StartBgpRequest{
 		Global: &gobgpapi.Global{
-			Asn:             bs.asn,
+			Asn:             bs.localAsn,
 			RouterId:        bs.routerId,
 			ListenAddresses: []string{"0.0.0.0"},
 			ListenPort:      bs.listenPort,