From 850053e4f94518a3fb1b5187f1963e18e997f904 Mon Sep 17 00:00:00 2001
From: Robert Varga <robert.varga@pantheon.tech>
Date: Thu, 30 Aug 2018 14:02:37 +0200
Subject: [PATCH] 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>
---
 artifacts/pom.xml                                           | 6 +++---
 model/features/odl-mdsal-model-rfc7223/pom.xml              | 4 ++--
 model/iana/iana-if-type-2014-05-08/pom.xml                  | 4 ++--
 model/ietf/ietf-ip-2014-06-16/pom.xml                       | 6 +++---
 model/ietf/ietf-packet-fields/pom.xml                       | 4 ++--
 model/ietf/pom.xml                                          | 4 ++--
 model/ietf/{ietf-interfaces => rfc7223}/pom.xml             | 6 +++---
 .../src/main/yang/ietf-interfaces@2014-05-08.yang           | 0
 8 files changed, 17 insertions(+), 17 deletions(-)
 rename model/ietf/{ietf-interfaces => rfc7223}/pom.xml (89%)
 rename model/ietf/{ietf-interfaces => rfc7223}/src/main/yang/ietf-interfaces@2014-05-08.yang (100%)

diff --git a/artifacts/pom.xml b/artifacts/pom.xml
index 7eeda33a32..7868639af0 100644
--- 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 a66978330b..6046c27069 100644
--- 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 590be7bf97..abca2596f3 100644
--- 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 d98181419f..8ce76cb5f4 100644
--- 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 516a96f1c6..e229cccdd2 100644
--- 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 d9f333b017..2998cc14bb 100644
--- 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 efa784ac58..0dd60bbb47 100644
--- 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
-- 
2.36.6