Clean up IETF module names

The primary key is the IETF module name, make sure that is reflected in
packaging. The basic idea here is that differing revisions and up
reflecting diffent package names.

This patch allows for differing revisions to exist based on standard
names and the revision -- whereas previously we used the document as a
starting point for the namespace.

JIRA: MDSAL-752
Change-Id: I3ea3f910d2c07dad8396c54fa03044ac6a4ad62b
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>

diff --git a/model/ietf/rfc6991-ietf-inet-types/pom.xml b/model/ietf/rfc6991-ietf-inet-types/pom.xml
index 714226d631de2fd2a9193cc568b6249d8d532eb7..1d7743ad1d2abc4a8511e33be68f3f71b90e0793 100644 (file)
--- a/model/ietf/rfc6991-ietf-inet-types/pom.xml
+++ b/model/ietf/rfc6991-ietf-inet-types/pom.xml
@@ -41,7 +41,7 @@
                 <artifactId>maven-bundle-plugin</artifactId>
                 <configuration>
                     <instructions>
-                        <Automatic-Module-Name>org.opendaylight.yang.gen.ietf.rfc6991.inet.types</Automatic-Module-Name>
+                        <Automatic-Module-Name>org.opendaylight.yang.gen.ietf.inet.types.rfc6991</Automatic-Module-Name>
                     </instructions>
                 </configuration>
             </plugin>

diff --git a/model/ietf/rfc6991-ietf-yang-types/pom.xml b/model/ietf/rfc6991-ietf-yang-types/pom.xml
index e0c6f926e9f43dc470b8ee1c6deb09d649c65378..233f8d4d8719a2d6b4174c901763c9f3880835e5 100644 (file)
--- a/model/ietf/rfc6991-ietf-yang-types/pom.xml
+++ b/model/ietf/rfc6991-ietf-yang-types/pom.xml
@@ -39,7 +39,7 @@
                 <artifactId>maven-bundle-plugin</artifactId>
                 <configuration>
                     <instructions>
-                        <Automatic-Module-Name>org.opendaylight.yang.gen.ietf.rfc6991.yang.types</Automatic-Module-Name>
+                        <Automatic-Module-Name>org.opendaylight.yang.gen.ietf.yang.types.rfc6991</Automatic-Module-Name>
                     </instructions>
                 </configuration>
             </plugin>

diff --git a/model/ietf/rfc7952/pom.xml b/model/ietf/rfc7952/pom.xml
index c5bb6a37193979a1ca8eaa3377e59ab03b811ef6..47bb84c48182b397c4e0bb2a64c3257566f1fb57 100644 (file)
--- a/model/ietf/rfc7952/pom.xml
+++ b/model/ietf/rfc7952/pom.xml
@@ -33,7 +33,7 @@
                 <artifactId>maven-bundle-plugin</artifactId>
                 <configuration>
                     <instructions>
-                        <Automatic-Module-Name>org.opendaylight.yang.gen.ietf.rfc7952</Automatic-Module-Name>
+                        <Automatic-Module-Name>org.opendaylight.yang.gen.ietf.yang.metadata.rfc7952</Automatic-Module-Name>
                     </instructions>
                 </configuration>
             </plugin>

diff --git a/model/ietf/rfc8040/pom.xml b/model/ietf/rfc8040/pom.xml
index 0ed5e7041c6e0ff63e115df7505a58dc620725ac..73dcf1633f4d7eae42b559ad428f634ee4b4a4a8 100644 (file)
--- a/model/ietf/rfc8040/pom.xml
+++ b/model/ietf/rfc8040/pom.xml
@@ -31,7 +31,7 @@
                 <artifactId>maven-bundle-plugin</artifactId>
                 <configuration>
                     <instructions>
-                        <Automatic-Module-Name>org.opendaylight.yang.gen.ietf.rfc8040</Automatic-Module-Name>
+                        <Automatic-Module-Name>org.opendaylight.yang.gen.ietf.restconf.rfc8040</Automatic-Module-Name>
                     </instructions>
                 </configuration>
             </plugin>

diff --git a/model/ietf/rfc8072/pom.xml b/model/ietf/rfc8072/pom.xml
index 88ad030eac03bf3fdd094df6a543c57ce2192662..9e25fbbd5252c2b525b264ecb3549871204ce4b3 100644 (file)
--- a/model/ietf/rfc8072/pom.xml
+++ b/model/ietf/rfc8072/pom.xml
@@ -38,7 +38,7 @@
                 <artifactId>maven-bundle-plugin</artifactId>
                 <configuration>
                     <instructions>
