api: move remote_cap and local_cap to PeerState from PeerConf

Both should be in PeerState like OpenConfig.

Also remove unused supported_capabilities.

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

1 files changed, 10 insertions, 11 deletions

diff --git a/api/gobgp.proto b/api/gobgp.proto
index 10c9b90c..fde3a793 100644
--- a/api/gobgp.proto
+++ b/api/gobgp.proto
@@ -621,16 +621,12 @@ message PeerConf {
   RemovePrivateAs remove_private_as = 8;
   bool route_flap_damping = 9;
   uint32 send_community = 10;
-  // Each attribute must be one of *Capability defined in
-  // "api/capability.proto".
-  repeated google.protobuf.Any remote_cap = 11;
-  repeated google.protobuf.Any local_cap = 12;
-  string id = 13;
-  string neighbor_interface = 14;
-  string vrf = 15;
-  uint32 allow_own_as = 16;
-  bool replace_peer_as = 17;
-  bool admin_down = 18;
+  string id = 11;
+  string neighbor_interface = 12;
+  string vrf = 13;
+  uint32 allow_own_as = 14;
+  bool replace_peer_as = 15;
+  bool admin_down = 16;
 }
 
 message PeerGroupConf {
@@ -702,7 +698,6 @@ message PeerState {
     ESTABLISHED = 6;
   }
   SessionState session_state = 13;
-  repeated string supported_capabilities = 14;
   enum AdminState {
       UP = 0;
       DOWN = 1;
@@ -714,6 +709,10 @@ message PeerState {
   uint32 advertised = 18;
   uint32 out_q = 19;
   uint32 flops = 20;
+  // Each attribute must be one of *Capability defined in
+  // "api/capability.proto".
+  repeated google.protobuf.Any remote_cap = 21;
+  repeated google.protobuf.Any local_cap = 22;
 }
 
 message Messages {