Add replace option to AddDefinedSet rpc

osrg · Nov 10, 2023 · 16412bf · 16412bf
1 parent 02fa612
commit 16412bf
Show file tree

Hide file tree

Showing 6 changed files with 1,454 additions and 1,437 deletions.
diff --git a/api/gobgp.pb.go b/api/gobgp.pb.go
diff --git a/api/gobgp.proto b/api/gobgp.proto
@@ -322,7 +322,10 @@ message SetPoliciesRequest {
   repeated PolicyAssignment assignments = 3;
 }
 
-message AddDefinedSetRequest { DefinedSet defined_set = 1; }
+message AddDefinedSetRequest {
+  DefinedSet defined_set = 1;
+  bool replace = 2;
+}
 
 message DeleteDefinedSetRequest {
   DefinedSet defined_set = 1;

diff --git a/api/gobgp_grpc.pb.go b/api/gobgp_grpc.pb.go
diff --git a/internal/pkg/table/policy.go b/internal/pkg/table/policy.go
@@ -3491,14 +3491,14 @@ func (r *RoutingPolicy) GetDefinedSet(typ DefinedType, name string) (*oc.Defined
 	return sets, nil
 }
 
-func (r *RoutingPolicy) AddDefinedSet(s DefinedSet) error {
+func (r *RoutingPolicy) AddDefinedSet(s DefinedSet, replace bool) error {
 	r.mu.Lock()
 	defer r.mu.Unlock()
 
 	if m, ok := r.definedSetMap[s.Type()]; !ok {
 		return fmt.Errorf("invalid defined-set type: %d", s.Type())
 	} else {
-		if d, ok := m[s.Name()]; ok {
+		if d, ok := m[s.Name()]; ok && !replace {
 			if err := d.Append(s); err != nil {
 				return err
 			}

diff --git a/pkg/server/server.go b/pkg/server/server.go
@@ -3675,7 +3675,7 @@ func (s *BgpServer) AddDefinedSet(ctx context.Context, r *api.AddDefinedSetReque
 		if err != nil {
 			return err
 		}
-		return s.policy.AddDefinedSet(set)
+		return s.policy.AddDefinedSet(set, r.GetReplace())
 	}, false)
 }
 

diff --git a/pkg/server/server_test.go b/pkg/server/server_test.go
@@ -830,7 +830,7 @@ func TestFilterpathWithRejectPolicy(t *testing.T) {
 		CommunityList:    []string{"100:100"},
 	}
 	s, _ := table.NewCommunitySet(comSet1)
-	p2.policy.AddDefinedSet(s)
+	p2.policy.AddDefinedSet(s, false)
 
 	statement := oc.Statement{
 		Name: "stmt1",