config: make config/state variable name simple

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

10 files changed, 58 insertions, 58 deletions

diff --git a/docs/sources/bmp.md b/docs/sources/bmp.md
index d1515886..495a71d8 100644
--- a/docs/sources/bmp.md
+++ b/docs/sources/bmp.md
@@ -16,13 +16,13 @@ Add `[BmpServers]` section to enable BMP like below.
 
 ```toml
 [Global]
-  [Global.GlobalConfig]
+  [Global.Config]
     As = 64512
     RouterId = "192.168.255.1"
 
 [BmpServers]
   [[BmpServers.BmpServerList]]
-    [BmpServers.BmpServerList.BmpServerConfig]
+    [BmpServers.BmpServerList.Config]
       Address = "127.0.0.1"
       Port=11019
 ```
diff --git a/docs/sources/cli-operations.md b/docs/sources/cli-operations.md
index 66fbe367..dd1cc560 100644
--- a/docs/sources/cli-operations.md
+++ b/docs/sources/cli-operations.md
@@ -31,33 +31,33 @@ should be like the following.
 
 ```
 [Global]
-  [Global.GlobalConfig]
+  [Global.Config]
     As = 64512
     RouterId = "192.168.255.1"
 
 [Neighbors]
   [[Neighbors.NeighborList]]
-    [Neighbors.NeighborList.NeighborConfig]
+    [Neighbors.NeighborList.Config]
       NeighborAddress = "10.0.255.1"
       PeerAs = 65001
     [Neighbors.NeighborList.RouteServer]
-      [Neighbors.NeighborList.RouteServer.RouteServerConfig]
+      [Neighbors.NeighborList.RouteServer.Config]
         RouteServerClient = true
 
   [[Neighbors.NeighborList]]
-    [Neighbors.NeighborList.NeighborConfig]
+    [Neighbors.NeighborList.Config]
       NeighborAddress = "10.0.255.2"
       PeerAs = 65002
     [Neighbors.NeighborList.RouteServer]
-      [Neighbors.NeighborList.RouteServer.RouteServerConfig]
+      [Neighbors.NeighborList.RouteServer.Config]
         RouteServerClient = true
 
   [[Neighbors.NeighborList]]
-    [Neighbors.NeighborList.NeighborConfig]
+    [Neighbors.NeighborList.Config]
       NeighborAddress = "10.0.255.3"
       PeerAs = 65003
     [Neighbors.NeighborList.RouteServer]
-      [Neighbors.NeighborList.RouteServer.RouteServerConfig]
+      [Neighbors.NeighborList.RouteServer.Config]
         RouteServerClient = true
 ```
 
@@ -119,4 +119,4 @@ $ gobgp neighbor 10.0.255.1 softresetout
 ```
 
 
-You can know more about gobgp command syntax [here](https://github.com/osrg/gobgp/blob/master/docs/sources/cli-command-syntax.md).
\ No newline at end of file
+You can know more about gobgp command syntax [here](https://github.com/osrg/gobgp/blob/master/docs/sources/cli-command-syntax.md).
diff --git a/docs/sources/evpn.md b/docs/sources/evpn.md
index fb5d156f..71fef620 100644
--- a/docs/sources/evpn.md
+++ b/docs/sources/evpn.md
@@ -20,13 +20,13 @@ implementations can interchange EVPN messages.
 
 ```
 [Global]
-  [Global.GlobalConfig]
+  [Global.Config]
     As = 64512
     RouterId = "192.168.255.1"
 
 [Neighbors]
   [[Neighbors.NeighborList]]
-    [Neighbors.NeighborList.NeighborConfig]
+    [Neighbors.NeighborList.Config]
       NeighborAddress = "10.0.255.1"
       PeerAs = 64512
     [Neighbors.NeighborList.AfiSafis]
@@ -34,7 +34,7 @@ implementations can interchange EVPN messages.
         AfiSafiName = "l2vpn-evpn"
 
   [[Neighbors.NeighborList]]
-    [Neighbors.NeighborList.NeighborConfig]
+    [Neighbors.NeighborList.Config]
       NeighborAddress = "10.0.255.2"
       PeerAs = 64512
     [Neighbors.NeighborList.AfiSafis]