-                        <Automatic-Module-Name>org.opendaylight.yang.gen.ietf.rfc8072</Automatic-Module-Name>
+                        <Automatic-Module-Name>org.opendaylight.yang.gen.ietf.yang.patch.rfc8072</Automatic-Module-Name>
                     </instructions>
                 </configuration>
             </plugin>

diff --git a/model/ietf/rfc8294-ietf-routing-types/pom.xml b/model/ietf/rfc8294-ietf-routing-types/pom.xml
index 1c50d6666f5db7033893741a12965189f4d1c73d..c12ccaca304eef08e81646746342ec2230e40d5b 100644 (file)
--- a/model/ietf/rfc8294-ietf-routing-types/pom.xml
+++ b/model/ietf/rfc8294-ietf-routing-types/pom.xml
@@ -44,7 +44,7 @@
                 <artifactId>maven-bundle-plugin</artifactId>
                 <configuration>
                     <instructions>
-                        <Automatic-Module-Name>org.opendaylight.yang.gen.ietf.rfc8294.routing.types</Automatic-Module-Name>
+                        <Automatic-Module-Name>org.opendaylight.yang.gen.ietf.routing.types.rfc8294</Automatic-Module-Name>
                     </instructions>
                 </configuration>
             </plugin>

diff --git a/model/ietf/rfc8342-ietf-datastores/pom.xml b/model/ietf/rfc8342-ietf-datastores/pom.xml
index 73b35811714a36f7f0893430b99b61751bf12cd1..f145af517c31c06cd45308d36ef2f99397119390 100644 (file)
--- a/model/ietf/rfc8342-ietf-datastores/pom.xml
+++ b/model/ietf/rfc8342-ietf-datastores/pom.xml
@@ -33,7 +33,7 @@
                 <artifactId>maven-bundle-plugin</artifactId>
                 <configuration>
                     <instructions>
-                        <Automatic-Module-Name>org.opendaylight.yang.gen.ietf.rfc8342.datastore</Automatic-Module-Name>
+                        <Automatic-Module-Name>org.opendaylight.yang.gen.ietf.datastores.rfc8342</Automatic-Module-Name>
                     </instructions>
                 </configuration>
             </plugin>

diff --git a/model/ietf/rfc8342-ietf-origin/pom.xml b/model/ietf/rfc8342-ietf-origin/pom.xml
index 674b158a4c55b873b3e100843009fbaaf494ce53..9edb5f25e63a39faea965ddaabd17a4b6a07d2fa 100644 (file)
--- a/model/ietf/rfc8342-ietf-origin/pom.xml
+++ b/model/ietf/rfc8342-ietf-origin/pom.xml
@@ -40,7 +40,7 @@
                 <artifactId>maven-bundle-plugin</artifactId>
                 <configuration>
                     <instructions>
-                        <Automatic-Module-Name>org.opendaylight.yang.gen.ietf.rfc8342.origin</Automatic-Module-Name>
+                        <Automatic-Module-Name>org.opendaylight.yang.gen.ietf.origin.rfc8342</Automatic-Module-Name>
                     </instructions>
                 </configuration>
             </plugin>

diff --git a/model/ietf/rfc8343/pom.xml b/model/ietf/rfc8343/pom.xml
index 0c4fcc3d40e50baf249d98be86a32d435ff67381..dd070995c00e2e17ef699834cb7b2768e9af631b 100644 (file)
--- a/model/ietf/rfc8343/pom.xml
+++ b/model/ietf/rfc8343/pom.xml
@@ -40,7 +40,7 @@
                 <artifactId>maven-bundle-plugin</artifactId>
                 <configuration>
                     <instructions>
-                        <Automatic-Module-Name>org.opendaylight.yang.gen.ietf.rfc8343</Automatic-Module-Name>
+                        <Automatic-Module-Name>org.opendaylight.yang.gen.ietf.interfaces.rfc8343</Automatic-Module-Name>
                     </instructions>
                 </configuration>
             </plugin>

diff --git a/model/ietf/rfc8344/pom.xml b/model/ietf/rfc8344/pom.xml
index 6a4a16ade853821d923908c199f1ea3f622e51bf..f73b1c6625bac4d6c31cc8c65983c9d4c872f373 100644 (file)
--- a/model/ietf/rfc8344/pom.xml
+++ b/model/ietf/rfc8344/pom.xml
@@ -48,7 +48,7 @@
                 <artifactId>maven-bundle-plugin</artifactId>
                 <configuration>
                     <instructions>
