*: another s/distribute/in

distribute-policy is deprecated name.
We chose to use the name in-policy.

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

5 files changed, 18 insertions, 18 deletions

diff --git a/gobgp/common.go b/gobgp/common.go
index 1d8c6613..04e482a9 100644
--- a/gobgp/common.go
+++ b/gobgp/common.go
@@ -54,7 +54,7 @@ const (
 	CMD_ACTIONS        = "actions"
 	CMD_IMPORT         = "import"
 	CMD_EXPORT         = "export"
-	CMD_DISTRIBUTE     = "distribute"
+	CMD_IN             = "in"
 	CMD_MONITOR        = "monitor"
 	CMD_MRT            = "mrt"
 	CMD_DUMP           = "dump"
diff --git a/gobgp/neighbor.go b/gobgp/neighbor.go
index 36eea805..92e82901 100644
--- a/gobgp/neighbor.go
+++ b/gobgp/neighbor.go
@@ -597,7 +597,7 @@ func modNeighborPolicy(remoteIP net.IP, cmdType string, eArg []string) error {
 	switch cmdType {
 	case CMD_ADD:
 		if len(eArg) < 4 {
-			return fmt.Errorf("Usage: gobgp neighbor <ipaddr> policy %s {%s|%s|%s} <policies> {%s|%s}", cmdType, CMD_IMPORT, CMD_EXPORT, CMD_DISTRIBUTE, policy.ROUTE_ACCEPT, policy.ROUTE_REJECT)
+			return fmt.Errorf("Usage: gobgp neighbor <ipaddr> policy %s {%s|%s|%s} <policies> {%s|%s}", cmdType, CMD_IMPORT, CMD_EXPORT, CMD_IN, policy.ROUTE_ACCEPT, policy.ROUTE_REJECT)
 		}
 		policies := parsePolicy(eArg[1])
 		defaultPolicy, err := parseRouteAction(eArg[2])
@@ -611,7 +611,7 @@ func modNeighborPolicy(remoteIP net.IP, cmdType string, eArg []string) error {
 		case CMD_EXPORT:
 			pol.ExportPolicies = policies
 			pol.DefaultExportPolicy = defaultPolicy
-		case CMD_DISTRIBUTE:
+		case CMD_IN:
 			pol.InPolicies = policies
 			pol.DefaultInPolicy = defaultPolicy
 		}
diff --git a/server/grpc_server.go b/server/grpc_server.go
index ee8e5de1..65c91717 100644
--- a/server/grpc_server.go
+++ b/server/grpc_server.go
@@ -43,10 +43,10 @@ const (
 	REQ_NEIGHBOR_POLICY
 	REQ_NEIGHBOR_POLICY_ADD_IMPORT
 	REQ_NEIGHBOR_POLICY_ADD_EXPORT
-	REQ_NEIGHBOR_POLICY_ADD_DISTRIBUTE
+	REQ_NEIGHBOR_POLICY_ADD_IN
 	REQ_NEIGHBOR_POLICY_DEL_IMPORT
 	REQ_NEIGHBOR_POLICY_DEL_EXPORT
-	REQ_NEIGHBOR_POLICY_DEL_DISTRIBUTE
+	REQ_NEIGHBOR_POLICY_DEL_IN
 	REQ_GLOBAL_RIB
 	REQ_POLICY_PREFIX
 	REQ_POLICY_PREFIXES
@@ -301,8 +301,8 @@ func (s *Server) ModNeighborPolicy(stream api.Grpc_ModNeighborPolicyServer) erro
 				reqType = REQ_NEIGHBOR_POLICY_ADD_IMPORT
 			case "export":
 				reqType = REQ_NEIGHBOR_POLICY_ADD_EXPORT
-			case "distribute":
-				reqType = REQ_NEIGHBOR_POLICY_ADD_DISTRIBUTE
+			case "in":
+				reqType = REQ_NEIGHBOR_POLICY_ADD_IN
 			}
 		case api.Operation_DEL:
 			switch arg.Name {
@@ -310,8 +310,8 @@ func (s *Server) ModNeighborPolicy(stream api.Grpc_ModNeighborPolicyServer) erro
 				reqType = REQ_NEIGHBOR_POLICY_DEL_IMPORT
 			case "export":
 				reqType = REQ_NEIGHBOR_POLICY_DEL_EXPORT
-			case "distribute":
-				reqType = REQ_NEIGHBOR_POLICY_DEL_DISTRIBUTE
+			case "in":
+				reqType = REQ_NEIGHBOR_POLICY_DEL_IN
 			}
 		}
 		req := NewGrpcRequest(reqType, arg.NeighborAddress, rf, arg.ApplyPolicy)
diff --git a/server/peer.go b/server/peer.go
index fef1aa07..67e2c437 100644
--- a/server/peer.go
+++ b/server/peer.go
@@ -344,7 +344,7 @@ func (peer *Peer) ToApiStruct() *api.Peer {
 }
 
 func (peer *Peer) setPolicy(policyMap map[string]*policy.Policy) {
-	// configure distribute policy
+	// configure in-policy
 	policyConf := peer.conf.ApplyPolicy
 	inPolicies := make([]*policy.Policy, 0)
 	for _, policyName := range policyConf.ApplyPolicyConfig.InPolicy {
@@ -352,9 +352,9 @@ func (peer *Peer) setPolicy(policyMap map[string]*policy.Policy) {
 			"Topic":      "Peer",
 			"Key":        peer.conf.NeighborConfig.NeighborAddress,
 			"PolicyName": policyName,
-		}).Info("distribute policy installed")
+		}).Info("in-policy installed")
 		if pol, ok := policyMap[policyName]; ok {
-			log.Debug("distribute policy : ", pol)
+			log.Debug("in policy : ", pol)
 			inPolicies = append(inPolicies, pol)
 		}
 	}