diff --git a/docs/sources/flowspec.md b/docs/sources/flowspec.md
index 6fbfb737..a55d68a9 100644
--- a/docs/sources/flowspec.md
+++ b/docs/sources/flowspec.md
@@ -19,13 +19,13 @@ afi-safi-list like below.
 
 ```toml
 [Global]
-  [Global.GlobalConfig]
+  [Global.Config]
     As = 64512
     RouterId = "192.168.255.1"
 
 [Neighbors]
   [[Neighbors.NeighborList]]
-    [Neighbors.NeighborList.NeighborConfig]
+    [Neighbors.NeighborList.Config]
       NeighborAddress = "10.0.255.1"
       PeerAs = 64512
     [Neighbors.NeighborList.AfiSafis]
diff --git a/docs/sources/getting-started.md b/docs/sources/getting-started.md
index 700703fc..d7929146 100644
--- a/docs/sources/getting-started.md
+++ b/docs/sources/getting-started.md
@@ -36,18 +36,18 @@ uses the following very simple configuration file, `gobgpd.conf`:
 ```
 $ cat gobgpd.conf
 [Global]
-  [Global.GlobalConfig]
+  [Global.Config]
     As = 64512
     RouterId = "192.168.255.1"
 
 [Neighbors]
   [[Neighbors.NeighborList]]
-    [Neighbors.NeighborList.NeighborConfig]
+    [Neighbors.NeighborList.Config]
       NeighborAddress = "10.0.255.1"
       PeerAs = 65001
 
   [[Neighbors.NeighborList]]
-    [Neighbors.NeighborList.NeighborConfig]
+    [Neighbors.NeighborList.Config]
       NeighborAddress = "10.0.255.2"
       PeerAs = 65002
 ```
diff --git a/docs/sources/mrt.md b/docs/sources/mrt.md
index 3a3ac6df..5818a8cc 100644
--- a/docs/sources/mrt.md
+++ b/docs/sources/mrt.md
@@ -93,16 +93,16 @@ Configuration is something like below.
 ```
 $ cat gobgpd.conf
 [Global]
-    [Global.GlobalConfig]
+    [Global.Config]
         As = 64512
         RouterId = "192.168.255.1"
 [Neighbors]
     [[Neighbors.NeighborList]]
-        [Neighbors.NeighborList.NeighborConfig]
+        [Neighbors.NeighborList.Config]
             NeighborAddress = "10.0.0.1"
             PeerAs = 65001
         [Neighbors.NeighborList.RouteServer]
-            [Neighbors.NeighborList.RouteServer.RouteServerConfig]
+            [Neighbors.NeighborList.RouteServer.Config]
             RouteServerClient = true
 ```
 
diff --git a/docs/sources/policy.md b/docs/sources/policy.md
index e48f1bb3..1e97be6b 100644
--- a/docs/sources/policy.md
+++ b/docs/sources/policy.md
@@ -760,14 +760,14 @@ This example attatches *policy1* to Import policy and *policy2* to Export policy
 ```
 [Neighbors]
   [[Neighbors.NeighborList]]
-    [Neighbors.NeighborList.NeighborConfig]
+    [Neighbors.NeighborList.Config]
       NeighborAddress = "10.0.255.2"
       PeerAs = 65002
     [Neighbors.NeighborList.RouteServer]
-      [Neighbors.NeighborList.RouteServer.RouteServerConfig]
+      [Neighbors.NeighborList.RouteServer.Config]
         RouteServerClient = true
     [Neighbors.NeighborList.ApplyPolicy]
-      [Neighbors.NeighborList.ApplyPolicy.ApplyPolicyConfig]
+      [Neighbors.NeighborList.ApplyPolicy.Config]
         ImportPolicy = ["policy1"]
         ExportPolicy = ["policy2"]
         InPolicy = ["policy3"]
@@ -812,30 +812,30 @@ define an import policy for neighbor 10.0.255.2 that drops
 
 [Neighbors]
   [[Neighbors.NeighborList]]
-    [Neighbors.NeighborList.NeighborConfig]
+    [Neighbors.NeighborList.Config]
       NeighborAddress = "10.0.255.1"
       PeerAs = 65001
     [Neighbors.NeighborList.RouteServer]