-                        <Automatic-Module-Name>org.opendaylight.yang.gen.ietf.rfc8344</Automatic-Module-Name>
+                        <Automatic-Module-Name>org.opendaylight.yang.gen.ietf.ip.rfc8344</Automatic-Module-Name>
                     </instructions>
                 </configuration>
             </plugin>

diff --git a/model/ietf/rfc8345-ietf-network-state/pom.xml b/model/ietf/rfc8345-ietf-network-state/pom.xml
index bf7ae34f449d12de2cac584f31541be5af0e8d69..04ca4c6cdc432abb83a957d057785c3ad2a4cd0a 100644 (file)
--- a/model/ietf/rfc8345-ietf-network-state/pom.xml
+++ b/model/ietf/rfc8345-ietf-network-state/pom.xml
@@ -40,7 +40,7 @@
                 <artifactId>maven-bundle-plugin</artifactId>
                 <configuration>
                     <instructions>
-                        <Automatic-Module-Name>org.opendaylight.yang.gen.ietf.rfc8345.network.state</Automatic-Module-Name>
+                        <Automatic-Module-Name>org.opendaylight.yang.gen.ietf.network.state.rfc8345</Automatic-Module-Name>
                     </instructions>
                 </configuration>
             </plugin>

diff --git a/model/ietf/rfc8345-ietf-network-topology-state/pom.xml b/model/ietf/rfc8345-ietf-network-topology-state/pom.xml
index eef162009882355bea48e983e01319e5621b9944..9c002778c8c427a86d7ebb61aa3161b976af8044 100644 (file)
--- a/model/ietf/rfc8345-ietf-network-topology-state/pom.xml
+++ b/model/ietf/rfc8345-ietf-network-topology-state/pom.xml
@@ -44,7 +44,7 @@
                 <artifactId>maven-bundle-plugin</artifactId>
                 <configuration>
                     <instructions>
-                        <Automatic-Module-Name>org.opendaylight.yang.gen.ietf.rfc8345.network.topology.state</Automatic-Module-Name>
+                        <Automatic-Module-Name>org.opendaylight.yang.gen.ietf.network.topology.state.rfc8345</Automatic-Module-Name>
                     </instructions>
                 </configuration>
             </plugin>

diff --git a/model/ietf/rfc8345-ietf-network-topology/pom.xml b/model/ietf/rfc8345-ietf-network-topology/pom.xml
index 3ee3ded2de322765d23c5c930636ecac6230c0e1..c3ac8870aaeff43c0d9ffb167805a0e7e412bcb4 100644 (file)
--- a/model/ietf/rfc8345-ietf-network-topology/pom.xml
+++ b/model/ietf/rfc8345-ietf-network-topology/pom.xml
@@ -40,7 +40,7 @@
                 <artifactId>maven-bundle-plugin</artifactId>
                 <configuration>
                     <instructions>
-                        <Automatic-Module-Name>org.opendaylight.yang.gen.ietf.rfc8345.network.topology</Automatic-Module-Name>
+                        <Automatic-Module-Name>org.opendaylight.yang.gen.ietf.network.topology.rfc8345</Automatic-Module-Name>
                     </instructions>
                 </configuration>
             </plugin>

diff --git a/model/ietf/rfc8345-ietf-network/pom.xml b/model/ietf/rfc8345-ietf-network/pom.xml
index 4c690405a0d4fb9db34052185e6aac1b7bea4323..d25e984fe4bb9d2da7cdbc3fcb43c4d1476fd873 100644 (file)
--- a/model/ietf/rfc8345-ietf-network/pom.xml
+++ b/model/ietf/rfc8345-ietf-network/pom.xml
@@ -40,7 +40,7 @@
                 <artifactId>maven-bundle-plugin</artifactId>
                 <configuration>
                     <instructions>
-                        <Automatic-Module-Name>org.opendaylight.yang.gen.ietf.rfc8345.network</Automatic-Module-Name>
+                        <Automatic-Module-Name>org.opendaylight.yang.gen.ietf.network.rfc8345</Automatic-Module-Name>
                     </instructions>
                 </configuration>
             </plugin>

diff --git a/model/ietf/rfc8346-ietf-l3-unicast-topology-state/pom.xml b/model/ietf/rfc8346-ietf-l3-unicast-topology-state/pom.xml
index 2f09d6a84d29794a40c2005f4a8a580f67d68db5..f2df9507aa67848c107db7b1f43c8edc2e9a04ac 100644 (file)
--- a/model/ietf/rfc8346-ietf-l3-unicast-topology-state/pom.xml
+++ b/model/ietf/rfc8346-ietf-l3-unicast-topology-state/pom.xml
@@ -44,7 +44,7 @@
                 <artifactId>maven-bundle-plugin</artifactId>
                 <configuration>
                     <instructions>
