Rename RFC7277 model artifacts

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

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

diff --git a/artifacts/pom.xml b/artifacts/pom.xml
index 7868639af08090007f0eed00db443f3829aeafb8..e5f50cf90f2f389d8595930c250e95cd17955c07 100644 (file)
--- a/artifacts/pom.xml
+++ b/artifacts/pom.xml
@@ -475,9 +475,9 @@
             <!-- RFC7277 -->
             <!-- FIXME: upgrade this to RFC8344 (2018-02-22, NMDA) -->
             <dependency>
-                <groupId>org.opendaylight.mdsal.model</groupId>
-                <artifactId>ietf-ip-2014-06-16</artifactId>
-                <version>2014.06.16.15.0-SNAPSHOT</version>
+                <groupId>org.opendaylight.mdsal.binding.model.ietf</groupId>
+                <artifactId>rfc7277</artifactId>
+                <version>1.2.0-SNAPSHOT</version>
             </dependency>
 
             <!-- RFC7895 -->

diff --git a/model/features/odl-mdsal-model-rfc7277/pom.xml b/model/features/odl-mdsal-model-rfc7277/pom.xml
index 26350526684cabce1c91c9b837ba91f1257a4e97..f6a238469d04ba7e2a47ba94b97c752a87e72d65 100644 (file)
--- a/model/features/odl-mdsal-model-rfc7277/pom.xml
+++ b/model/features/odl-mdsal-model-rfc7277/pom.xml
@@ -43,8 +43,8 @@
             <type>xml</type>
         </dependency>
         <dependency>
-            <groupId>${project.groupId}</groupId>
-            <artifactId>ietf-ip-2014-06-16</artifactId>
+            <groupId>org.opendaylight.mdsal.binding.model.ietf</groupId>
+            <artifactId>rfc7277</artifactId>
         </dependency>
     </dependencies>
 </project>

diff --git a/model/ietf/pom.xml b/model/ietf/pom.xml
index 2998cc14bb651f30f3b80fdf056c20e4a44df0f2..bd4e833a58045ea799b36c6085df041f68e202d3 100644 (file)
--- a/model/ietf/pom.xml
+++ b/model/ietf/pom.xml
@@ -35,9 +35,9 @@
         <!-- FIXME: superseded by RFC8343 -->
         <module>rfc7223</module>
 
-        <!-- RFC7277 -->
+        <!-- RFC7277 IP Management -->
         <!-- FIXME: superseded by RFC8344 -->
-        <module>ietf-ip-2014-06-16</module>
+        <module>rfc7277</module>
 
         <!-- RFC7895 YANG Module Library -->
         <module>rfc7895</module>

diff --git a/model/ietf/ietf-ip-2014-06-16/pom.xml b/model/ietf/rfc7277/pom.xml
similarity index 90%
rename from model/ietf/ietf-ip-2014-06-16/pom.xml
rename to model/ietf/rfc7277/pom.xml
index 8ce76cb5f4157c4dfcf499d607641af570b9c7e2..ac305e6657b3f3deb38ca5668e4065f954a8e311 100644 (file)
--- a/model/ietf/ietf-ip-2014-06-16/pom.xml
+++ b/model/ietf/rfc7277/pom.xml
@@ -18,9 +18,9 @@
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
-    <groupId>org.opendaylight.mdsal.model</groupId>
-    <artifactId>ietf-ip-2014-06-16</artifactId>
-    <version>2014.06.16.15.0-SNAPSHOT</version>
+    <groupId>org.opendaylight.mdsal.binding.model.ietf</groupId>
+    <artifactId>rfc7277</artifactId>
+    <version>1.2.0-SNAPSHOT</version>
     <name>${project.artifactId}</name>
     <description>${project.artifactId}</description>
     <packaging>bundle</packaging>

diff --git a/model/ietf/ietf-ip-2014-06-16/src/main/yang/ietf-ip@2014-06-16.yang b/model/ietf/rfc7277/src/main/yang/ietf-ip@2014-06-16.yang
similarity index 100%
rename from model/ietf/ietf-ip-2014-06-16/src/main/yang/ietf-ip@2014-06-16.yang
rename to model/ietf/rfc7277/src/main/yang/ietf-ip@2014-06-16.yang