config: remove unnecessary augment

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

3 files changed, 6 insertions, 22 deletions

diff --git a/config/bgp_configs.go b/config/bgp_configs.go
index 713c7821..ad7dd15e 100644
--- a/config/bgp_configs.go
+++ b/config/bgp_configs.go
@@ -842,6 +842,9 @@ type TransportState struct {
 	// original -> bgp:passive-mode
 	//bgp:passive-mode's original type is boolean
 	PassiveMode bool
+	// original -> bgp:local-address
+	//bgp:local-address's original type is union
+	LocalAddress string
 	// original -> bgp-op:local-port
 	//bgp-op:local-port's original type is inet:port-number
 	LocalPort uint16
@@ -851,9 +854,6 @@ type TransportState struct {
 	// original -> bgp-op:remote-port
 	//bgp-op:remote-port's original type is inet:port-number
 	RemotePort uint16
-	// original -> gobgp:local-address
-	//gobgp:local-address's original type is inet:ip-address
-	LocalAddress string
 }
 
 //struct for container bgp:config
@@ -866,8 +866,8 @@ type TransportConfig struct {
 	// original -> bgp:passive-mode
 	//bgp:passive-mode's original type is boolean
 	PassiveMode bool
-	// original -> gobgp:local-address
-	//gobgp:local-address's original type is inet:ip-address
+	// original -> bgp:local-address
+	//bgp:local-address's original type is union
 	LocalAddress string
 }
 
diff --git a/tools/pyang_plugins/bgpyang2golang.py b/tools/pyang_plugins/bgpyang2golang.py
index bbb8519e..599f41a3 100644
--- a/tools/pyang_plugins/bgpyang2golang.py
+++ b/tools/pyang_plugins/bgpyang2golang.py
@@ -561,9 +561,7 @@ _module_excluded = ["ietf-inet-types",
                     "ietf-yang-types",
                     ]
 
-_path_exclude = ["/bgp:bgp/bgp:neighbors/bgp:neighbor/bgp:transport/bgp:config/bgp:local-address",
-                 "/bgp:bgp/bgp:neighbors/bgp:neighbor/bgp:transport/bgp:state/bgp:local-address",
-                 "/rpol:routing-policy/rpol:defined-sets/rpol:neighbor-sets/rpol:neighbor-set/rpol:neighbor",
+_path_exclude = ["/rpol:routing-policy/rpol:defined-sets/rpol:neighbor-sets/rpol:neighbor-set/rpol:neighbor",
                  "/rpol:routing-policy/rpol:defined-sets/bgp-pol:bgp-defined-sets/bgp-pol:community-sets/bgp-pol:community-set/bgp-pol:community-member",
                  "/rpol:routing-policy/rpol:defined-sets/bgp-pol:bgp-defined-sets/bgp-pol:ext-community-sets/bgp-pol:ext-community-set/bgp-pol:ext-community-member",
                  "/rpol:routing-policy/rpol:defined-sets/bgp-pol:bgp-defined-sets/bgp-pol:as-path-sets/bgp-pol:as-path-set/bgp-pol:as-path-set-member"]
diff --git a/tools/pyang_plugins/gobgp.yang b/tools/pyang_plugins/gobgp.yang
index 4528d3ad..ff1099d5 100644
--- a/tools/pyang_plugins/gobgp.yang
+++ b/tools/pyang_plugins/gobgp.yang
@@ -513,20 +513,6 @@ module gobgp {
     uses gobgp-route-server-config-set;
   }
 
-  augment "/bgp:bgp/bgp:neighbors/bgp:neighbor/bgp:transport/bgp:config" {
-    description "neighbor's local ip address, whose type is inet:ip-address";
-    leaf local-address {
-        type inet:ip-address;
-    }
-  }
-
-  augment "/bgp:bgp/bgp:neighbors/bgp:neighbor/bgp:transport/bgp:state" {
-    description "neighbor's local ip address, whose type is inet:ip-address";
-    leaf local-address {
-      type inet:ip-address;
-    }
-  }
-
   augment "/bgp:bgp/bgp:global/bgp:apply-policy/bgp:config" {
     description "addtional policy";
     uses gobgp-in-policy;