-                        <Automatic-Module-Name>org.opendaylight.yang.gen.ietf.rfc8346.unicast.topology.state</Automatic-Module-Name>
+                        <Automatic-Module-Name>org.opendaylight.yang.gen.ietf.unicast.topology.state.rfc8346</Automatic-Module-Name>
                     </instructions>
                 </configuration>
             </plugin>

diff --git a/model/ietf/rfc8346-ietf-l3-unicast-topology/pom.xml b/model/ietf/rfc8346-ietf-l3-unicast-topology/pom.xml
index 7f3c7856f49d264cb10584437fe2a300daade294..0a8e6a41aa015709f4ebb576476734d4cc6843e7 100644 (file)
--- a/model/ietf/rfc8346-ietf-l3-unicast-topology/pom.xml
+++ b/model/ietf/rfc8346-ietf-l3-unicast-topology/pom.xml
@@ -44,7 +44,7 @@
                 <artifactId>maven-bundle-plugin</artifactId>
                 <configuration>
                     <instructions>
-                        <Automatic-Module-Name>org.opendaylight.yang.gen.ietf.rfc8346.unicast.topology</Automatic-Module-Name>
+                        <Automatic-Module-Name>org.opendaylight.yang.gen.ietf.unicast.topology.rfc8346</Automatic-Module-Name>
                     </instructions>
                 </configuration>
             </plugin>

diff --git a/model/ietf/rfc8348-ietf-hardware-state/pom.xml b/model/ietf/rfc8348-ietf-hardware-state/pom.xml
index 31be7b1f3175207d34fe03bc1ff53465c28fa6a7..59484eb387f78c3bb1c267801d76070eef352328 100644 (file)
--- a/model/ietf/rfc8348-ietf-hardware-state/pom.xml
+++ b/model/ietf/rfc8348-ietf-hardware-state/pom.xml
@@ -40,7 +40,7 @@
                 <artifactId>maven-bundle-plugin</artifactId>
                 <configuration>
                     <instructions>
-                        <Automatic-Module-Name>org.opendaylight.yang.gen.ietf.rfc8348.hardware.state</Automatic-Module-Name>
+                        <Automatic-Module-Name>org.opendaylight.yang.gen.ietf.hardware.state.rfc8348</Automatic-Module-Name>
                     </instructions>
                 </configuration>
             </plugin>

diff --git a/model/ietf/rfc8348-ietf-hardware/pom.xml b/model/ietf/rfc8348-ietf-hardware/pom.xml
index 433ffb1ff7a52f69d7d7787152517853b1684409..0ca7e76c12912064a0bba8675fd6085deef3cb5c 100644 (file)
--- a/model/ietf/rfc8348-ietf-hardware/pom.xml
+++ b/model/ietf/rfc8348-ietf-hardware/pom.xml
@@ -48,7 +48,7 @@
                 <artifactId>maven-bundle-plugin</artifactId>
                 <configuration>
                     <instructions>
-                        <Automatic-Module-Name>org.opendaylight.yang.gen.ietf.rfc8348.hardware</Automatic-Module-Name>
+                        <Automatic-Module-Name>org.opendaylight.yang.gen.ietf.hardware.rfc8348</Automatic-Module-Name>
                     </instructions>
                 </configuration>
             </plugin>

diff --git a/model/ietf/rfc8349-ietf-ipv4-unicast-routing/pom.xml b/model/ietf/rfc8349-ietf-ipv4-unicast-routing/pom.xml
index ad6d3c53ae9b151e30ffba558ee9c9a95316e7b6..5627fb7c62e276438aba2069a64a72ff5d77500e 100644 (file)
--- a/model/ietf/rfc8349-ietf-ipv4-unicast-routing/pom.xml
+++ b/model/ietf/rfc8349-ietf-ipv4-unicast-routing/pom.xml
@@ -44,7 +44,7 @@
                 <artifactId>maven-bundle-plugin</artifactId>
                 <configuration>
                     <instructions>
-                        <Automatic-Module-Name>org.opendaylight.yang.gen.ietf.rfc8349.ipv4.unicast.routing</Automatic-Module-Name>
+                        <Automatic-Module-Name>org.opendaylight.yang.gen.ietf.ipv4.unicast.routing.rfc8349</Automatic-Module-Name>
                     </instructions>
                 </configuration>
             </plugin>

