cli: aggregate grpc communication interface associated with the policy to api.policyDefinition

1 files changed, 21 insertions, 33 deletions

diff --git a/api/gobgp.proto b/api/gobgp.proto
index 0d38ad58..29038ea8 100644
--- a/api/gobgp.proto
+++ b/api/gobgp.proto
@@ -34,12 +34,6 @@ service Grpc {
   rpc ModPath(stream ModPathArguments) returns (stream Error) {}
   rpc GetNeighborPolicy(Arguments) returns (ApplyPolicy) {}
   rpc ModNeighborPolicy(stream PolicyArguments) returns (stream Error) {}
-  rpc GetPolicyPrefixes(PolicyArguments) returns (stream PrefixSet) {}
-  rpc GetPolicyPrefix(PolicyArguments) returns (PrefixSet) {}
-  rpc ModPolicyPrefix(stream PolicyArguments) returns (stream Error) {}
-  rpc GetPolicyNeighbors(PolicyArguments) returns (stream NeighborSet) {}
-  rpc GetPolicyNeighbor(PolicyArguments) returns (NeighborSet) {}
-  rpc ModPolicyNeighbor(stream PolicyArguments) returns (stream Error) {}
   rpc GetPolicyRoutePolicies(PolicyArguments) returns (stream PolicyDefinition) {}
   rpc GetPolicyRoutePolicy(PolicyArguments) returns (PolicyDefinition) {}
   rpc ModPolicyRoutePolicy(stream PolicyArguments) returns (stream Error) {}
@@ -70,10 +64,8 @@ message PolicyArguments {
     Operation operation = 2;
     string router_id = 3;
     string name = 4;
-    PrefixSet prefix_set = 5;
-    NeighborSet neighbor_set = 6;
-    PolicyDefinition policy_difinition = 7;
-    ApplyPolicy apply_policy = 8;
+    PolicyDefinition policy_definition = 6;
+    ApplyPolicy apply_policy = 7;
 }
 
 enum Resource {
@@ -357,54 +349,50 @@ message Peer {
 }
 
 message Prefix {
-	string address  = 1;
-	uint32 mask_length = 2;
-	string mask_length_range = 3;
+    string address  = 1;
+    uint32 mask_length = 2;
+    string mask_length_range = 3;
 }
 
 message PrefixSet {
-	string prefix_set_name = 1;
+    string prefix_set_name = 1;
     repeated Prefix prefix_list = 2;
 }
 
 message Neighbor {
-	string address = 1;
+    string address = 1;
 }
 
 message NeighborSet {
-	string neighbor_set_name = 1;
-	repeated Neighbor neighbor_list = 2;
+    string neighbor_set_name = 1;
+    repeated Neighbor neighbor_list = 2;
 }
 
 message AsPathLength {
-	string value = 1;
-	string operator = 2;
+    string value = 1;
+    string operator = 2;
 }
 
 message Conditions {
-	PrefixSet match_prefix_set = 1;
-	NeighborSet match_neighbor_set = 2;
-	AsPathLength match_as_path_length = 3;
-	string match_set_options = 4;
+    PrefixSet match_prefix_set = 1;
+    NeighborSet match_neighbor_set = 2;
+    AsPathLength match_as_path_length = 3;
+    string match_set_options = 4;
 }
 
 message Actions {
-	string route_action = 1;
+    string route_action = 1;
 }
 
 message Statement {
-	string statement_neme = 1;
-	Conditions conditions = 2;
-	Actions actions = 3;
+    string statement_neme = 1;
+    Conditions conditions = 2;
+    Actions actions = 3;
 }
 
 message PolicyDefinition {
-	string policy_definition_name = 1;
-	repeated Statement statement_list = 2;
-}
-
-message RoutingPolicy {
-	repeated PolicyDefinition policy_difinition = 1;
+    string policy_definition_name = 1;
+    repeated Statement statement_list = 2;
 }
 
 message ApplyPolicy {