fix(evpn-bridge): fix return error on no subscribers

Signed-off-by: Saikumar, Banoth <banoth.saikumar@intel.com>
opiproject · Apr 25, 2024 · 54ded65 · 54ded65
1 parent 6b422c4
commit 54ded65
Show file tree

Hide file tree

Showing 8 changed files with 58 additions and 18 deletions.
diff --git a/pkg/bridge/common.go b/pkg/bridge/common.go
@@ -39,7 +39,10 @@ func (s *Server) createLogicalBridge(lb *pb.LogicalBridge) (*pb.LogicalBridge, e
 	}
 
 	// translation of pb to domain object
-	domainLB := infradb.NewLogicalBridge(lb)
+	domainLB, err := infradb.NewLogicalBridge(lb)
+	if err != nil {
+		return nil, err
+	}
 	// Note: The status of the object will be generated in infraDB operation not here
 	if err := infradb.CreateLB(domainLB); err != nil {
 		return nil, err
@@ -83,7 +86,10 @@ func (s *Server) updateLogicalBridge(lb *pb.LogicalBridge) (*pb.LogicalBridge, e
 	}
 
 	// translation of pb to domain object
-	domainLB := infradb.NewLogicalBridge(lb)
+	domainLB, err := infradb.NewLogicalBridge(lb)
+	if err != nil {
+		return nil, err
+	}
 	// Note: The status of the object will be generated in infraDB operation not here
 	if err := infradb.UpdateLB(domainLB); err != nil {
 		return nil, err
@@ -132,7 +138,10 @@ func (s *Server) TestCreateLogicalBridge(lb *pb.LogicalBridge) (*pb.LogicalBridg
 	}
 
 	// translation of pb to domain object
-	domainLB := infradb.NewLogicalBridge(lb)
+	domainLB, err := infradb.NewLogicalBridge(lb)
+	if err != nil {
+		return nil, err
+	}
 	// Note: The status of the object will be generated in infraDB operation not here
 	if err := infradb.CreateLB(domainLB); err != nil {
 		return nil, err

diff --git a/pkg/infradb/bridge.go b/pkg/infradb/bridge.go
@@ -8,6 +8,7 @@ package infradb
 import (
 	// "encoding/binary"
 	"encoding/binary"
+	"errors"
 	"fmt"
 	"log"
 	"net"
@@ -63,7 +64,7 @@ type LogicalBridge struct {
 var _ EvpnObject[*pb.LogicalBridge] = (*LogicalBridge)(nil)
 
 // NewLogicalBridge creates new Logical Bridge object from protobuf message
-func NewLogicalBridge(in *pb.LogicalBridge) *LogicalBridge {
+func NewLogicalBridge(in *pb.LogicalBridge) (*LogicalBridge, error) {
 	var vip *net.IPNet
 	components := make([]common.Component, 0)
 
@@ -77,6 +78,7 @@ func NewLogicalBridge(in *pb.LogicalBridge) *LogicalBridge {
 	subscribers := eventbus.EBus.GetSubscribers("logical-bridge")
 	if len(subscribers) == 0 {
 		log.Println("NewLogicalBridge(): No subscribers for Logical Bridge objects")
+		return &LogicalBridge{}, errors.New("no subscribers found for logical bridge")
 	}
 
 	for _, sub := range subscribers {
@@ -99,7 +101,7 @@ func NewLogicalBridge(in *pb.LogicalBridge) *LogicalBridge {
 		BridgePorts:     make(map[string]bool),
 		MacTable:        make(map[string]string),
 		ResourceVersion: generateVersion(),
-	}
+	}, nil
 }
 
 // ToPb transforms Logical Bridge object to protobuf message

diff --git a/pkg/infradb/port.go b/pkg/infradb/port.go
@@ -7,6 +7,8 @@ package infradb
 
 import (
 	//	"fmt"
+	"errors"
+
 	"log"
 	"net"
 
@@ -77,7 +79,7 @@ type BridgePort struct {
 var _ EvpnObject[*pb.BridgePort] = (*BridgePort)(nil)
 
 // NewBridgePort creates new Bridge Port object from protobuf message
-func NewBridgePort(in *pb.BridgePort) *BridgePort {
+func NewBridgePort(in *pb.BridgePort) (*BridgePort, error) {
 	var bpType BridgePortType
 	var transTrunk bool
 	components := make([]common.Component, 0)
@@ -88,6 +90,7 @@ func NewBridgePort(in *pb.BridgePort) *BridgePort {
 	subscribers := eventbus.EBus.GetSubscribers("bridge-port")
 	if len(subscribers) == 0 {
 		log.Println("NewBridgePort(): No subscribers for Bridge Port objects")
+		return &BridgePort{}, errors.New("no subscribers found for bridge port")
 	}
 
 	for _, sub := range subscribers {
@@ -122,7 +125,7 @@ func NewBridgePort(in *pb.BridgePort) *BridgePort {
 		Metadata:         &BridgePortMetadata{},
 		TransparentTrunk: transTrunk,
 		ResourceVersion:  generateVersion(),
-	}
+	}, nil
 }
 
 // ToPb transforms Bridge Port object to protobuf message

diff --git a/pkg/infradb/svi.go b/pkg/infradb/svi.go
@@ -8,6 +8,8 @@ package infradb
 import (
 	"encoding/binary"
 	//	"fmt"
+	"errors"
+
 	"log"
 	"net"
 
@@ -65,7 +67,7 @@ type Svi struct {
 var _ EvpnObject[*pb.Svi] = (*Svi)(nil)
 
 // NewSvi creates new SVI object from protobuf message
-func NewSvi(in *pb.Svi) *Svi {
+func NewSvi(in *pb.Svi) (*Svi, error) {
 	components := make([]common.Component, 0)
 	gwIPs := make([]*net.IPNet, 0)
 
@@ -83,6 +85,7 @@ func NewSvi(in *pb.Svi) *Svi {
 	subscribers := eventbus.EBus.GetSubscribers("svi")
 	if len(subscribers) == 0 {
 		log.Println("NewSvi(): No subscribers for SVI objects")
+		return &Svi{}, errors.New("no subscribers found for svi")
 	}
 
 	for _, sub := range subscribers {
@@ -106,7 +109,7 @@ func NewSvi(in *pb.Svi) *Svi {
 		},
 		Metadata:        &SviMetadata{},
 		ResourceVersion: generateVersion(),
-	}
+	}, nil
 }
 
 // ToPb transforms Svi object to protobuf message

diff --git a/pkg/infradb/vrf.go b/pkg/infradb/vrf.go
@@ -7,6 +7,7 @@ package infradb
 
 import (
 	"encoding/binary"
+	"errors"
 	"fmt"
 	"log"
 	"net"
@@ -119,7 +120,7 @@ func NewVrfWithArgs(name string, vni *uint32, loopbackIP, vtepIP *net.IPNet) (*V
 }
 
 // NewVrf creates new VRF object from protobuf message
-func NewVrf(in *pb.Vrf) *Vrf {
+func NewVrf(in *pb.Vrf) (*Vrf, error) {
 	var vip *net.IPNet
 	components := make([]common.Component, 0)
 
@@ -137,6 +138,7 @@ func NewVrf(in *pb.Vrf) *Vrf {
 	subscribers := eventbus.EBus.GetSubscribers("vrf")
 	if len(subscribers) == 0 {
 		log.Println("NewVrf(): No subscribers for Vrf objects")
+		return &Vrf{}, errors.New("no subscribers found for vrf")
 	}
 
 	for _, sub := range subscribers {
@@ -159,7 +161,7 @@ func NewVrf(in *pb.Vrf) *Vrf {
 		Metadata:        &VrfMetadata{},
 		Svis:            make(map[string]bool),
 		ResourceVersion: generateVersion(),
-	}
+	}, nil
 }
 
 // ToPb transforms VRF object to protobuf message

diff --git a/pkg/port/common.go b/pkg/port/common.go
@@ -42,7 +42,10 @@ func (s *Server) createBridgePort(bp *pb.BridgePort) (*pb.BridgePort, error) {
 	}
 
 	// translation of pb to domain object
-	domainBP := infradb.NewBridgePort(bp)
+	domainBP, err := infradb.NewBridgePort(bp)
+	if err != nil {
+		return nil, err
+	}
 	// Note: The status of the object will be generated in infraDB operation not here
 	if err := infradb.CreateBP(domainBP); err != nil {
 		return nil, err
@@ -86,7 +89,10 @@ func (s *Server) updateBridgePort(bp *pb.BridgePort) (*pb.BridgePort, error) {
 	}
 
 	// translation of pb to domain object
-	domainBP := infradb.NewBridgePort(bp)
+	domainBP, err := infradb.NewBridgePort(bp)
+	if err != nil {
+		return nil, err
+	}
 	// Note: The status of the object will be generated in infraDB operation not here
 	if err := infradb.UpdateBP(domainBP); err != nil {
 		return nil, err

diff --git a/pkg/svi/common.go b/pkg/svi/common.go
@@ -43,7 +43,10 @@ func (s *Server) createSvi(svi *pb.Svi) (*pb.Svi, error) {
 	}
 
 	// translation of pb to domain object
-	domainSvi := infradb.NewSvi(svi)
+	domainSvi, err := infradb.NewSvi(svi)
+	if err != nil {
+		return nil, err
+	}
 	// Note: The status of the object will be generated in infraDB operation not here
 	if err := infradb.CreateSvi(domainSvi); err != nil {
 		return nil, err
@@ -87,7 +90,10 @@ func (s *Server) updateSvi(svi *pb.Svi) (*pb.Svi, error) {
 	}
 
 	// translation of pb to domain object
-	domainSvi := infradb.NewSvi(svi)
+	domainSvi, err := infradb.NewSvi(svi)
+	if err != nil {
+		return nil, err
+	}
 	// Note: The status of the object will be generated in infraDB operation not here
 	if err := infradb.UpdateSvi(domainSvi); err != nil {
 		return nil, err

diff --git a/pkg/vrf/common.go b/pkg/vrf/common.go
@@ -37,7 +37,10 @@ func (s *Server) createVrf(vrf *pb.Vrf) (*pb.Vrf, error) {
 	}
 
 	// translation of pb to domain object
-	domainVrf := infradb.NewVrf(vrf)
+	domainVrf, err := infradb.NewVrf(vrf)
+	if err != nil {
+		return nil, err
+	}
 	// Note: The status of the object will be generated in infraDB operation not here
 	if err := infradb.CreateVrf(domainVrf); err != nil {
 		return nil, err
@@ -81,7 +84,10 @@ func (s *Server) updateVrf(vrf *pb.Vrf) (*pb.Vrf, error) {
 	}
 
 	// translation of pb to domain object
-	domainVrf := infradb.NewVrf(vrf)
+	domainVrf, err := infradb.NewVrf(vrf)
+	if err != nil {
+		return nil, err
+	}
 	// Note: The status of the object will be generated in infraDB operation not here
 	if err := infradb.UpdateVrf(domainVrf); err != nil {
 		return nil, err
@@ -128,7 +134,10 @@ func (s *Server) TestCreateVrf(vrf *pb.Vrf) (*pb.Vrf, error) {
 	}
 
 	// translation of pb to domain object
-	domainVrf := infradb.NewVrf(vrf)
+	domainVrf, err := infradb.NewVrf(vrf)
+	if err != nil {
+		return nil, err
+	}
 	// Note: The status of the object will be generated in infraDB operation not here
 	if err := infradb.CreateVrf(domainVrf); err != nil {
 		return nil, err