-      [Neighbors.NeighborList.RouteServer.RouteServerConfig]
+      [Neighbors.NeighborList.RouteServer.Config]
         RouteServerClient = true
 
   [[Neighbors.NeighborList]]
-    [Neighbors.NeighborList.NeighborConfig]
+    [Neighbors.NeighborList.Config]
       NeighborAddress = "10.0.255.2"
       PeerAs = 65002
     [Neighbors.NeighborList.RouteServer]
-      [Neighbors.NeighborList.RouteServer.RouteServerConfig]
+      [Neighbors.NeighborList.RouteServer.Config]
         RouteServerClient = true
     [Neighbors.NeighborList.ApplyPolicy]
-      [Neighbors.NeighborList.ApplyPolicy.ApplyPolicyConfig]
+      [Neighbors.NeighborList.ApplyPolicy.Config]
         ImportPolicy = ["pd2"]
 
   [[Neighbors.NeighborList]]
-    [Neighbors.NeighborList.NeighborConfig]
+    [Neighbors.NeighborList.Config]
       NeighborAddress = "10.0.255.3"
       PeerAs = 65003
     [Neighbors.NeighborList.RouteServer]
-      [Neighbors.NeighborList.RouteServer.RouteServerConfig]
+      [Neighbors.NeighborList.RouteServer.Config]
         RouteServerClient = true
 
 [DefinedSets]
diff --git a/docs/sources/route-reflector.md b/docs/sources/route-reflector.md
index c8fbce50..f640564b 100644
--- a/docs/sources/route-reflector.md
+++ b/docs/sources/route-reflector.md
@@ -13,30 +13,30 @@ The configuration below configures two route reflector clients and two normal iB
 
 ```toml
 [Global]
-  [Global.GlobalConfig]
+  [Global.Config]
     RouterId = "192.168.0.1"
     As = 65000
 [Neighbors]
   [[Neighbors.NeighborList]]
-    [Neighbors.NeighborList.NeighborConfig]
+    [Neighbors.NeighborList.Config]
       NeighborAddress = "192.168.10.2"
       PeerAs = 65000
-    [Neighbors.NeighborList.RouteReflector.RouteReflectorConfig]
+    [Neighbors.NeighborList.RouteReflector.Config]
       RouteReflectorClient = true
       RouteReflectorClusterId = "192.168.0.1"
   [[Neighbors.NeighborList]]
-    [Neighbors.NeighborList.NeighborConfig]
+    [Neighbors.NeighborList.Config]
       NeighborAddress = "192.168.10.3"
       PeerAs = 65000
-    [Neighbors.NeighborList.RouteReflector.RouteReflectorConfig]
+    [Neighbors.NeighborList.RouteReflector.Config]
       RouteReflectorClient = true
       RouteReflectorClusterId = "192.168.0.1"
   [[Neighbors.NeighborList]]
-    [Neighbors.NeighborList.NeighborConfig]
+    [Neighbors.NeighborList.Config]
       NeighborAddress = "192.168.10.4"
       PeerAs = 65000
   [[Neighbors.NeighborList]]
-    [Neighbors.NeighborList.NeighborConfig]
+    [Neighbors.NeighborList.Config]
       NeighborAddress = "192.168.10.5"
       PeerAs = 65000
 ```