diff --git a/server/server.go b/server/server.go
index c5c57ddf..eb9bcee9 100644
--- a/server/server.go
+++ b/server/server.go
@@ -1466,8 +1466,8 @@ func (server *BgpServer) handleGrpc(grpcReq *GrpcRequest) []*SenderMsg {
 		grpcReq.ResponseCh <- result
 		close(grpcReq.ResponseCh)
 
-	case REQ_NEIGHBOR_POLICY_ADD_IMPORT, REQ_NEIGHBOR_POLICY_ADD_EXPORT, REQ_NEIGHBOR_POLICY_ADD_DISTRIBUTE,
-		REQ_NEIGHBOR_POLICY_DEL_IMPORT, REQ_NEIGHBOR_POLICY_DEL_EXPORT, REQ_NEIGHBOR_POLICY_DEL_DISTRIBUTE:
+	case REQ_NEIGHBOR_POLICY_ADD_IMPORT, REQ_NEIGHBOR_POLICY_ADD_EXPORT, REQ_NEIGHBOR_POLICY_ADD_IN,
+		REQ_NEIGHBOR_POLICY_DEL_IMPORT, REQ_NEIGHBOR_POLICY_DEL_EXPORT, REQ_NEIGHBOR_POLICY_DEL_IN:
 		peer, err := server.checkNeighborRequest(grpcReq)
 		if err != nil {
 			break
@@ -1489,7 +1489,7 @@ func (server *BgpServer) handleGrpc(grpcReq *GrpcRequest) []*SenderMsg {
 			}
 			applyPolicy.DefaultExportPolicy = defOutPolicy
 			applyPolicy.ExportPolicy = policy.PoliciesToString(reqApplyPolicy.ExportPolicies)
-		} else if grpcReq.RequestType == REQ_NEIGHBOR_POLICY_ADD_DISTRIBUTE {
+		} else if grpcReq.RequestType == REQ_NEIGHBOR_POLICY_ADD_IN {
 			if reqApplyPolicy.DefaultInPolicy != policy.ROUTE_ACCEPT {
 				defDistPolicy = config.DEFAULT_POLICY_TYPE_REJECT_ROUTE
 			}
@@ -1501,13 +1501,13 @@ func (server *BgpServer) handleGrpc(grpcReq *GrpcRequest) []*SenderMsg {
 		} else if grpcReq.RequestType == REQ_NEIGHBOR_POLICY_DEL_EXPORT {
 			applyPolicy.DefaultExportPolicy = config.DEFAULT_POLICY_TYPE_ACCEPT_ROUTE
 			applyPolicy.ExportPolicy = make([]string, 0)
-		} else if grpcReq.RequestType == REQ_NEIGHBOR_POLICY_DEL_DISTRIBUTE {
+		} else if grpcReq.RequestType == REQ_NEIGHBOR_POLICY_DEL_IN {
 			applyPolicy.DefaultInPolicy = config.DEFAULT_POLICY_TYPE_ACCEPT_ROUTE
 			applyPolicy.InPolicy = make([]string, 0)
 		}
 
-		if grpcReq.RequestType == REQ_NEIGHBOR_POLICY_ADD_DISTRIBUTE ||
-			grpcReq.RequestType == REQ_NEIGHBOR_POLICY_DEL_DISTRIBUTE {
+		if grpcReq.RequestType == REQ_NEIGHBOR_POLICY_ADD_IN ||
+			grpcReq.RequestType == REQ_NEIGHBOR_POLICY_DEL_IN {
 			peer.setPolicy(reqPolicyMap)
 		} else {
 			loc, ok := server.localRibMap[peer.conf.NeighborConfig.NeighborAddress.String()]