diff --git a/model/ietf/rfc8349-ietf-ipv6-unicast-routing/pom.xml b/model/ietf/rfc8349-ietf-ipv6-unicast-routing/pom.xml
index e1d239df6dff4d00cd21f72cadc11be27cece21d..11f74b26fa2981ced114cdf66d9cf20d4b69c580 100644 (file)
--- a/model/ietf/rfc8349-ietf-ipv6-unicast-routing/pom.xml
+++ b/model/ietf/rfc8349-ietf-ipv6-unicast-routing/pom.xml
@@ -44,7 +44,7 @@
                 <artifactId>maven-bundle-plugin</artifactId>
                 <configuration>
                     <instructions>
-                        <Automatic-Module-Name>org.opendaylight.yang.gen.ietf.rfc8349.ipv6.unicast.routing</Automatic-Module-Name>
+                        <Automatic-Module-Name>org.opendaylight.yang.gen.ietf.ipv6.unicast.routing.rfc8349</Automatic-Module-Name>
                     </instructions>
                 </configuration>
             </plugin>

diff --git a/model/ietf/rfc8349-ietf-routing/pom.xml b/model/ietf/rfc8349-ietf-routing/pom.xml
index f1abb57aaf8f1685a480baad709716a56ee01128..09a3e199694e1727e3cc75e156b0c46e83699068 100644 (file)
--- a/model/ietf/rfc8349-ietf-routing/pom.xml
+++ b/model/ietf/rfc8349-ietf-routing/pom.xml
@@ -44,7 +44,7 @@
                 <artifactId>maven-bundle-plugin</artifactId>
                 <configuration>
                     <instructions>
-                        <Automatic-Module-Name>org.opendaylight.yang.gen.ietf.rfc8349.routing</Automatic-Module-Name>
+                        <Automatic-Module-Name>org.opendaylight.yang.gen.ietf.routing.rfc8349</Automatic-Module-Name>
                     </instructions>
                 </configuration>
             </plugin>

diff --git a/model/ietf/rfc8519-ietf-access-control-list/pom.xml b/model/ietf/rfc8519-ietf-access-control-list/pom.xml
index a3101bb25c4ac8e855cfda14bc2f8466efaaf2e5..35a1aaa09e2adaf89051c1c802f30aeaebfa8129 100644 (file)
--- a/model/ietf/rfc8519-ietf-access-control-list/pom.xml
+++ b/model/ietf/rfc8519-ietf-access-control-list/pom.xml
@@ -44,7 +44,7 @@
                 <artifactId>maven-bundle-plugin</artifactId>
                 <configuration>
                     <instructions>
-                        <Automatic-Module-Name>org.opendaylight.yang.gen.ietf.rfc8519.access.control.list</Automatic-Module-Name>
+                        <Automatic-Module-Name>org.opendaylight.yang.gen.ietf.access.control.list.rfc8519</Automatic-Module-Name>
                     </instructions>
                 </configuration>
             </plugin>

diff --git a/model/ietf/rfc8519-ietf-ethertypes/pom.xml b/model/ietf/rfc8519-ietf-ethertypes/pom.xml
index 065b8b7b7d13b8b9bb6fefeb02ac10463ca3ff7c..273c0785bcd48c0e4143ae2799eb0e3dad64f5fc 100644 (file)
--- a/model/ietf/rfc8519-ietf-ethertypes/pom.xml
+++ b/model/ietf/rfc8519-ietf-ethertypes/pom.xml
@@ -32,7 +32,7 @@
                 <artifactId>maven-bundle-plugin</artifactId>
                 <configuration>
                     <instructions>
-                        <Automatic-Module-Name>org.opendaylight.yang.gen.ietf.rfc8519.ethertypes</Automatic-Module-Name>
+                        <Automatic-Module-Name>org.opendaylight.yang.gen.ietf.ethertypes.rfc8519</Automatic-Module-Name>
                     </instructions>
                 </configuration>
             </plugin>

diff --git a/model/ietf/rfc8519-ietf-packet-fields/pom.xml b/model/ietf/rfc8519-ietf-packet-fields/pom.xml
index 7f155b268ea357689a32b891ceb213fe0e873044..17fae7da3b3f64a7f49cd95c4f019b4d488629e8 100644 (file)
--- a/model/ietf/rfc8519-ietf-packet-fields/pom.xml
+++ b/model/ietf/rfc8519-ietf-packet-fields/pom.xml
@@ -48,7 +48,7 @@
                 <artifactId>maven-bundle-plugin</artifactId>
                 <configuration>
                     <instructions>