diff --git a/docs/sources/route-server.md b/docs/sources/route-server.md
index 94751c77..f628e02a 100644
--- a/docs/sources/route-server.md
+++ b/docs/sources/route-server.md
@@ -18,33 +18,33 @@ the configuration file used in [Getting Started](https://github.com/osrg/gobgp/b
 ```
 $ cat gobgpd.conf
 [Global]
-  [Global.GlobalConfig]
+  [Global.Config]
     As = 64512
     RouterId = "192.168.255.1"
 
 [Neighbors]
   [[Neighbors.NeighborList]]
-    [Neighbors.NeighborList.NeighborConfig]
+    [Neighbors.NeighborList.Config]
       NeighborAddress = "10.0.255.1"
       PeerAs = 65001
       AuthPassword = "hoge1"
     [Neighbors.NeighborList.Transport]
-      [Neighbors.NeighborList.Transport.TransportConfig]
+      [Neighbors.NeighborList.Transport.Config]
         PassiveMode = true
     [Neighbors.NeighborList.RouteServer]
-      [Neighbors.NeighborList.RouteServer.RouteServerConfig]
+      [Neighbors.NeighborList.RouteServer.Config]
         RouteServerClient = true
 
   [[Neighbors.NeighborList]]
-    [Neighbors.NeighborList.NeighborConfig]
+    [Neighbors.NeighborList.Config]
       NeighborAddress = "10.0.255.2"
       PeerAs = 65002
       AuthPassword = "hoge2"
     [Neighbors.NeighborList.Transport]
-      [Neighbors.NeighborList.Transport.TransportConfig]
+      [Neighbors.NeighborList.Transport.Config]
         PassiveMode = true
     [Neighbors.NeighborList.RouteServer]
-      [Neighbors.NeighborList.RouteServer.RouteServerConfig]
+      [Neighbors.NeighborList.RouteServer.Config]
         RouteServerClient = true
 ```
 
diff --git a/docs/sources/rpki.md b/docs/sources/rpki.md
index 552b0c48..f80098ec 100644
--- a/docs/sources/rpki.md
+++ b/docs/sources/rpki.md
@@ -21,30 +21,30 @@ setup but RPKI can be used with non route server setup.
 
 ```toml
 [Global]
-  [Global.GlobalConfig]
+  [Global.Config]
     As = 64512
     RouterId = "10.0.255.254"
 
 [Neighbors]
   [[Neighbors.NeighborList]]
-    [Neighbors.NeighborList.NeighborConfig]
+    [Neighbors.NeighborList.Config]
       PeerAs = 65001
       NeighborAddress = "10.0.255.1"
     [Neighbors.NeighborList.RouteServer]
-      [Neighbors.NeighborList.RouteServer.RouteServerConfig]
+      [Neighbors.NeighborList.RouteServer.Config]
         RouteServerClient = true
 
   [[Neighbors.NeighborList]]
-    [Neighbors.NeighborList.NeighborConfig]
+    [Neighbors.NeighborList.Config]
       PeerAs = 65002
       NeighborAddress = "10.0.255.2"
     [Neighbors.NeighborList.RouteServer]
-      [Neighbors.NeighborList.RouteServer.RouteServerConfig]
+      [Neighbors.NeighborList.RouteServer.Config]
         RouteServerClient = true
 
 [RpkiServers]
   [[RpkiServers.RpkiServerList]]
-    [RpkiServers.RpkiServerList.RpkiServerConfig]
+    [RpkiServers.RpkiServerList.Config]
       Address = "210.173.170.254"
       Port = 323
 ```
@@ -126,33 +126,33 @@ We add a policy to the above configuration.
 
 ```toml
 [Global]
-  [Global.GlobalConfig]
+  [Global.Config]
     As = 64512
     RouterId = "10.0.255.254"
 
 [Neighbors]
   [[Neighbors.NeighborList]]
-    [Neighbors.NeighborList.NeighborConfig]
+    [Neighbors.NeighborList.Config]
       PeerAs = 65001
       NeighborAddress = "10.0.255.1"
     [Neighbors.NeighborList.RouteServer]
-      [Neighbors.NeighborList.RouteServer.RouteServerConfig]
+      [Neighbors.NeighborList.RouteServer.Config]
         RouteServerClient = true
 
   [[Neighbors.NeighborList]]
-    [Neighbors.NeighborList.NeighborConfig]
+    [Neighbors.NeighborList.Config]
       PeerAs = 65002
       NeighborAddress = "10.0.255.2"
     [Neighbors.NeighborList.RouteServer]
-      [Neighbors.NeighborList.RouteServer.RouteServerConfig]
+      [Neighbors.NeighborList.RouteServer.Config]
         RouteServerClient = true
     [Neighbors.NeighborList.ApplyPolicy]
-      [Neighbors.NeighborList.ApplyPolicy.ApplyPolicyConfig]
+      [Neighbors.NeighborList.ApplyPolicy.Config]
 	ImportPolicy = ["AS65002-IMPORT-RPKI"]
 
 [RpkiServers]
   [[RpkiServers.RpkiServerList]]
-    [RpkiServers.RpkiServerList.RpkiServerConfig]
+    [RpkiServers.RpkiServerList.Config]
       Address = "210.173.170.254"
       Port = 323