1 files changed, 13 insertions, 21 deletions

diff --git a/api/gobgp.proto b/api/gobgp.proto
index a1cce0a2..1875d708 100644
--- a/api/gobgp.proto
+++ b/api/gobgp.proto
@@ -31,8 +31,6 @@ service GobgpApi {
   rpc Enable(Arguments) returns (Error) {}
   rpc Disable(Arguments) returns (Error) {}
   rpc ModPath(stream ModPathArguments) returns (Error) {}
-  rpc GetNeighborPolicy(PolicyArguments) returns (ApplyPolicy) {}
-  rpc ModNeighborPolicy(stream PolicyArguments) returns (stream Error) {}
   rpc MonitorBestChanged(Arguments) returns (stream Destination) {}
   rpc MonitorPeerState(Arguments) returns (stream Peer) {}
   rpc GetMrt(MrtArguments) returns (stream MrtMessage) {}
@@ -49,6 +47,8 @@ service GobgpApi {
   rpc GetPolicy(Policy) returns (Policy) {}
   rpc GetPolicies(Policy) returns (stream Policy) {}
   rpc ModPolicy(ModPolicyArguments) returns (Error) {}
+  rpc GetPolicyAssignment(PolicyAssignment) returns (PolicyAssignment) {}
+  rpc ModPolicyAssignment(ModPolicyAssignmentArguments) returns (Error) {}
 }
 
 message Error {
@@ -72,15 +72,6 @@ message ModPathArguments {
     repeated Path paths = 3;
 }
 
-message PolicyArguments {
-    Resource resource = 1;
-    Operation operation = 2;
-    string neighbor_address = 3;
-    string name = 4;
-    Policy policy_definition = 6;
-    ApplyPolicy apply_policy = 7;
-}
-
 message MrtArguments {
     Resource resource = 1;
     uint32 rf = 2;
@@ -116,18 +107,17 @@ message ModPolicyArguments {
     bool preserve_statements = 4;
 }
 
+message ModPolicyAssignmentArguments {
+    Operation operation = 1;
+    PolicyAssignment assignment = 2;
+}
+
 enum Resource {
     GLOBAL = 0;
     LOCAL = 1;
     ADJ_IN = 2;
     ADJ_OUT = 3;
-    POLICY_PREFIX = 4;
-    POLICY_NEIGHBOR = 5;
-    POLICY_ASPATH = 6;
-    POLICY_COMMUNITY = 7;
-    POLICY_ROUTEPOLICY = 8;
-    POLICY_EXTCOMMUNITY = 9;
-    VRF = 10;
+    VRF = 4;
 }
 
 enum Operation {
@@ -281,10 +271,12 @@ enum PolicyType {
     EXPORT = 2;
 }
 
-message ApplyPolicy {
+message PolicyAssignment {
     PolicyType type = 1;
-    repeated string policies = 2;
-    RouteAction default = 3;
+    Resource resource = 2;
+    string name = 3;
+    repeated Policy policies = 4;
+    RouteAction default = 5;
 }
 
 message MrtMessage {