Rename RFC7223 model artifacts

This patch renames ietf-interfaces artifact to follow unified naming.

Change-Id: Ibc615bc78f16a2b7f281e5eba4ed58f137a0b982
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>

diff --git a/artifacts/pom.xml b/artifacts/pom.xml
index 7eeda33a322622d7f34634a93af87874948c8ea6..7868639af08090007f0eed00db443f3829aeafb8 100644 (file)
--- a/artifacts/pom.xml
+++ b/artifacts/pom.xml
@@ -460,9 +460,9 @@
             <!-- RFC7223 -->
             <!-- FIXME: upgrade this to RFC8343 (2018-02-20, NMDA) -->
             <dependency>
-                <groupId>org.opendaylight.mdsal.model</groupId>
-                <artifactId>ietf-interfaces</artifactId>
-                <version>2014.05.08.15.0-SNAPSHOT</version>
+                <groupId>org.opendaylight.mdsal.binding.model.ietf</groupId>
+                <artifactId>rfc7223</artifactId>
+                <version>1.2.0-SNAPSHOT</version>
             </dependency>
 
             <!-- RFC7224, live version lives here: https://github.com/YangModels/yang/blob/master/standard/ietf/RFC/iana-if-type.yang -->

diff --git a/model/features/odl-mdsal-model-rfc7223/pom.xml b/model/features/odl-mdsal-model-rfc7223/pom.xml
index a66978330bee67188f99d854ef76973634ac3ab5..6046c270698b4963d2b70478852f1566e6e9d030 100644 (file)
--- a/model/features/odl-mdsal-model-rfc7223/pom.xml
+++ b/model/features/odl-mdsal-model-rfc7223/pom.xml
@@ -43,8 +43,8 @@
             <type>xml</type>
         </dependency>
         <dependency>
-            <groupId>${project.groupId}</groupId>
-            <artifactId>ietf-interfaces</artifactId>
+            <groupId>org.opendaylight.mdsal.binding.model.ietf</groupId>
+            <artifactId>rfc7223</artifactId>
         </dependency>
     </dependencies>
 </project>

diff --git a/model/iana/iana-if-type-2014-05-08/pom.xml b/model/iana/iana-if-type-2014-05-08/pom.xml
index 590be7bf97f38c70b5616fe3aa3da459776177d5..abca2596f30e665f15084dc24a3e9e98bb24d83c 100644 (file)
--- a/model/iana/iana-if-type-2014-05-08/pom.xml
+++ b/model/iana/iana-if-type-2014-05-08/pom.xml
@@ -26,8 +26,8 @@
 
     <dependencies>
         <dependency>
-            <groupId>org.opendaylight.mdsal.model</groupId>
-            <artifactId>ietf-interfaces</artifactId>
+            <groupId>org.opendaylight.mdsal.binding.model.ietf</groupId>
+            <artifactId>rfc7223</artifactId>
         </dependency>
     </dependencies>
 </project>

diff --git a/model/ietf/ietf-ip-2014-06-16/pom.xml b/model/ietf/ietf-ip-2014-06-16/pom.xml
index d98181419f29569b492b720bbff81e02fc28c7c8..8ce76cb5f4157c4dfcf499d607641af570b9c7e2 100644 (file)
--- a/model/ietf/ietf-ip-2014-06-16/pom.xml
+++ b/model/ietf/ietf-ip-2014-06-16/pom.xml
@@ -27,12 +27,12 @@
 
     <dependencies>
         <dependency>
-            <groupId>org.opendaylight.mdsal.model</groupId>
-            <artifactId>ietf-interfaces</artifactId>
+            <groupId>org.opendaylight.mdsal.binding.model.ietf</groupId>
+            <artifactId>rfc6991</artifactId>
         </dependency>
         <dependency>
             <groupId>org.opendaylight.mdsal.binding.model.ietf</groupId>
-            <artifactId>rfc6991</artifactId>
+            <artifactId>rfc7223</artifactId>
         </dependency>
     </dependencies>
 </project>

diff --git a/model/ietf/ietf-packet-fields/pom.xml b/model/ietf/ietf-packet-fields/pom.xml
index 516a96f1c618f2ab33fab0e38b2a6b0075a21c43..e229cccdd24bcf517ae480e5240810ec6d09d42c 100644 (file)
--- a/model/ietf/ietf-packet-fields/pom.xml
+++ b/model/ietf/ietf-packet-fields/pom.xml
@@ -30,8 +30,8 @@
             <artifactId>rfc6991</artifactId>
         </dependency>
         <dependency>
-            <groupId>org.opendaylight.mdsal.model</groupId>
-            <artifactId>ietf-interfaces</artifactId>
+            <groupId>org.opendaylight.mdsal.binding.model.ietf</groupId>
+            <artifactId>rfc7223</artifactId>
         </dependency>
     </dependencies>
 </project>

diff --git a/model/ietf/pom.xml b/model/ietf/pom.xml
index d9f333b017b53f2691d12cf3456d31ec164d8633..2998cc14bb651f30f3b80fdf056c20e4a44df0f2 100644 (file)
--- a/model/ietf/pom.xml
+++ b/model/ietf/pom.xml
@@ -31,9 +31,9 @@
         <module>rfc6991-ietf-yang-types</module>
         <module>ietf-type-util</module>
 
-        <!-- RFC7223 -->
+        <!-- RFC7223 Interface Management -->
         <!-- FIXME: superseded by RFC8343 -->
-        <module>ietf-interfaces</module>
+        <module>rfc7223</module>
 
         <!-- RFC7277 -->
         <!-- FIXME: superseded by RFC8344 -->

diff --git a/model/ietf/ietf-interfaces/pom.xml b/model/ietf/rfc7223/pom.xml
similarity index 89%
rename from model/ietf/ietf-interfaces/pom.xml
rename to model/ietf/rfc7223/pom.xml
index efa784ac580bfa6c98cb4aef778cc27a4ac7f74d..0dd60bbb473e2dc0f71fb2e963b5301b7b34e7b2 100644 (file)
--- a/model/ietf/ietf-interfaces/pom.xml
+++ b/model/ietf/rfc7223/pom.xml
@@ -17,9 +17,9 @@
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
-    <groupId>org.opendaylight.mdsal.model</groupId>
-    <artifactId>ietf-interfaces</artifactId>
-    <version>2014.05.08.15.0-SNAPSHOT</version>
+    <groupId>org.opendaylight.mdsal.binding.model.ietf</groupId>
+    <artifactId>rfc7223</artifactId>
+    <version>1.2.0-SNAPSHOT</version>
     <name>${project.artifactId}</name>
     <description>${project.artifactId}</description>
     <packaging>bundle</packaging>

diff --git a/model/ietf/ietf-interfaces/src/main/yang/ietf-interfaces@2014-05-08.yang b/model/ietf/rfc7223/src/main/yang/ietf-interfaces@2014-05-08.yang
similarity index 100%
rename from model/ietf/ietf-interfaces/src/main/yang/ietf-interfaces@2014-05-08.yang
rename to model/ietf/rfc7223/src/main/yang/ietf-interfaces@2014-05-08.yang