policy: another cleanup

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

1 files changed, 16 insertions, 9 deletions

diff --git a/api/gobgp.proto b/api/gobgp.proto
index b91ef183..7ef404f4 100644
--- a/api/gobgp.proto
+++ b/api/gobgp.proto
@@ -43,6 +43,8 @@ service GobgpApi {
   rpc GetROA(Arguments) returns (stream ROA) {}
   rpc GetVrfs(Arguments) returns (stream Vrf) {}
   rpc ModVrf(ModVrfArguments) returns (Error) {}
+  rpc GetDefinedSet(DefinedSet) returns (DefinedSet) {}
+  rpc GetDefinedSets(DefinedSet) returns (stream DefinedSet) {}
 }
 
 message Error {
@@ -177,10 +179,21 @@ message Prefix {
     uint32 mask_length_max = 3;
 }
 
+message DefinedSet {
+    int32 type = 1;
+    string name = 2;
+    repeated string list = 3;
+    repeated Prefix prefixes = 4;
+}
+
 message PrefixSet {
     string name = 1;
-    repeated Prefix list = 2;
-    int32 option = 3;
+    int32 option = 2;
+}
+
+message MatchSet {
+    string name = 1;
+    int32 option = 2;
 }
 
 message AsPathLength {
@@ -188,12 +201,6 @@ message AsPathLength {
     int32 type = 2;
 }
 
-message MatchSet {
-    string name = 1;
-    repeated string list = 2;
-    int32 option = 3;
-}
-
 message Conditions {
     PrefixSet prefix_set = 1;
     MatchSet neighbor_set = 2;
@@ -253,7 +260,7 @@ enum PolicyType {
 
 message ApplyPolicy {
     PolicyType type = 1;
-    repeated PolicyDefinition policies = 2;
+    repeated string policies = 2;
     RouteAction default = 3;
 }