fix(evpn): fix evpn and unit test

Signed-off-by: atulpatel261194 <Atul.Patel@intel.com> Co-authored-by: Dimitrios Markou <dimitrios.markou@ericsson.com> Co-authored-by: Venkatesh Vemula <venkatesh.vemula@intel.com> Co-authored-by: Banoth Saikumar <banoth.saikumar@intel.com> Co-authored-by: Jambekar Vishakha <vishakha.jambekar@intel.com>
opiproject · Apr 2, 2024 · 0f44e3e · 0f44e3e
1 parent acb3a85
commit 0f44e3e
Show file tree

Hide file tree

Showing 11 changed files with 66 additions and 30 deletions.
diff --git a/cmd/network/evpn-logical-brige.go b/cmd/network/evpn-logical-brige.go
@@ -28,14 +28,19 @@ func CreateLogicalBridge() *cobra.Command {
 		Short: "Create a logical bridge",
 		Long:  "Create a logical bridge with the specified name, VLAN ID, and VNI",
 		Run: func(_ *cobra.Command, _ []string) {
+			var vniparam *uint32
 			ctx, cancel := context.WithTimeout(context.Background(), 10*time.Second)
 			evpnClient, err := network.NewLogicalBridge(addr)
 			if err != nil {
 				log.Fatalf("could create gRPC client: %v", err)
 			}
 			defer cancel()
 
-			lb, err := evpnClient.CreateLogicalBridge(ctx, name, vlanID, vni, vtep)
+			if vni != 0 {
+				vniparam = &vni
+			}
+
+			lb, err := evpnClient.CreateLogicalBridge(ctx, name, vlanID, vniparam, vtep)
 			if err != nil {
 				log.Fatalf("failed to create logical bridge: %v", err)
 			}
@@ -59,9 +64,8 @@ func CreateLogicalBridge() *cobra.Command {
 	if err := cmd.MarkFlagRequired("vlan-id"); err != nil {
 		log.Fatalf("Error marking flag as required: %v", err)
 	}
-	if err := cmd.MarkFlagRequired("vni"); err != nil {
-		log.Fatalf("Error marking flag as required: %v", err)
-	}
+
+	cmd.MarkFlagsRequiredTogether("vni", "vtep")
 
 	return cmd
 }

diff --git a/cmd/network/evpn-vrf.go b/cmd/network/evpn-vrf.go
@@ -27,14 +27,17 @@ func CreateVRF() *cobra.Command {
 		Use:   "create-vrf",
 		Short: "Create a VRF",
 		Run: func(_ *cobra.Command, _ []string) {
+			var vniparam *uint32
 			ctx, cancel := context.WithTimeout(context.Background(), 10*time.Second)
 			evpnClient, err := network.NewVRF(addr)
 			if err != nil {
 				log.Fatalf("could not create gRPC client: %v", err)
 			}
 			defer cancel()
-
-			vrf, err := evpnClient.CreateVrf(ctx, name, vni, loopback, vtep)
+			if vni != 0 {
+				vniparam = &vni
+			}
+			vrf, err := evpnClient.CreateVrf(ctx, name, vniparam, loopback, vtep)
 			if err != nil {
 				log.Fatalf("failed to create vrf: %v", err)
 			}
@@ -49,10 +52,6 @@ func CreateVRF() *cobra.Command {
 	cmd.Flags().StringVar(&vtep, "vtep", "", "VTEP IP address")
 	cmd.Flags().StringVar(&addr, "addr", "localhost:50151", "address of OPI gRPC server")
 
-	if err := cmd.MarkFlagRequired("vni"); err != nil {
-		log.Fatalf("Error marking flag as required: %v", err)
-	}
-
 	if err := cmd.MarkFlagRequired("loopback"); err != nil {
 		log.Fatalf("Error marking flag as required: %v", err)
 	}

diff --git a/network/bridge_port.go b/network/bridge_port.go
@@ -7,7 +7,9 @@ package network
 
 import (
 	"context"
+	"fmt"
 	"log"
+	"net"
 
 	pb "github.com/opiproject/opi-api/network/evpn-gw/v1alpha1/gen/go"
 	"google.golang.org/protobuf/types/known/emptypb"
@@ -25,6 +27,11 @@ func (c evpnClientImpl) CreateBridgePort(ctx context.Context, name string, mac s
 	defer closer()
 
 	client := c.getEvpnBridgePortClient(conn)
+	macBytes, err := net.ParseMAC(mac)
+	if err != nil {
+		fmt.Println("Error parsing MAC address:", err)
+		return nil, err
+	}
 	switch bridgePortType {
 	case "access":
 		typeOfPort = pb.BridgePortType_BRIDGE_PORT_TYPE_ACCESS
@@ -37,7 +44,7 @@ func (c evpnClientImpl) CreateBridgePort(ctx context.Context, name string, mac s
 		BridgePortId: name,
 		BridgePort: &pb.BridgePort{
 			Spec: &pb.BridgePortSpec{
-				MacAddress:     []byte(mac),
+				MacAddress:     macBytes,
 				Ptype:          typeOfPort,
 				LogicalBridges: logicalBridges,
 			},

diff --git a/network/bridge_port_test.go b/network/bridge_port_test.go
@@ -8,6 +8,7 @@ package network
 import (
 	"context"
 	"errors"
+	"net"
 	"testing"
 
 	"github.com/opiproject/godpu/mocks"
@@ -22,9 +23,10 @@ import (
 )
 
 func TestCreateBridgePort(t *testing.T) {
+	macBytes, _ := net.ParseMAC("00:11:22:aa:bb:cc")
 	testBridgePort := &pb.BridgePort{
 		Spec: &pb.BridgePortSpec{
-			MacAddress:     []byte("00:11:22:aa:bb:cc"),
+			MacAddress:     macBytes,
 			Ptype:          pb.BridgePortType_BRIDGE_PORT_TYPE_ACCESS,
 			LogicalBridges: []string{"lb1", "lb2"},
 		},

diff --git a/network/evpn.go b/network/evpn.go
@@ -41,7 +41,7 @@ type evpnClientImpl struct {
 type EvpnClient interface {
 
 	// Logical Bridge interfaces
-	CreateLogicalBridge(ctx context.Context, name string, vlanID uint32, vni uint32, vtepIP string) (*pb.LogicalBridge, error)
+	CreateLogicalBridge(ctx context.Context, name string, vlanID uint32, vni *uint32, vtepIP string) (*pb.LogicalBridge, error)
 	DeleteLogicalBridge(ctx context.Context, name string, allowMissing bool) (*emptypb.Empty, error)
 	GetLogicalBridge(ctx context.Context, name string) (*pb.LogicalBridge, error)
 	ListLogicalBridges(ctx context.Context, pageSize int32, pageToken string) (*pb.ListLogicalBridgesResponse, error)
@@ -55,7 +55,7 @@ type EvpnClient interface {
 	UpdateBridgePort(ctx context.Context, name string, updateMask []string, allowMissing bool) (*pb.BridgePort, error)
 
 	// VRF Interfaces
-	CreateVrf(ctx context.Context, name string, vni uint32, loopback string, vtep string) (*pb.Vrf, error)
+	CreateVrf(ctx context.Context, name string, vni *uint32, loopback string, vtep string) (*pb.Vrf, error)
 	DeleteVrf(ctx context.Context, name string, allowMissing bool) (*emptypb.Empty, error)
 	GetVrf(ctx context.Context, name string) (*pb.Vrf, error)
 	ListVrfs(ctx context.Context, pageSize int32, pageToken string) (*pb.ListVrfsResponse, error)

diff --git a/network/logical_bridge.go b/network/logical_bridge.go
@@ -10,12 +10,15 @@ import (
 	"log"
 
 	pb "github.com/opiproject/opi-api/network/evpn-gw/v1alpha1/gen/go"
+	pc "github.com/opiproject/opi-api/network/opinetcommon/v1alpha1/gen/go"
 	"google.golang.org/protobuf/types/known/emptypb"
 	"google.golang.org/protobuf/types/known/fieldmaskpb"
 )
 
 // CreateLogicalBridge creates an Logical Bridge an OPI server
-func (c evpnClientImpl) CreateLogicalBridge(ctx context.Context, name string, vlanID uint32, vni uint32, vtepIP string) (*pb.LogicalBridge, error) {
+func (c evpnClientImpl) CreateLogicalBridge(ctx context.Context, name string, vlanID uint32, vni *uint32, vtepIP string) (*pb.LogicalBridge, error) {
+	var ipVtep *pc.IPPrefix
+
 	conn, closer, err := c.NewConn()
 	if err != nil {
 		log.Printf("error creating connection: %s\n", err)
@@ -24,17 +27,21 @@ func (c evpnClientImpl) CreateLogicalBridge(ctx context.Context, name string, vl
 	defer closer()
 
 	client := c.getEvpnLogicalBridgeClient(conn)
-	ipVtep, err := parseIPAndPrefix(vtepIP)
-	if err != nil {
-		log.Printf("parseIPAndPrefix: error creating vrf: %s\n", err)
-		return nil, err
+	if vni != nil {
+		if vtepIP != "" {
+			ipVtep, err = parseIPAndPrefix(vtepIP)
+			if err != nil {
+				log.Printf("parseIPAndPrefix: error creating vrf: %s\n", err)
+				return nil, err
+			}
+		}
 	}
 	data, err := client.CreateLogicalBridge(ctx, &pb.CreateLogicalBridgeRequest{
 		LogicalBridgeId: name,
 		LogicalBridge: &pb.LogicalBridge{
 			Spec: &pb.LogicalBridgeSpec{
 				VlanId:       vlanID,
-				Vni:          &vni,
+				Vni:          vni,
 				VtepIpPrefix: ipVtep,
 			},
 		},

diff --git a/network/logical_bridge_test.go b/network/logical_bridge_test.go
@@ -23,6 +23,7 @@ import (
 )
 
 func TestCreateLogicalBridge(t *testing.T) {
+	testVni := uint32(500)
 	wantIPPefix := &pc.IPPrefix{
 		Addr: &pc.IPAddress{
 			Af: pc.IpAf_IP_AF_INET,
@@ -106,7 +107,7 @@ func TestCreateLogicalBridge(t *testing.T) {
 
 			response, err := c.CreateLogicalBridge(
 				context.Background(),
-				"lb1", 100, 500, "192.168.1.0/24",
+				"lb1", 100, &testVni, "192.168.1.0/24",
 			)
 
 			assert.Equal(t, tt.wantErr, err)

diff --git a/network/svi.go b/network/svi.go
@@ -7,7 +7,9 @@ package network
 
 import (
 	"context"
+	"fmt"
 	"log"
+	"net"
 
 	pb "github.com/opiproject/opi-api/network/evpn-gw/v1alpha1/gen/go"
 	"google.golang.org/protobuf/types/known/emptypb"
@@ -30,13 +32,18 @@ func (c evpnClientImpl) CreateSvi(ctx context.Context, name string, vrf string,
 		log.Printf("error parsing GwIPs: %s\n", err)
 		return nil, err
 	}
+	macBytes, err := net.ParseMAC(mac)
+	if err != nil {
+		fmt.Println("Error parsing MAC address:", err)
+		return nil, err
+	}
 	data, err := client.CreateSvi(ctx, &pb.CreateSviRequest{
 		SviId: name,
 		Svi: &pb.Svi{
 			Spec: &pb.SviSpec{
 				Vrf:           vrf,
 				LogicalBridge: logicalBridge,
-				MacAddress:    []byte(mac),
+				MacAddress:    macBytes,
 				GwIpPrefix:    gwPrefixes,
 				EnableBgp:     ebgp,
 				RemoteAs:      remoteAS,

diff --git a/network/svi_test.go b/network/svi_test.go
@@ -8,6 +8,7 @@ package network
 import (
 	"context"
 	"errors"
+	"net"
 	"testing"
 
 	"github.com/opiproject/godpu/mocks"
@@ -33,11 +34,13 @@ func TestCreateSvi(t *testing.T) {
 			Len: 32,
 		},
 	}
+	macBytes, _ := net.ParseMAC("01:23:45:67:89:ab")
+
 	testSvi := &pb.Svi{
 		Spec: &pb.SviSpec{
 			Vrf:           "vrf1",
 			LogicalBridge: "logical1",
-			MacAddress:    []byte("01:23:45:67:89:ab"),
+			MacAddress:    macBytes,
 			GwIpPrefix:    wantGWPrefixes,
 			EnableBgp:     true,
 			RemoteAs:      65000,

diff --git a/network/vrf.go b/network/vrf.go
@@ -10,13 +10,15 @@ import (
 	"log"
 
 	pb "github.com/opiproject/opi-api/network/evpn-gw/v1alpha1/gen/go"
+	pc "github.com/opiproject/opi-api/network/opinetcommon/v1alpha1/gen/go"
 	"google.golang.org/protobuf/types/known/emptypb"
 	"google.golang.org/protobuf/types/known/fieldmaskpb"
 )
 
 // CreateVrf Create vrf on OPI Server
-func (c evpnClientImpl) CreateVrf(ctx context.Context, name string, vni uint32, loopback string, vtep string) (*pb.Vrf, error) {
+func (c evpnClientImpl) CreateVrf(ctx context.Context, name string, vni *uint32, loopback string, vtep string) (*pb.Vrf, error) {
 	conn, closer, err := c.NewConn()
+	var ipVtep *pc.IPPrefix
 	if err != nil {
 		log.Printf("error creating connection: %s\n", err)
 		return nil, err
@@ -29,16 +31,20 @@ func (c evpnClientImpl) CreateVrf(ctx context.Context, name string, vni uint32,
 		log.Printf("parseIPAndPrefix: error creating vrf: %s\n", err)
 		return nil, err
 	}
-	ipVtep, err := parseIPAndPrefix(vtep)
-	if err != nil {
-		log.Printf("parseIPAndPrefix: error creating vrf: %s\n", err)
-		return nil, err
+	if vni != nil {
+		if vtep != "" {
+			ipVtep, err = parseIPAndPrefix(vtep)
+			if err != nil {
+				log.Printf("parseIPAndPrefix: error creating vrf: %s\n", err)
+				return nil, err
+			}
+		}
 	}
 	data, err := client.CreateVrf(ctx, &pb.CreateVrfRequest{
 		VrfId: name,
 		Vrf: &pb.Vrf{
 			Spec: &pb.VrfSpec{
-				Vni:              &vni,
+				Vni:              vni,
 				LoopbackIpPrefix: ipLoopback,
 				VtepIpPrefix:     ipVtep,
 			},

diff --git a/network/vrf_test.go b/network/vrf_test.go
@@ -100,7 +100,7 @@ func TestCreateVrf(t *testing.T) {
 				},
 			)
 
-			response, err := c.CreateVrf(context.Background(), "Vrf1", 100, "192.168.1.1/24", "10.0.0.1/32")
+			response, err := c.CreateVrf(context.Background(), "Vrf1", &vni, "192.168.1.1/24", "10.0.0.1/32")
 
 			assert.Equal(t, tt.wantErr, err)
 			assert.True(t, proto.Equal(response, tt.wantResponse))