api: rename NlriAny in api.Path to Nlri

Also rename PathAttrsAny to PathAttrs. Both are the first choice
rather than the binary format members.

Support SortType member to ListPathRequest to add an option to return
unordered paths.

Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>

1 files changed, 25 insertions, 20 deletions

diff --git a/api/gobgp.proto b/api/gobgp.proto
index 8541d2fe..10c9b90c 100644
--- a/api/gobgp.proto
+++ b/api/gobgp.proto
@@ -222,6 +222,11 @@ message ListPathRequest {
   string name = 2;
   Family family = 3;
   repeated TableLookupPrefix prefixes = 4;
+  enum SortType {
+    NONE = 0;
+    PREFIX = 1;
+  }
+  SortType sort_type = 5;
 }
 
 message ListPathResponse {
@@ -499,24 +504,6 @@ message RPKIValidation{
 }
 
 message Path {
-  bytes nlri = 1;
-  repeated bytes pattrs = 2;
-  google.protobuf.Timestamp age = 3;
-  bool best = 4;
-  bool is_withdraw = 5;
-  RPKIValidation validation_detail = 7;
-  bool no_implicit_withdraw = 8;
-  Family family = 9;
-  uint32 source_asn = 10;
-  string source_id = 11;
-  bool filtered = 12;
-  bool stale = 13;
-  bool is_from_external = 14;
-  string neighbor_ip = 15;
-  bytes uuid = 16; // only paths installed by AddPath API have this
-  bool is_nexthop_invalid = 17;
-  uint32 identifier = 18;
-  uint32 local_identifier = 19;
   // One of the following defined in "api/attribute.proto":
   // - IPAddressPrefix
   // - LabeledIPAddressPrefix
@@ -531,10 +518,28 @@ message Path {
   // - FlowSpecNLRI
   // - VPNFlowSpecNLRI
   // - OpaqueNLRI
-  google.protobuf.Any any_nlri = 20;
+  google.protobuf.Any nlri = 1;
   // Each attribute must be one of *Attribute defined in
   // "api/attribute.proto".
-  repeated google.protobuf.Any any_pattrs = 21;
+  repeated google.protobuf.Any pattrs = 2;
+  google.protobuf.Timestamp age = 3;
+  bool best = 4;
+  bool is_withdraw = 5;
+  RPKIValidation validation_detail = 7;
+  bool no_implicit_withdraw = 8;
+  Family family = 9;
+  uint32 source_asn = 10;
+  string source_id = 11;
+  bool filtered = 12;
+  bool stale = 13;
+  bool is_from_external = 14;
+  string neighbor_ip = 15;
+  bytes uuid = 16; // only paths installed by AddPath API have this
+  bool is_nexthop_invalid = 17;
+  uint32 identifier = 18;
+  uint32 local_identifier = 19;
+  bytes nlri_binary = 20;
+  repeated bytes pattrs_binary = 21;
 }
 
 message Destination {