-                        <Automatic-Module-Name>org.opendaylight.yang.gen.ietf.rfc8519.packet.fields</Automatic-Module-Name>
+                        <Automatic-Module-Name>org.opendaylight.yang.gen.ietf.packet.fields.rfc8519</Automatic-Module-Name>
                     </instructions>
                 </configuration>
             </plugin>

diff --git a/model/ietf/rfc8520-ietf-acldns/pom.xml b/model/ietf/rfc8520-ietf-acldns/pom.xml
index e6c57362e128ba1b91a4e3524a39726df7e7c5e3..f37cae6e6c17cfbd37cdf5e2f050d03dac3b91dd 100644 (file)
--- a/model/ietf/rfc8520-ietf-acldns/pom.xml
+++ b/model/ietf/rfc8520-ietf-acldns/pom.xml
@@ -40,7 +40,7 @@
                 <artifactId>maven-bundle-plugin</artifactId>
                 <configuration>
                     <instructions>
-                        <Automatic-Module-Name>org.opendaylight.yang.gen.ietf.rfc8520.acldns</Automatic-Module-Name>
+                        <Automatic-Module-Name>org.opendaylight.yang.gen.ietf.acldns.rfc8520</Automatic-Module-Name>
                     </instructions>
                 </configuration>
             </plugin>

diff --git a/model/ietf/rfc8520-ietf-mud/pom.xml b/model/ietf/rfc8520-ietf-mud/pom.xml
index 5bf4d3256ab1d03f24f3cb903a5e6246644c956d..a75e9e1f3a3e5535a476edbbcefd4f026ba54931 100644 (file)
--- a/model/ietf/rfc8520-ietf-mud/pom.xml
+++ b/model/ietf/rfc8520-ietf-mud/pom.xml
@@ -40,7 +40,7 @@
                 <artifactId>maven-bundle-plugin</artifactId>
                 <configuration>
                     <instructions>
-                        <Automatic-Module-Name>org.opendaylight.yang.gen.ietf.rfc8520.mud</Automatic-Module-Name>
+                        <Automatic-Module-Name>org.opendaylight.yang.gen.ietf.mud.rfc8520</Automatic-Module-Name>
                     </instructions>
                 </configuration>
             </plugin>

diff --git a/model/ietf/rfc8525/pom.xml b/model/ietf/rfc8525/pom.xml
index 2b7644e41f66800edd4e3d21542e6fa3cbf67a0f..b4d40b4bd8bce6189b9186b1b8c6cbf87ef0bd4c 100644 (file)
--- a/model/ietf/rfc8525/pom.xml
+++ b/model/ietf/rfc8525/pom.xml
@@ -45,7 +45,7 @@
                 <artifactId>maven-bundle-plugin</artifactId>
                 <configuration>
                     <instructions>
-                        <Automatic-Module-Name>org.opendaylight.yang.gen.ietf.rfc8525</Automatic-Module-Name>
+                        <Automatic-Module-Name>org.opendaylight.yang.gen.ietf.yang.library.rfc8525</Automatic-Module-Name>
                     </instructions>
                 </configuration>
             </plugin>

diff --git a/model/ietf/rfc8528/pom.xml b/model/ietf/rfc8528/pom.xml
index 8ffa1d7a94b4c1fbb092525a121bdd48faceff7b..330ee640381386941deceb1011a7aa33f46dc10c 100644 (file)
--- a/model/ietf/rfc8528/pom.xml
+++ b/model/ietf/rfc8528/pom.xml
@@ -44,7 +44,7 @@
                 <artifactId>maven-bundle-plugin</artifactId>
                 <configuration>
                     <instructions>
-                        <Automatic-Module-Name>org.opendaylight.yang.gen.ietf.rfc8528</Automatic-Module-Name>
+                        <Automatic-Module-Name>org.opendaylight.yang.gen.ietf.yang.schema.mount.rfc8528</Automatic-Module-Name>
                     </instructions>
                 </configuration>
             </plugin>

diff --git a/model/ietf/rfc8529/pom.xml b/model/ietf/rfc8529/pom.xml
index e727745f51ac42a8b79bfec9b07bbf466358287d..ca5749b1369591e304e06569004eb7e2acfd396f 100644 (file)
--- a/model/ietf/rfc8529/pom.xml
+++ b/model/ietf/rfc8529/pom.xml
@@ -44,7 +44,7 @@
                 <artifactId>maven-bundle-plugin</artifactId>
                 <configuration>
                     <instructions>
