BUG-4197: use yang-ext's augment-identifier

-make sure that generated java APIs for augmentation have
always the same name.

Change-Id: I859460ca6265a5e52148af22d45d638b4d54030f
Signed-off-by: Milos Fabian <milfabia@cisco.com>

diff --git a/bgp/openconfig-api/pom.xml b/bgp/openconfig-api/pom.xml
index 53ad1e2369141849b29fc59969de091c28fa714e..2452db6c62b0f2910d010edd6356b385f35e6431 100644 (file)
--- a/bgp/openconfig-api/pom.xml
+++ b/bgp/openconfig-api/pom.xml
@@ -56,6 +56,10 @@
             <groupId>com.google.guava</groupId>
             <artifactId>guava</artifactId>
         </dependency>
+        <dependency>
+            <groupId>org.opendaylight.mdsal.model</groupId>
+            <artifactId>yang-ext</artifactId>
+        </dependency>
 
         <!-- test dependencies -->
         <dependency>

diff --git a/bgp/openconfig-api/src/main/yang/bgp.yang b/bgp/openconfig-api/src/main/yang/bgp.yang
index c2ab21372924c40690f520bb3827c1763455e2d0..be93d57e0e32c6331d89d9b51eb621e7340e8614 100644 (file)
--- a/bgp/openconfig-api/src/main/yang/bgp.yang
+++ b/bgp/openconfig-api/src/main/yang/bgp.yang
@@ -13,6 +13,7 @@ module bgp {
   import routing-policy { prefix rpol; revision-date 2015-05-15; }
   import bgp-types { prefix bgp-types; revision-date 2015-05-15; }
   import bgp-operational { prefix bgp-op; revision-date 2015-05-15; }
+  import yang-ext { prefix ext; revision-date 2013-07-09; }
 
   // meta
   organization
@@ -808,6 +809,7 @@ module bgp {
     description
       "Augmentation to allow association of a neighbor with a
       peer-group";
+    ext:augment-identifier config-1;
     uses bgp-neighbor-peer-group_config;
   }
 
@@ -815,6 +817,7 @@ module bgp {
     description
       "Augmentation to reflect the association of a neighbor with a
       peer-group";
+    ext:augment-identifier state-1;
     uses bgp-neighbor-peer-group_config;
   }
 
@@ -861,6 +864,7 @@ module bgp {
   }
 
   augment /bgp/neighbors/neighbor/config {
+    ext:augment-identifier config-2;
     description
       "Augmentation adding the neighbor address to the
       neighbor configuration container";
@@ -868,6 +872,7 @@ module bgp {
   }
 
   augment /bgp/neighbors/neighbor/state {
+    ext:augment-identifier state-2;
     description
       "Augmentation adding the neighbor address to the
       neighbor state container";
@@ -875,6 +880,7 @@ module bgp {
   }
 
   augment /bgp/peer-groups/peer-group/config {
+    ext:augment-identifier config-3;
     description
       "Augmentation adding the peer-group name to the
       peer-group configuration container";
@@ -882,6 +888,7 @@ module bgp {
   }
 
   augment /bgp/peer-groups/peer-group/state {
+    ext:augment-identifier state-3;
     description
       "Augmentation adding the peer-group name to the
       peer-group state container";