zebra: make zebra config consistent with the rests

- split config and state
- move to Bgp structure (aligned with Rpki, Bmp, and Mrt)

Also makes zebra configured via GRPC channel.

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

1 files changed, 27 insertions, 17 deletions

diff --git a/tools/pyang_plugins/gobgp.yang b/tools/pyang_plugins/gobgp.yang
index c15f3bc6..325942f2 100644
--- a/tools/pyang_plugins/gobgp.yang
+++ b/tools/pyang_plugins/gobgp.yang
@@ -775,29 +775,39 @@ module gobgp {
     uses gobgp-mrt;
   }
 
-  augment "/bgp:bgp/bgp:global" {
-    description "zebra configuration";
-    container zebra {
-       description
-         "Configure connection to zebra";
-      leaf enabled {
-        type boolean;
-        description
-          "Configure enabling to connect to zebra.";
+  grouping zebra-config {
+    leaf enabled {
+      type boolean;
+      description
+        "Configure enabling to connect to zebra.";
+    }
+    leaf url {
+      type string;
+      description
+        "Configure url for zebra.";
+    }
+    leaf-list redistribute-route-type {
+      type identityref {
+        base ptypes:install-protocol-type;
       }
-      leaf url {
-        type string;
-        description
-          "Configure url for zebra.";
+    }
+  }
+
+  grouping zebra-set {
+    container zebra {
+      container config {
+        uses zebra-config;
       }
-      leaf-list redistribute-route-type {
-        type identityref {
-          base ptypes:install-protocol-type;
-        }
+      container state {
+        uses zebra-config;
       }
     }
   }
 
+  augment "/bgp:bgp" {
+    uses zebra-set;
+  }
+
   augment "/bgp:bgp/bgp:global" {
     container mpls-label-range {
       description "mpls labal range";