1 files changed, 43 insertions, 57 deletions

diff --git a/api/gobgp.proto b/api/gobgp.proto
index dd05d243..a33e92d1 100644
--- a/api/gobgp.proto
+++ b/api/gobgp.proto
@@ -240,9 +240,9 @@ message GetTableRequest {
 }
 
 message GetTableResponse {
-  uint64 num_destination = 4;
-  uint64 num_path = 5;
-  uint64 num_accepted = 6; // only meaningful when type == ADJ_IN
+  uint64 num_destination = 1;
+  uint64 num_path = 2;
+  uint64 num_accepted = 3; // only meaningful when type == ADJ_IN
 }
 
 message MonitorTableRequest {
@@ -501,7 +501,6 @@ message Path {
   int64 age = 3;
   bool best = 4;
   bool is_withdraw = 5;
-  int32 validation = 6; // remains for backword compatibility
   RPKIValidation validation_detail = 7;
   bool no_implicit_withdraw = 8;
   Family family = 9;
@@ -554,39 +553,31 @@ message TableLookupPrefix {
 }
 
 message Peer {
-  // Note: Regarding to the consistency with OpenConfig model, a list of
-  // address family should be removed from here, and should be configured with
-  // the list of AfiSafi instead.
-  repeated uint32 families = 1;
-  ApplyPolicy apply_policy = 2;
-  PeerConf conf = 3;
-  EbgpMultihop ebgp_multihop = 4;
-  RouteReflector route_reflector = 5;
-  PeerState state= 6;
-  Timers timers = 7;
-  Transport transport = 8;
-  RouteServer route_server = 9;
-  GracefulRestart graceful_restart = 10;
-  repeated AfiSafi afi_safis = 11;
-  AddPaths add_paths = 12;
+  ApplyPolicy apply_policy = 1;
+  PeerConf conf = 2;
+  EbgpMultihop ebgp_multihop = 3;
+  RouteReflector route_reflector = 4;
+  PeerState state = 5;
+  Timers timers = 6;
+  Transport transport = 7;
+  RouteServer route_server = 8;
+  GracefulRestart graceful_restart = 9;
+  repeated AfiSafi afi_safis = 10;
+  AddPaths add_paths = 11;
 }
 
 message PeerGroup {
-  // Note: Regarding to the consistency with OpenConfig model, a list of
-  // address family should be removed from here, and should be configured with
-  // the list of AfiSafi instead.
-  repeated uint32 families = 1;
-  ApplyPolicy apply_policy = 2;
-  PeerGroupConf conf = 3;
-  EbgpMultihop ebgp_multihop = 4;
-  RouteReflector route_reflector = 5;
-  PeerGroupState info = 6;
-  Timers timers = 7;
-  Transport transport = 8;
-  RouteServer route_server = 9;
-  GracefulRestart graceful_restart = 10;
-  repeated AfiSafi afi_safis = 11;
-  AddPaths add_paths = 12;
+  ApplyPolicy apply_policy = 1;
+  PeerGroupConf conf = 2;
+  EbgpMultihop ebgp_multihop = 3;
+  RouteReflector route_reflector = 4;
+  PeerGroupState info = 5;
+  Timers timers = 6;
+  Transport transport = 7;
+  RouteServer route_server = 8;
+  GracefulRestart graceful_restart = 9;
+  repeated AfiSafi afi_safis = 10;
+  AddPaths add_paths = 11;
 }
 
 message DynamicNeighbor {
@@ -627,51 +618,46 @@ message PeerConf {
   repeated google.protobuf.Any remote_cap = 11;
   repeated google.protobuf.Any local_cap = 12;
   string id = 13;
-  // Note: Regarding to the consistency with OpenConfig model, list of
-  // PrefixLimit should be removed from here, and list of PrefixLimit in
-  // AfiSafi should be used instead.
-  repeated PrefixLimit prefix_limits = 14;
-  string local_address = 15;
-  string neighbor_interface = 16;
-  string vrf = 17;
-  uint32 allow_own_as = 18;
-  bool replace_peer_as = 19;
+  string neighbor_interface = 14;
+  string vrf = 15;
+  uint32 allow_own_as = 16;
+  bool replace_peer_as = 17;
 }
 
 message PeerGroupConf {
   string auth_password = 1;
   string description = 2;
   uint32 local_as = 3;
-  uint32 peer_as = 5;
-  string peer_group_name = 6;
-  uint32 peer_type = 7;
+  uint32 peer_as = 4;
+  string peer_group_name = 5;
+  uint32 peer_type = 6;
   enum RemovePrivateAs {
       NONE = 0;
       ALL = 1;
       REPLACE = 2;
   }
-  RemovePrivateAs remove_private_as = 8;
-  bool route_flap_damping = 9;
-  uint32 send_community = 10;
+  RemovePrivateAs remove_private_as = 7;
+  bool route_flap_damping = 8;
+  uint32 send_community = 9;
 }
 
 message PeerGroupState {
   string auth_password = 1;
   string description = 2;
   uint32 local_as = 3;
-  uint32 peer_as = 5;
-  string peer_group_name = 6;
-  uint32 peer_type = 7;
+  uint32 peer_as = 4;
+  string peer_group_name = 5;
+  uint32 peer_type = 6;
   enum RemovePrivateAs {
       NONE = 0;
       ALL = 1;
       REPLACE = 2;
   }
-  RemovePrivateAs remove_private_as = 8;
-  bool route_flap_damping = 9;
-  uint32 send_community = 10;
-  uint32 total_paths = 11;
-  uint32 total_prefixes = 12;
+  RemovePrivateAs remove_private_as = 7;
+  bool route_flap_damping = 8;
+  uint32 send_community = 9;
+  uint32 total_paths = 10;
+  uint32 total_prefixes = 11;
 }
 
 message EbgpMultihop {