server: fix bug of policy assignment

Signed-off-by: ISHIDA Wataru <ishida.wataru@lab.ntt.co.jp>

2 files changed, 92 insertions, 3 deletions

diff --git a/server/server.go b/server/server.go
index a182c26b..0a447783 100644
--- a/server/server.go
+++ b/server/server.go
@@ -2856,16 +2856,16 @@ func (server *BgpServer) handleGrpcModPolicyAssignment(grpcReq *GrpcRequest) err
 		}
 	case api.Operation_DEL:
 		n := make([]*table.Policy, 0, len(cur)-len(ps))
-		for _, x := range ps {
+		for _, y := range cur {
 			found := false
-			for _, y := range cur {
+			for _, x := range ps {
 				if x.Name() == y.Name() {
 					found = true
 					break
 				}
 			}
 			if !found {
-				n = append(n, x)
+				n = append(n, y)
 			}
 		}
 		err = server.policy.SetPolicy(id, dir, n)
diff --git a/server/server_test.go b/server/server_test.go
new file mode 100644
index 00000000..7644b900
--- /dev/null
+++ b/server/server_test.go
@@ -0,0 +1,89 @@
+// Copyright (C) 2016 Nippon Telegraph and Telephone Corporation.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//    http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+// implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+package server
+
+import (
+	api "github.com/osrg/gobgp/api"
+	"github.com/osrg/gobgp/config"
+	"github.com/osrg/gobgp/table"
+	"github.com/stretchr/testify/assert"
+	"testing"
+)
+
+func TestModPolicyAssign(t *testing.T) {
+	assert := assert.New(t)
+	s := NewBgpServer()
+	go s.Serve()
+	s.SetGlobalType(config.Global{
+		Config: config.GlobalConfig{
+			As:       1,
+			RouterId: "1.1.1.1",
+		},
+	})
+	err := s.handleGrpcModPolicy(&GrpcRequest{
+		Data: &api.ModPolicyArguments{
+			Operation: api.Operation_ADD,
+			Policy: &api.Policy{
+				Name: "p1",
+			},
+		},
+	})
+	assert.Nil(err)
+	err = s.handleGrpcModPolicy(&GrpcRequest{
+		Data: &api.ModPolicyArguments{
+			Operation: api.Operation_ADD,
+			Policy: &api.Policy{
+				Name: "p2",
+			},
+		},
+	})
+	assert.Nil(err)
+	err = s.handleGrpcModPolicy(&GrpcRequest{
+		Data: &api.ModPolicyArguments{
+			Operation: api.Operation_ADD,
+			Policy: &api.Policy{
+				Name: "p3",
+			},
+		},
+	})
+	assert.Nil(err)
+	err = s.handleGrpcModPolicyAssignment(&GrpcRequest{
+		Data: &api.ModPolicyAssignmentArguments{
+			Operation: api.Operation_ADD,
+			Assignment: &api.PolicyAssignment{
+				Type:     api.PolicyType_IMPORT,
+				Resource: api.Resource_GLOBAL,
+				Policies: []*api.Policy{&api.Policy{Name: "p1"}, &api.Policy{Name: "p2"}, &api.Policy{Name: "p3"}},
+			},
+		},
+	})
+	assert.Nil(err)
+
+	err = s.handleGrpcModPolicyAssignment(&GrpcRequest{
+		Data: &api.ModPolicyAssignmentArguments{
+			Operation: api.Operation_DEL,
+			Assignment: &api.PolicyAssignment{
+				Type:     api.PolicyType_IMPORT,
+				Resource: api.Resource_GLOBAL,
+				Policies: []*api.Policy{&api.Policy{Name: "p1"}},
+			},
+		},
+	})
+	assert.Nil(err)
+
+	ps := s.policy.GetPolicy(table.GLOBAL_RIB_NAME, table.POLICY_DIRECTION_IMPORT)
+	assert.Equal(len(ps), 2)
+}