-                        <Automatic-Module-Name>org.opendaylight.yang.gen.ietf.rfc8529</Automatic-Module-Name>
+                        <Automatic-Module-Name>org.opendaylight.yang.gen.ietf.network.instance.rfc8529</Automatic-Module-Name>
                     </instructions>
                 </configuration>
             </plugin>

diff --git a/model/ietf/rfc8530/pom.xml b/model/ietf/rfc8530/pom.xml
index 1947faa8966cc85ffa7687686aca8321941991cb..2d15225668d20cad044a544ad256b85cf2266fbc 100644 (file)
--- a/model/ietf/rfc8530/pom.xml
+++ b/model/ietf/rfc8530/pom.xml
@@ -44,7 +44,7 @@
                 <artifactId>maven-bundle-plugin</artifactId>
                 <configuration>
                     <instructions>
-                        <Automatic-Module-Name>org.opendaylight.yang.gen.ietf.rfc8530</Automatic-Module-Name>
+                        <Automatic-Module-Name>org.opendaylight.yang.gen.ietf.logical.network.element.rfc8530</Automatic-Module-Name>
                     </instructions>
                 </configuration>
             </plugin>

diff --git a/model/ietf/rfc8542-ietf-dc-fabric-topology/pom.xml b/model/ietf/rfc8542-ietf-dc-fabric-topology/pom.xml
index 10ddfe87889a6f1d62ca885d75d072468b97a284..3975ee4f9181ad1286633e97511946aa77f5e731 100644 (file)
--- a/model/ietf/rfc8542-ietf-dc-fabric-topology/pom.xml
+++ b/model/ietf/rfc8542-ietf-dc-fabric-topology/pom.xml
@@ -44,7 +44,7 @@
                 <artifactId>maven-bundle-plugin</artifactId>
                 <configuration>
                     <instructions>
-                        <Automatic-Module-Name>org.opendaylight.yang.gen.ietf.rfc8542.dc.fabric.topology</Automatic-Module-Name>
+                        <Automatic-Module-Name>org.opendaylight.yang.gen.ietf.dc.fabric.topology.rfc8542</Automatic-Module-Name>
                     </instructions>
                 </configuration>
             </plugin>

diff --git a/model/ietf/rfc8542-ietf-dc-fabric-types/pom.xml b/model/ietf/rfc8542-ietf-dc-fabric-types/pom.xml
index ed78d090fe72adc147e1e7e05fde2e99426b6d41..07eead9fb67d96439abc9b46abe13958d493feed 100644 (file)
--- a/model/ietf/rfc8542-ietf-dc-fabric-types/pom.xml
+++ b/model/ietf/rfc8542-ietf-dc-fabric-types/pom.xml
@@ -40,7 +40,7 @@
                 <artifactId>maven-bundle-plugin</artifactId>
                 <configuration>
                     <instructions>
-                        <Automatic-Module-Name>org.opendaylight.yang.gen.ietf.rfc8542.dc.fabric.types</Automatic-Module-Name>
+                        <Automatic-Module-Name>org.opendaylight.yang.gen.ietf.dc.fabric.types.rfc8542</Automatic-Module-Name>
                     </instructions>
                 </configuration>
             </plugin>

diff --git a/model/ietf/rfc8776-ietf-te-packet-types/pom.xml b/model/ietf/rfc8776-ietf-te-packet-types/pom.xml
index bc93cbbea20f1eb5deaa1664dba132a90fd2fb77..1f509c24d45e7a71a480d856305e908434471f6b 100644 (file)
--- a/model/ietf/rfc8776-ietf-te-packet-types/pom.xml
+++ b/model/ietf/rfc8776-ietf-te-packet-types/pom.xml
@@ -40,7 +40,7 @@
                 <artifactId>maven-bundle-plugin</artifactId>
                 <configuration>
                     <instructions>
-                        <Automatic-Module-Name>org.opendaylight.yang.gen.ietf.rfc8776.te.packet.types</Automatic-Module-Name>
+                        <Automatic-Module-Name>org.opendaylight.yang.gen.ietf.te.packet.types.rfc8776</Automatic-Module-Name>
                     </instructions>
                 </configuration>
             </plugin>

