feat(frr): make it an interface and create mockery

Signed-off-by: Boris Glimcher <Boris.Glimcher@emc.com>
opiproject · Oct 16, 2023 · 9dafc65 · 9dafc65
1 parent 5d1f231
commit 9dafc65
Show file tree

Hide file tree

Showing 6 changed files with 350 additions and 42 deletions.
diff --git a/Makefile b/Makefile
@@ -49,4 +49,5 @@ fmt:
 mock-generate:
 	@echo "  >  Starting mock code generation..."
 	# Generate mocks for exported interfaces
+	mockery --config=utils/mocks/.mockery.yaml --name=Frr --dir pkg/utils --output pkg/utils/mocks --boilerplate-file pkg/utils/mocks/boilerplate.txt --with-expecter
 	mockery --config=utils/mocks/.mockery.yaml --name=Netlink --dir pkg/utils --output pkg/utils/mocks --boilerplate-file pkg/utils/mocks/boilerplate.txt --with-expecter
diff --git a/pkg/evpn/evpn.go b/pkg/evpn/evpn.go
@@ -38,6 +38,7 @@ type Server struct {
 	Vrfs       map[string]*pe.Vrf
 	Pagination map[string]int
 	nLink      utils.Netlink
+	frr        utils.Frr
 	tracer     trace.Tracer
 }
 
@@ -60,6 +61,7 @@ func NewServerWithArgs(nLink utils.Netlink) *Server {
 		Vrfs:       make(map[string]*pe.Vrf),
 		Pagination: make(map[string]int),
 		nLink:      nLink,
+		frr:        utils.NewFrrWrapper(),
 		tracer:     otel.Tracer(""),
 	}
 }

diff --git a/pkg/evpn/svi_frr.go b/pkg/evpn/svi_frr.go
@@ -9,13 +9,12 @@ import (
 	"fmt"
 
 	pb "github.com/opiproject/opi-api/network/evpn-gw/v1alpha1/gen/go"
-	"github.com/opiproject/opi-evpn-bridge/pkg/utils"
 )
 
 func (s *Server) frrCreateSviRequest(ctx context.Context, in *pb.CreateSviRequest, vrfName, vlanName string) error {
 	if in.Svi.Spec.EnableBgp {
 		fmt.Printf("TODO: add configuration for <%s:%s> here, see issue #233", vrfName, vlanName)
-		// data, err := utils.FrrBgpCmd(ctx, fmt.Sprintf(
+		// data, err := s.frr.FrrBgpCmd(ctx, fmt.Sprintf(
 		// 	`configure terminal
 		// 	router bgp 65000 vrf %s
 		// 	bgp disable-ebgp-connected-route-check" \
@@ -32,7 +31,7 @@ func (s *Server) frrCreateSviRequest(ctx context.Context, in *pb.CreateSviReques
 		// }
 	}
 	// check FRR for debug
-	data, err := utils.FrrZebraCmd(ctx, "show vrf")
+	data, err := s.frr.FrrZebraCmd(ctx, "show vrf")
 	fmt.Printf("FrrZebraCmd: %v:%v", data, err)
 	if err != nil {
 		return err
@@ -42,7 +41,7 @@ func (s *Server) frrCreateSviRequest(ctx context.Context, in *pb.CreateSviReques
 
 func (s *Server) frrDeleteSviRequest(ctx context.Context, obj *pb.Svi, vrfName, vlanName string) error {
 	if obj.Spec.EnableBgp {
-		data, err := utils.FrrBgpCmd(ctx, fmt.Sprintf(
+		data, err := s.frr.FrrBgpCmd(ctx, fmt.Sprintf(
 			`configure terminal
 			router bgp 65000 vrf %s
 			no neighbor %s peer-group

diff --git a/pkg/evpn/vrf_frr.go b/pkg/evpn/vrf_frr.go
@@ -10,13 +10,12 @@ import (
 	"path"
 
 	pb "github.com/opiproject/opi-api/network/evpn-gw/v1alpha1/gen/go"
-	"github.com/opiproject/opi-evpn-bridge/pkg/utils"
 )
 
 func (s *Server) frrCreateVrfRequest(ctx context.Context, in *pb.CreateVrfRequest) error {
 	vrfName := path.Base(in.Vrf.Name)
 	if in.Vrf.Spec.Vni != nil {
-		data, err := utils.FrrZebraCmd(ctx, fmt.Sprintf(
+		data, err := s.frr.FrrZebraCmd(ctx, fmt.Sprintf(
 			`configure terminal
 			vrf %s
 				vni %d
@@ -28,7 +27,7 @@ func (s *Server) frrCreateVrfRequest(ctx context.Context, in *pb.CreateVrfReques
 		}
 	}
 	if in.Vrf.Spec.Vni != nil {
-		data, err := utils.FrrBgpCmd(ctx, fmt.Sprintf(
+		data, err := s.frr.FrrBgpCmd(ctx, fmt.Sprintf(
 			`configure terminal
 			router bgp 65000 vrf %s
 			no bgp log-neighbor-changes
@@ -53,7 +52,7 @@ func (s *Server) frrCreateVrfRequest(ctx context.Context, in *pb.CreateVrfReques
 		}
 	}
 	// check FRR for debug
-	data, err := utils.FrrZebraCmd(ctx, "show vrf")
+	data, err := s.frr.FrrZebraCmd(ctx, "show vrf")
 	fmt.Printf("FrrZebraCmd: %v:%v", data, err)
 	if err != nil {
 		return err
@@ -64,7 +63,7 @@ func (s *Server) frrCreateVrfRequest(ctx context.Context, in *pb.CreateVrfReques
 func (s *Server) frrDeleteVrfRequest(ctx context.Context, obj *pb.Vrf) error {
 	vrfName := path.Base(obj.Name)
 	if obj.Spec.Vni != nil {
-		data, err := utils.FrrBgpCmd(ctx, fmt.Sprintf(
+		data, err := s.frr.FrrBgpCmd(ctx, fmt.Sprintf(
 			`configure terminal
 			no router bgp 65000 vrf %s
 			exit`, vrfName))
@@ -74,7 +73,7 @@ func (s *Server) frrDeleteVrfRequest(ctx context.Context, obj *pb.Vrf) error {
 		}
 	}
 	if obj.Spec.Vni != nil {
-		data, err := utils.FrrZebraCmd(ctx, fmt.Sprintf(
+		data, err := s.frr.FrrZebraCmd(ctx, fmt.Sprintf(
 			`configure terminal
 			no vrf %s
 			exit`, vrfName))

diff --git a/pkg/utils/mocks/Frr.go b/pkg/utils/mocks/Frr.go