diff --git a/model/ietf/rfc8776-ietf-te-types/pom.xml b/model/ietf/rfc8776-ietf-te-types/pom.xml
index bf4f2fffcbc53a3d5a4d321266a298d6e473611d..6c3b89b9aa985ac594eca427a59fddaabc724cee 100644 (file)
--- a/model/ietf/rfc8776-ietf-te-types/pom.xml
+++ b/model/ietf/rfc8776-ietf-te-types/pom.xml
@@ -39,7 +39,7 @@
                 <artifactId>maven-bundle-plugin</artifactId>
                 <configuration>
                     <instructions>
-                        <Automatic-Module-Name>org.opendaylight.yang.gen.ietf.rfc8776.te.types</Automatic-Module-Name>
+                        <Automatic-Module-Name>org.opendaylight.yang.gen.ietf.te.types.rfc8776</Automatic-Module-Name>
                     </instructions>
                 </configuration>
             </plugin>

diff --git a/model/ietf/rfc8795-ietf-te-topology-state/pom.xml b/model/ietf/rfc8795-ietf-te-topology-state/pom.xml
index 318c1382512fe086a8cc1d1f62f0db4d980bd6df..3f4967b7b069bf3ee322f3e18a9433364db90a4e 100644 (file)
--- a/model/ietf/rfc8795-ietf-te-topology-state/pom.xml
+++ b/model/ietf/rfc8795-ietf-te-topology-state/pom.xml
@@ -44,7 +44,7 @@
                 <artifactId>maven-bundle-plugin</artifactId>
                 <configuration>
                     <instructions>
-                        <Automatic-Module-Name>org.opendaylight.yang.gen.ietf.rfc8795.te.topology.state</Automatic-Module-Name>
+                        <Automatic-Module-Name>org.opendaylight.yang.gen.ietf.te.topology.state.rfc8795</Automatic-Module-Name>
                     </instructions>
                 </configuration>
             </plugin>

diff --git a/model/ietf/rfc8795-ietf-te-topology/pom.xml b/model/ietf/rfc8795-ietf-te-topology/pom.xml
index 2a09318ac369a20366f25cc6fb79df46de381401..ddb87498a53f0b09531aa3cfea0f9040b16f5a4b 100644 (file)
--- a/model/ietf/rfc8795-ietf-te-topology/pom.xml
+++ b/model/ietf/rfc8795-ietf-te-topology/pom.xml
@@ -44,7 +44,7 @@
                 <artifactId>maven-bundle-plugin</artifactId>
                 <configuration>
                     <instructions>
-                        <Automatic-Module-Name>org.opendaylight.yang.gen.ietf.rfc8795.te.topology</Automatic-Module-Name>
+                        <Automatic-Module-Name>org.opendaylight.yang.gen.ietf.te.topology.rfc8795</Automatic-Module-Name>
                     </instructions>
                 </configuration>
             </plugin>

diff --git a/model/ietf/rfc8819-ietf-module-tags-state/pom.xml b/model/ietf/rfc8819-ietf-module-tags-state/pom.xml
index 154467c61e6c1e596550da6285a04f5e4e22443d..bfa6dff4ef5c668b46a67a6364083d7db52cc5ce 100644 (file)
--- a/model/ietf/rfc8819-ietf-module-tags-state/pom.xml
+++ b/model/ietf/rfc8819-ietf-module-tags-state/pom.xml
@@ -44,7 +44,7 @@
                 <artifactId>maven-bundle-plugin</artifactId>
                 <configuration>
                     <instructions>
-                        <Automatic-Module-Name>org.opendaylight.yang.gen.ietf.rfc8819.module.tags.state</Automatic-Module-Name>
+                        <Automatic-Module-Name>org.opendaylight.yang.gen.ietf.module.tags.state.rfc8819</Automatic-Module-Name>
                     </instructions>
                 </configuration>
             </plugin>

diff --git a/model/ietf/rfc8819-ietf-module-tags/pom.xml b/model/ietf/rfc8819-ietf-module-tags/pom.xml
index 6bb0d73f171d19ee91fbef1e39dc0b5578c7d44a..a14c3cf0e03c2f5190071e544c84602e8941b930 100644 (file)
--- a/model/ietf/rfc8819-ietf-module-tags/pom.xml
+++ b/model/ietf/rfc8819-ietf-module-tags/pom.xml
@@ -40,7 +40,7 @@
                 <artifactId>maven-bundle-plugin</artifactId>
                 <configuration>
                     <instructions>
-                        <Automatic-Module-Name>org.opendaylight.yang.gen.ietf.rfc8819.module.tags</Automatic-Module-Name>
+                        <Automatic-Module-Name>org.opendaylight.yang.gen.ietf.module.tags.rfc8819</Automatic-Module-Name>
                     </instructions>
                 </configuration>
             </plugin>