Refactor standard model placement

Rather than having standards models scattered throughout the repository,
dedicate a namespace, org.opendaylight.netconf.model, and a top-level
directory to hold them.

JIRA: NETCONF-890
Change-Id: I4bc667a3b4977bc00b929e6c03472952f6d3dcad
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>

diff --git a/artifacts/pom.xml b/artifacts/pom.xml
index 063baf2586737377ab5d4f8f514a891108de1e3f..7de87264be8e1bf97b2e76abe4f1e4357aaec279 100644 (file)
--- a/artifacts/pom.xml
+++ b/artifacts/pom.xml
@@ -123,47 +123,71 @@
                 <version>${project.version}</version>
             </dependency>
 
+            <!-- YANG models -->
+            <!-- RFC5277 NETCONF Event Notifications -->
             <dependency>
-                <groupId>${project.groupId}</groupId>
-                <artifactId>ietf-netconf</artifactId>
+                <groupId>org.opendaylight.netconf.model</groupId>
+                <artifactId>rfc5277</artifactId>
                 <version>${project.version}</version>
             </dependency>
-
+            <!-- RFC6022 YANG Module for NETCONF Monitoring -->
             <dependency>
-                <groupId>${project.groupId}</groupId>
-                <artifactId>ietf-netconf-acm</artifactId>
+                <groupId>org.opendaylight.netconf.model</groupId>
+                <artifactId>rfc6022</artifactId>
                 <version>${project.version}</version>
             </dependency>
-
+            <!-- RFC6241 Network Configuration Protocol (NETCONF) -->
             <dependency>
-                <groupId>${project.groupId}</groupId>
-                <artifactId>ietf-netconf-monitoring</artifactId>
+                <groupId>org.opendaylight.netconf.model</groupId>
+                <artifactId>rfc6241</artifactId>
                 <version>${project.version}</version>
             </dependency>
+            <!-- RFC6243 With-defaults Capability for NETCONF -->
             <dependency>
-                <groupId>${project.groupId}</groupId>
-                <artifactId>ietf-netconf-monitoring-extension</artifactId>
+                <groupId>org.opendaylight.netconf.model</groupId>
+                <artifactId>rfc6243</artifactId>
                 <version>${project.version}</version>
             </dependency>
-
+            <!-- RFC6470 Network Configuration Protocol (NETCONF) Base Notifications -->
             <dependency>
-                <groupId>${project.groupId}</groupId>
-                <artifactId>ietf-netconf-nmda</artifactId>
+                <groupId>org.opendaylight.netconf.model</groupId>
+                <artifactId>rfc6470</artifactId>
                 <version>${project.version}</version>
             </dependency>
-
+            <!-- RFC8040 RESTCONF Protocol
+                 Note that ietf-restconf is packaged in MD-SAL -->
             <dependency>
-                <groupId>${project.groupId}</groupId>
-                <artifactId>ietf-netconf-notifications</artifactId>
+                <groupId>org.opendaylight.netconf.model</groupId>
+                <artifactId>rfc8040-ietf-restconf-monitoring</artifactId>
+                <version>${project.version}</version>
+            </dependency>
+            <!-- RFC8341 Network Configuration Access Control Model -->
+            <dependency>
+                <groupId>org.opendaylight.netconf.model</groupId>
+                <artifactId>rfc8341</artifactId>
+                <version>${project.version}</version>
+            </dependency>
+            <!-- RFC8526 NETCONF Extensions to Support NMDA -->
+            <dependency>
+                <groupId>org.opendaylight.netconf.model</groupId>
+                <artifactId>rfc8526</artifactId>
+                <version>${project.version}</version>
+            </dependency>
+            <!-- RFC8639 Subscription to YANG Notifications -->
+            <dependency>
+                <groupId>org.opendaylight.netconf.model</groupId>
+                <artifactId>rfc8639</artifactId>
                 <version>${project.version}</version>
             </dependency>
 
+            <!-- FIXME: NETCONF-891: replace this model -->
             <dependency>
                 <groupId>${project.groupId}</groupId>
-                <artifactId>ietf-netconf-with-defaults</artifactId>
+                <artifactId>ietf-netconf-monitoring-extension</artifactId>
                 <version>${project.version}</version>
             </dependency>
 
+            <!-- FIXME: place these models with their users -->
             <dependency>
                 <groupId>${project.groupId}</groupId>
                 <artifactId>netconf-test-models</artifactId>
@@ -464,16 +488,6 @@
             </dependency>
 
             <!-- RESTCONF -->
-            <dependency>
-                <groupId>${project.groupId}</groupId>
-                <artifactId>ietf-restconf-monitoring</artifactId>
-                <version>${project.version}</version>
-            </dependency>
-            <dependency>
-                <groupId>${project.groupId}</groupId>
-                <artifactId>ietf-subscribed-notifications</artifactId>
-                <version>${project.version}</version>
-            </dependency>
             <dependency>
                 <groupId>${project.groupId}</groupId>
                 <artifactId>restconf-common-models</artifactId>

diff --git a/features/netconf/odl-netconf-api/pom.xml b/features/netconf/odl-netconf-api/pom.xml
index e549e3522d7fe459d3a2b8f6799aaf1ed6b19b5f..0db7ea92e0676c134102b3e52257cec13e8a6bb1 100644 (file)
--- a/features/netconf/odl-netconf-api/pom.xml
+++ b/features/netconf/odl-netconf-api/pom.xml
@@ -59,12 +59,16 @@
             <artifactId>ietf-netconf-monitoring-extension</artifactId>
         </dependency>
         <dependency>
-            <groupId>org.opendaylight.netconf</groupId>
-            <artifactId>ietf-netconf-notifications</artifactId>
+            <groupId>org.opendaylight.netconf.model</groupId>
+            <artifactId>rfc5277</artifactId>
         </dependency>
         <dependency>
-            <groupId>org.opendaylight.netconf</groupId>
-            <artifactId>ietf-netconf-nmda</artifactId>
+            <groupId>org.opendaylight.netconf.model</groupId>
+            <artifactId>rfc6470</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.opendaylight.netconf.model</groupId>
+            <artifactId>rfc8526</artifactId>
         </dependency>
     </dependencies>
 </project>

diff --git a/features/restconf/odl-restconf-common/pom.xml b/features/restconf/odl-restconf-common/pom.xml
index 5a62998796a8b4d064e8464422cf774daba963b4..3747f8c81efa71d8aaa67520ab0d385104f7b870 100644 (file)
--- a/features/restconf/odl-restconf-common/pom.xml
+++ b/features/restconf/odl-restconf-common/pom.xml
@@ -59,8 +59,8 @@
         </dependency>
 
         <dependency>
-            <groupId>org.opendaylight.netconf</groupId>
-            <artifactId>ietf-restconf-monitoring</artifactId>
+            <groupId>org.opendaylight.netconf.model</groupId>
+            <artifactId>rfc8040-ietf-restconf-monitoring</artifactId>
         </dependency>
         <dependency>
             <groupId>org.opendaylight.netconf</groupId>

diff --git a/model/pom.xml b/model/pom.xml
new file mode 100644 (file)
index 0000000..8bcb803
--- /dev/null
+++ b/model/pom.xml
@@ -0,0 +1,42 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- vi: set et smarttab sw=4 tabstop=4: -->
+<!--
+ Copyright (c) 2022 PANTHEON.tech, s.r.o. and others.  All rights reserved.
+
+ This program and the accompanying materials are made available under the
+ terms of the Eclipse Public License v1.0 which accompanies this distribution,
+ and is available at http://www.eclipse.org/legal/epl-v10.html
+-->
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+
+    <parent>
+        <groupId>org.opendaylight.odlparent</groupId>
+        <artifactId>odlparent-lite</artifactId>
+        <version>11.0.0</version>
+        <relativePath/>
+    </parent>
+
+    <groupId>org.opendaylight.netconf</groupId>
+    <artifactId>model-aggregator</artifactId>
+    <version>4.0.0-SNAPSHOT</version>
+    <packaging>pom</packaging>
+    <name>${project.artifactId}</name>
+
+    <properties>
+        <maven.deploy.skip>true</maven.deploy.skip>
+        <maven.install.skip>true</maven.install.skip>
+    </properties>
+
+    <modules>
+        <module>rfc5277</module>
+        <module>rfc6022</module>
+        <module>rfc6241</module>
+        <module>rfc6243</module>
+        <module>rfc6470</module>
+        <module>rfc8040-ietf-restconf-monitoring</module>
+        <module>rfc8341</module>
+        <module>rfc8526</module>
+        <module>rfc8639</module>
+    </modules>
+</project>

diff --git a/netconf/models/ietf-netconf-notifications/pom.xml b/model/rfc5277/pom.xml
similarity index 72%
rename from netconf/models/ietf-netconf-notifications/pom.xml
rename to model/rfc5277/pom.xml
index 9164b6d370b6e401489b8f0a0ef0b7c1a83fe318..cb0b6026be2295668ed12ac7dac8a1b0634b7d2d 100644 (file)
--- a/netconf/models/ietf-netconf-notifications/pom.xml
+++ b/model/rfc5277/pom.xml
@@ -13,22 +13,16 @@
     <groupId>org.opendaylight.netconf</groupId>
     <artifactId>netconf-parent</artifactId>
     <version>4.0.0-SNAPSHOT</version>
-    <relativePath>../../../parent</relativePath>
+    <relativePath>../../parent</relativePath>
   </parent>
 
-  <artifactId>ietf-netconf-notifications</artifactId>
+  <groupId>org.opendaylight.netconf.model</groupId>
+  <artifactId>rfc5277</artifactId>
   <name>${project.artifactId}</name>
   <packaging>bundle</packaging>
+  <description>RFC5277 NETCONF Event Notifications</description>
 
   <dependencies>
-    <dependency>
-      <groupId>${project.groupId}</groupId>
-      <artifactId>ietf-netconf</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.opendaylight.mdsal.binding.model.ietf</groupId>
-      <artifactId>rfc6991-ietf-inet-types</artifactId>
-    </dependency>
     <dependency>
       <groupId>org.opendaylight.mdsal.binding.model.ietf</groupId>
       <artifactId>rfc6991-ietf-yang-types</artifactId>

diff --git a/netconf/models/ietf-netconf-notifications/src/main/yang/nc-notifications@2008-07-14.yang b/model/rfc5277/src/main/yang/nc-notifications@2008-07-14.yang
similarity index 100%
rename from netconf/models/ietf-netconf-notifications/src/main/yang/nc-notifications@2008-07-14.yang
rename to model/rfc5277/src/main/yang/nc-notifications@2008-07-14.yang

diff --git a/netconf/models/ietf-netconf-notifications/src/main/yang/notifications@2008-07-14.yang b/model/rfc5277/src/main/yang/notifications@2008-07-14.yang
similarity index 100%
rename from netconf/models/ietf-netconf-notifications/src/main/yang/notifications@2008-07-14.yang
rename to model/rfc5277/src/main/yang/notifications@2008-07-14.yang

diff --git a/netconf/models/ietf-netconf-monitoring/pom.xml b/model/rfc6022/pom.xml
similarity index 85%
rename from netconf/models/ietf-netconf-monitoring/pom.xml
rename to model/rfc6022/pom.xml
index e379876951fb80bee022efa5bd4bd764b562817e..121b33bc6e73058bc4208af646f21a432333def8 100644 (file)
--- a/netconf/models/ietf-netconf-monitoring/pom.xml
+++ b/model/rfc6022/pom.xml
@@ -13,12 +13,14 @@
     <groupId>org.opendaylight.netconf</groupId>
     <artifactId>netconf-parent</artifactId>
     <version>4.0.0-SNAPSHOT</version>
-    <relativePath>../../../parent</relativePath>
+    <relativePath>../../parent</relativePath>
   </parent>
 
-  <artifactId>ietf-netconf-monitoring</artifactId>
+  <groupId>org.opendaylight.netconf.model</groupId>
+  <artifactId>rfc6022</artifactId>
   <name>${project.artifactId}</name>
   <packaging>bundle</packaging>
+  <description>RFC6020 YANG Module for NETCONF Monitoring</description>
 
   <dependencies>
     <dependency>

diff --git a/netconf/models/ietf-netconf-monitoring/src/main/java/org/opendaylight/yang/gen/v1/urn/ietf/params/xml/ns/yang/ietf/netconf/monitoring/rev101004/netconf/state/schemas/LocationBuilder.java b/model/rfc6022/src/main/java/org/opendaylight/yang/gen/v1/urn/ietf/params/xml/ns/yang/ietf/netconf/monitoring/rev101004/netconf/state/schemas/LocationBuilder.java
similarity index 100%
rename from netconf/models/ietf-netconf-monitoring/src/main/java/org/opendaylight/yang/gen/v1/urn/ietf/params/xml/ns/yang/ietf/netconf/monitoring/rev101004/netconf/state/schemas/LocationBuilder.java
rename to model/rfc6022/src/main/java/org/opendaylight/yang/gen/v1/urn/ietf/params/xml/ns/yang/ietf/netconf/monitoring/rev101004/netconf/state/schemas/LocationBuilder.java

diff --git a/netconf/models/ietf-netconf-monitoring/src/main/java/org/opendaylight/yang/gen/v1/urn/ietf/params/xml/ns/yang/ietf/netconf/monitoring/rev101004/netconf/state/schemas/SchemaLocationBuilder.java b/model/rfc6022/src/main/java/org/opendaylight/yang/gen/v1/urn/ietf/params/xml/ns/yang/ietf/netconf/monitoring/rev101004/netconf/state/schemas/SchemaLocationBuilder.java
similarity index 100%
rename from netconf/models/ietf-netconf-monitoring/src/main/java/org/opendaylight/yang/gen/v1/urn/ietf/params/xml/ns/yang/ietf/netconf/monitoring/rev101004/netconf/state/schemas/SchemaLocationBuilder.java
rename to model/rfc6022/src/main/java/org/opendaylight/yang/gen/v1/urn/ietf/params/xml/ns/yang/ietf/netconf/monitoring/rev101004/netconf/state/schemas/SchemaLocationBuilder.java

diff --git a/netconf/models/ietf-netconf-monitoring/src/main/yang/ietf-netconf-monitoring.yang b/model/rfc6022/src/main/yang/ietf-netconf-monitoring.yang
similarity index 100%
rename from netconf/models/ietf-netconf-monitoring/src/main/yang/ietf-netconf-monitoring.yang
rename to model/rfc6022/src/main/yang/ietf-netconf-monitoring.yang

diff --git a/netconf/models/ietf-netconf/pom.xml b/model/rfc6241/pom.xml
similarity index 82%
rename from netconf/models/ietf-netconf/pom.xml
rename to model/rfc6241/pom.xml
index 4172b980fc516b75f225e7238e3c9ca2d03e85a5..afea66f0773a0815f8edf16a9e48f0680d392100 100644 (file)
--- a/netconf/models/ietf-netconf/pom.xml
+++ b/model/rfc6241/pom.xml
@@ -13,12 +13,14 @@
         <groupId>org.opendaylight.netconf</groupId>
         <artifactId>netconf-parent</artifactId>
         <version>4.0.0-SNAPSHOT</version>
-        <relativePath>../../../parent</relativePath>
+        <relativePath>../../parent</relativePath>
     </parent>
 
-    <artifactId>ietf-netconf</artifactId>
+    <groupId>org.opendaylight.netconf.model</groupId>
+    <artifactId>rfc6241</artifactId>
     <packaging>bundle</packaging>
     <name>${project.artifactId}</name>
+    <description>RFC6241 Network Configuration Protocol (NETCONF)</description>
 
     <dependencies>
         <dependency>

diff --git a/netconf/models/ietf-netconf/src/main/yang/ietf-netconf@2011-06-01.yang b/model/rfc6241/src/main/yang/ietf-netconf@2011-06-01.yang
similarity index 100%
rename from netconf/models/ietf-netconf/src/main/yang/ietf-netconf@2011-06-01.yang
rename to model/rfc6241/src/main/yang/ietf-netconf@2011-06-01.yang

diff --git a/netconf/models/ietf-netconf-with-defaults/pom.xml b/model/rfc6243/pom.xml
similarity index 74%
rename from netconf/models/ietf-netconf-with-defaults/pom.xml
rename to model/rfc6243/pom.xml
index 48ac2a8201f0f0bd533e684ff503b0b2987c1f1a..5e28f16b02620ce93a8655b0e157c70fdbb16b85 100644 (file)
--- a/netconf/models/ietf-netconf-with-defaults/pom.xml
+++ b/model/rfc6243/pom.xml
@@ -13,17 +13,19 @@
         <groupId>org.opendaylight.netconf</groupId>
         <artifactId>netconf-parent</artifactId>
         <version>4.0.0-SNAPSHOT</version>
-        <relativePath>../../../parent</relativePath>
+        <relativePath>../../parent</relativePath>
     </parent>
 
-    <artifactId>ietf-netconf-with-defaults</artifactId>
+    <groupId>org.opendaylight.netconf.model</groupId>
+    <artifactId>rfc6243</artifactId>
     <packaging>bundle</packaging>
     <name>${project.artifactId}</name>
+    <description>RFC6243 With-defaults Capability for NETCONF</description>
 
     <dependencies>
         <dependency>
-            <groupId>org.opendaylight.netconf</groupId>
-            <artifactId>ietf-netconf</artifactId>
+            <groupId>org.opendaylight.netconf.model</groupId>
+            <artifactId>rfc6241</artifactId>
         </dependency>
     </dependencies>
 </project>

diff --git a/netconf/models/ietf-netconf-with-defaults/src/main/yang/ietf-netconf-with-defaults@2011-06-01.yang b/model/rfc6243/src/main/yang/ietf-netconf-with-defaults@2011-06-01.yang
similarity index 100%
rename from netconf/models/ietf-netconf-with-defaults/src/main/yang/ietf-netconf-with-defaults@2011-06-01.yang
rename to model/rfc6243/src/main/yang/ietf-netconf-with-defaults@2011-06-01.yang

diff --git a/model/rfc6470/pom.xml b/model/rfc6470/pom.xml
new file mode 100644 (file)
index 0000000..422e8d3
--- /dev/null
+++ b/model/rfc6470/pom.xml
@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  ~ Copyright (c) 2022 PANTHEON.tech, s.r.o. and others.  All rights reserved.
+  ~
+  ~ This program and the accompanying materials are made available under the
+  ~ terms of the Eclipse Public License v1.0 which accompanies this distribution,
+  ~ and is available at http://www.eclipse.org/legal/epl-v10.html
+  -->
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+
+    <parent>
+        <groupId>org.opendaylight.netconf</groupId>
+        <artifactId>netconf-parent</artifactId>
+        <version>4.0.0-SNAPSHOT</version>
+        <relativePath>../../parent</relativePath>
+    </parent>
+
+    <groupId>org.opendaylight.netconf.model</groupId>
+    <artifactId>rfc6470</artifactId>
+    <packaging>bundle</packaging>
+    <name>${project.artifactId}</name>
+    <description>RFC6470: NETCONF Base Notifications</description>
+
+    <dependencies>
+        <dependency>
+            <groupId>org.opendaylight.mdsal.binding.model.ietf</groupId>
+            <artifactId>rfc6991-ietf-inet-types</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.opendaylight.mdsal.binding.model.ietf</groupId>
+            <artifactId>rfc6991-ietf-yang-types</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.opendaylight.netconf.model</groupId>
+            <artifactId>rfc6241</artifactId>
+        </dependency>
+    </dependencies>
+</project>

diff --git a/netconf/models/ietf-netconf-notifications/src/main/yang/ietf-netconf-notifications@2012-02-06.yang b/model/rfc6470/src/main/yang/ietf-netconf-notifications@2012-02-06.yang
similarity index 100%
rename from netconf/models/ietf-netconf-notifications/src/main/yang/ietf-netconf-notifications@2012-02-06.yang
rename to model/rfc6470/src/main/yang/ietf-netconf-notifications@2012-02-06.yang

diff --git a/restconf/restconf-models/ietf-restconf-monitoring/pom.xml b/model/rfc8040-ietf-restconf-monitoring/pom.xml
similarity index 84%
rename from restconf/restconf-models/ietf-restconf-monitoring/pom.xml
rename to model/rfc8040-ietf-restconf-monitoring/pom.xml
index b287881a878220627dbb53b53b55f85b135b018a..81d26d4b551a7370d9580afb7739b98624e0f32d 100644 (file)
--- a/restconf/restconf-models/ietf-restconf-monitoring/pom.xml
+++ b/model/rfc8040-ietf-restconf-monitoring/pom.xml
@@ -14,12 +14,14 @@
         <groupId>org.opendaylight.netconf</groupId>
         <artifactId>netconf-parent</artifactId>
         <version>4.0.0-SNAPSHOT</version>
-        <relativePath>../../../parent</relativePath>
+        <relativePath>../../parent</relativePath>
     </parent>
 
-    <artifactId>ietf-restconf-monitoring</artifactId>
+    <groupId>org.opendaylight.netconf.model</groupId>
+    <artifactId>rfc8040-ietf-restconf-monitoring</artifactId>
     <packaging>bundle</packaging>
     <name>${project.artifactId}</name>
+    <description>RFC8040 RESTCONF Protocol monitoring</description>
 
     <dependencies>
         <dependency>

diff --git a/restconf/restconf-models/ietf-restconf-monitoring/src/main/yang/ietf-restconf-monitoring@2017-01-26.yang b/model/rfc8040-ietf-restconf-monitoring/src/main/yang/ietf-restconf-monitoring@2017-01-26.yang
similarity index 100%
rename from restconf/restconf-models/ietf-restconf-monitoring/src/main/yang/ietf-restconf-monitoring@2017-01-26.yang
rename to model/rfc8040-ietf-restconf-monitoring/src/main/yang/ietf-restconf-monitoring@2017-01-26.yang

diff --git a/netconf/models/ietf-netconf-acm/pom.xml b/model/rfc8341/pom.xml
similarity index 82%
rename from netconf/models/ietf-netconf-acm/pom.xml
rename to model/rfc8341/pom.xml
index d68a9529445ed37f4e5046fbd44010e88382da6b..128d9b142b15a3b590dc2c6973224f5be3246a26 100644 (file)
--- a/netconf/models/ietf-netconf-acm/pom.xml
+++ b/model/rfc8341/pom.xml
@@ -13,12 +13,14 @@
         <groupId>org.opendaylight.netconf</groupId>
         <artifactId>netconf-parent</artifactId>
         <version>4.0.0-SNAPSHOT</version>
-        <relativePath>../../../parent</relativePath>
+        <relativePath>../../parent</relativePath>
     </parent>
 
-    <artifactId>ietf-netconf-acm</artifactId>
+    <groupId>org.opendaylight.netconf.model</groupId>
+    <artifactId>rfc8341</artifactId>
     <packaging>bundle</packaging>
     <name>${project.artifactId}</name>
+    <description>RFC8341 Network Configuration Access Control Model</description>
 
     <dependencies>
         <dependency>

diff --git a/netconf/models/ietf-netconf-acm/src/main/java/org/opendaylight/yang/gen/v1/urn/ietf/params/xml/ns/yang/ietf/netconf/acm/rev180214/nacm/RuleListGroupBuilder.java b/model/rfc8341/src/main/java/org/opendaylight/yang/gen/v1/urn/ietf/params/xml/ns/yang/ietf/netconf/acm/rev180214/nacm/RuleListGroupBuilder.java
similarity index 100%
rename from netconf/models/ietf-netconf-acm/src/main/java/org/opendaylight/yang/gen/v1/urn/ietf/params/xml/ns/yang/ietf/netconf/acm/rev180214/nacm/RuleListGroupBuilder.java
rename to model/rfc8341/src/main/java/org/opendaylight/yang/gen/v1/urn/ietf/params/xml/ns/yang/ietf/netconf/acm/rev180214/nacm/RuleListGroupBuilder.java

diff --git a/netconf/models/ietf-netconf-acm/src/main/java/org/opendaylight/yang/gen/v1/urn/ietf/params/xml/ns/yang/ietf/netconf/acm/rev180214/nacm/rule/list/RuleAccessOperationsBuilder.java b/model/rfc8341/src/main/java/org/opendaylight/yang/gen/v1/urn/ietf/params/xml/ns/yang/ietf/netconf/acm/rev180214/nacm/rule/list/RuleAccessOperationsBuilder.java
similarity index 100%
rename from netconf/models/ietf-netconf-acm/src/main/java/org/opendaylight/yang/gen/v1/urn/ietf/params/xml/ns/yang/ietf/netconf/acm/rev180214/nacm/rule/list/RuleAccessOperationsBuilder.java
rename to model/rfc8341/src/main/java/org/opendaylight/yang/gen/v1/urn/ietf/params/xml/ns/yang/ietf/netconf/acm/rev180214/nacm/rule/list/RuleAccessOperationsBuilder.java

diff --git a/netconf/models/ietf-netconf-acm/src/main/java/org/opendaylight/yang/gen/v1/urn/ietf/params/xml/ns/yang/ietf/netconf/acm/rev180214/nacm/rule/list/RuleModuleNameBuilder.java b/model/rfc8341/src/main/java/org/opendaylight/yang/gen/v1/urn/ietf/params/xml/ns/yang/ietf/netconf/acm/rev180214/nacm/rule/list/RuleModuleNameBuilder.java
similarity index 100%
rename from netconf/models/ietf-netconf-acm/src/main/java/org/opendaylight/yang/gen/v1/urn/ietf/params/xml/ns/yang/ietf/netconf/acm/rev180214/nacm/rule/list/RuleModuleNameBuilder.java
rename to model/rfc8341/src/main/java/org/opendaylight/yang/gen/v1/urn/ietf/params/xml/ns/yang/ietf/netconf/acm/rev180214/nacm/rule/list/RuleModuleNameBuilder.java

diff --git a/netconf/models/ietf-netconf-acm/src/main/java/org/opendaylight/yang/gen/v1/urn/ietf/params/xml/ns/yang/ietf/netconf/acm/rev180214/nacm/rule/list/rule/rule/type/NotificationNotificationNameBuilder.java b/model/rfc8341/src/main/java/org/opendaylight/yang/gen/v1/urn/ietf/params/xml/ns/yang/ietf/netconf/acm/rev180214/nacm/rule/list/rule/rule/type/NotificationNotificationNameBuilder.java
similarity index 100%
rename from netconf/models/ietf-netconf-acm/src/main/java/org/opendaylight/yang/gen/v1/urn/ietf/params/xml/ns/yang/ietf/netconf/acm/rev180214/nacm/rule/list/rule/rule/type/NotificationNotificationNameBuilder.java
rename to model/rfc8341/src/main/java/org/opendaylight/yang/gen/v1/urn/ietf/params/xml/ns/yang/ietf/netconf/acm/rev180214/nacm/rule/list/rule/rule/type/NotificationNotificationNameBuilder.java

diff --git a/netconf/models/ietf-netconf-acm/src/main/java/org/opendaylight/yang/gen/v1/urn/ietf/params/xml/ns/yang/ietf/netconf/acm/rev180214/nacm/rule/list/rule/rule/type/ProtocolOperationRpcNameBuilder.java b/model/rfc8341/src/main/java/org/opendaylight/yang/gen/v1/urn/ietf/params/xml/ns/yang/ietf/netconf/acm/rev180214/nacm/rule/list/rule/rule/type/ProtocolOperationRpcNameBuilder.java
similarity index 100%
rename from netconf/models/ietf-netconf-acm/src/main/java/org/opendaylight/yang/gen/v1/urn/ietf/params/xml/ns/yang/ietf/netconf/acm/rev180214/nacm/rule/list/rule/rule/type/ProtocolOperationRpcNameBuilder.java
rename to model/rfc8341/src/main/java/org/opendaylight/yang/gen/v1/urn/ietf/params/xml/ns/yang/ietf/netconf/acm/rev180214/nacm/rule/list/rule/rule/type/ProtocolOperationRpcNameBuilder.java

diff --git a/netconf/models/ietf-netconf-acm/src/main/yang/ietf-netconf-acm@2018-02-14.yang b/model/rfc8341/src/main/yang/ietf-netconf-acm@2018-02-14.yang
similarity index 100%
rename from netconf/models/ietf-netconf-acm/src/main/yang/ietf-netconf-acm@2018-02-14.yang
rename to model/rfc8341/src/main/yang/ietf-netconf-acm@2018-02-14.yang

diff --git a/netconf/models/ietf-netconf-nmda/pom.xml b/model/rfc8526/pom.xml
similarity index 83%
rename from netconf/models/ietf-netconf-nmda/pom.xml
rename to model/rfc8526/pom.xml
index d2475fbdcce0438ebd806a607050e08c7f2347cf..bd9f0e94b2d5eb64e204b8ed835b20df45c79b7e 100644 (file)
--- a/netconf/models/ietf-netconf-nmda/pom.xml
+++ b/model/rfc8526/pom.xml
@@ -13,12 +13,14 @@
         <groupId>org.opendaylight.netconf</groupId>
         <artifactId>netconf-parent</artifactId>
         <version>4.0.0-SNAPSHOT</version>
-        <relativePath>../../../parent</relativePath>
+        <relativePath>../../parent</relativePath>
     </parent>
 
-    <artifactId>ietf-netconf-nmda</artifactId>
+    <groupId>org.opendaylight.netconf.model</groupId>
+    <artifactId>rfc8526</artifactId>
     <packaging>bundle</packaging>
     <name>${project.artifactId}</name>
+    <description>RFC8526 NETCONF Extensions to Support NMDA</description>
 
     <dependencies>
         <dependency>
@@ -38,8 +40,8 @@
             <artifactId>rfc8342-ietf-origin</artifactId>
         </dependency>
         <dependency>
-            <groupId>org.opendaylight.netconf</groupId>
-            <artifactId>ietf-netconf-with-defaults</artifactId>
+            <groupId>org.opendaylight.netconf.model</groupId>
+            <artifactId>rfc6243</artifactId>
         </dependency>
     </dependencies>
 </project>

diff --git a/netconf/models/ietf-netconf-nmda/src/main/java/org/opendaylight/yang/gen/v1/urn/ietf/params/xml/ns/yang/ietf/netconf/nmda/rev190107/GetDataInputMaxDepthBuilder.java b/model/rfc8526/src/main/java/org/opendaylight/yang/gen/v1/urn/ietf/params/xml/ns/yang/ietf/netconf/nmda/rev190107/GetDataInputMaxDepthBuilder.java
similarity index 100%
rename from netconf/models/ietf-netconf-nmda/src/main/java/org/opendaylight/yang/gen/v1/urn/ietf/params/xml/ns/yang/ietf/netconf/nmda/rev190107/GetDataInputMaxDepthBuilder.java
rename to model/rfc8526/src/main/java/org/opendaylight/yang/gen/v1/urn/ietf/params/xml/ns/yang/ietf/netconf/nmda/rev190107/GetDataInputMaxDepthBuilder.java

diff --git a/netconf/models/ietf-netconf-nmda/src/main/yang/ietf-netconf-nmda@2019-01-07.yang b/model/rfc8526/src/main/yang/ietf-netconf-nmda@2019-01-07.yang
similarity index 100%
rename from netconf/models/ietf-netconf-nmda/src/main/yang/ietf-netconf-nmda@2019-01-07.yang
rename to model/rfc8526/src/main/yang/ietf-netconf-nmda@2019-01-07.yang

diff --git a/restconf/restconf-models/ietf-subscribed-notifications/pom.xml b/model/rfc8639/pom.xml
similarity index 81%
rename from restconf/restconf-models/ietf-subscribed-notifications/pom.xml
rename to model/rfc8639/pom.xml
index 0bfb2dc70b9e73853a26655ba1af9a6b866cb65d..5e40640c40ad418ef3a348b8ebd158ba6db28f68 100644 (file)
--- a/restconf/restconf-models/ietf-subscribed-notifications/pom.xml
+++ b/model/rfc8639/pom.xml
@@ -14,12 +14,14 @@
         <groupId>org.opendaylight.netconf</groupId>
         <artifactId>netconf-parent</artifactId>
         <version>4.0.0-SNAPSHOT</version>
-        <relativePath>../../../parent</relativePath>
+        <relativePath>../../parent</relativePath>
     </parent>
 
-    <artifactId>ietf-subscribed-notifications</artifactId>
+    <groupId>org.opendaylight.netconf.model</groupId>
+    <artifactId>rfc8639</artifactId>
     <packaging>bundle</packaging>
     <name>${project.artifactId}</name>
+    <description>RFC8639 Subscription to YANG Notifications</description>
 
     <dependencies>
         <dependency>
@@ -35,8 +37,8 @@
             <artifactId>rfc8529</artifactId>
         </dependency>
         <dependency>
-            <groupId>org.opendaylight.netconf</groupId>
-            <artifactId>ietf-netconf-acm</artifactId>
+            <groupId>org.opendaylight.netconf.model</groupId>
+            <artifactId>rfc8341</artifactId>
         </dependency>
     </dependencies>
 </project>

diff --git a/restconf/restconf-models/ietf-subscribed-notifications/src/main/yang/ietf-subscribed-notifications@2019-09-09.yang b/model/rfc8639/src/main/yang/ietf-subscribed-notifications@2019-09-09.yang
similarity index 100%
rename from restconf/restconf-models/ietf-subscribed-notifications/src/main/yang/ietf-subscribed-notifications@2019-09-09.yang
rename to model/rfc8639/src/main/yang/ietf-subscribed-notifications@2019-09-09.yang

diff --git a/netconf/mdsal-netconf-connector/pom.xml b/netconf/mdsal-netconf-connector/pom.xml
index 6eca647e46820a5253af5f45a78f876170bc9939..87e44637a8e3b838890c10e18b6e678006ff55c9 100644 (file)
--- a/netconf/mdsal-netconf-connector/pom.xml
+++ b/netconf/mdsal-netconf-connector/pom.xml
@@ -56,8 +56,8 @@
       <artifactId>mockito-configuration</artifactId>
     </dependency>
     <dependency>
-      <groupId>org.opendaylight.netconf</groupId>
-      <artifactId>ietf-netconf</artifactId>
+      <groupId>org.opendaylight.netconf.model</groupId>
+      <artifactId>rfc6241</artifactId>
     </dependency>
     <dependency>
       <groupId>org.opendaylight.mdsal</groupId>

diff --git a/netconf/mdsal-netconf-notification/pom.xml b/netconf/mdsal-netconf-notification/pom.xml
index 1f493ac3d438443163809aaa5a11a93e844ad6e6..5a8a6faecb59de7ffe164ff6c27750a0c0672367 100644 (file)
--- a/netconf/mdsal-netconf-notification/pom.xml
+++ b/netconf/mdsal-netconf-notification/pom.xml
@@ -37,8 +37,8 @@
             <artifactId>mdsal-binding-runtime-spi</artifactId>
         </dependency>
         <dependency>
-            <groupId>${project.groupId}</groupId>
-            <artifactId>ietf-netconf-notifications</artifactId>
+            <groupId>org.opendaylight.netconf.model</groupId>
+            <artifactId>rfc5277</artifactId>
         </dependency>
         <dependency>
             <groupId>${project.groupId}</groupId>

diff --git a/netconf/models/ietf-netconf-monitoring-extension/pom.xml b/netconf/models/ietf-netconf-monitoring-extension/pom.xml
index 54112ca9763c9a49574ceb67720ce4c916ad7778..30749d29fc82cf168bf1c055584eaca1e03d5cae 100644 (file)
--- a/netconf/models/ietf-netconf-monitoring-extension/pom.xml
+++ b/netconf/models/ietf-netconf-monitoring-extension/pom.xml
@@ -22,8 +22,8 @@
 
   <dependencies>
     <dependency>
-      <groupId>${project.groupId}</groupId>
-      <artifactId>ietf-netconf-monitoring</artifactId>
+      <groupId>org.opendaylight.netconf.model</groupId>
+      <artifactId>rfc6022</artifactId>
     </dependency>
   </dependencies>
 </project>

diff --git a/netconf/models/pom.xml b/netconf/models/pom.xml
index f181b27a36b438a88ea5d52fa4d7f82ca1021e55..c64ac8f735e200bcb90199b9a2e97dbfbcdcb7a9 100644 (file)
--- a/netconf/models/pom.xml
+++ b/netconf/models/pom.xml
@@ -28,14 +28,6 @@
   </properties>
 
   <modules>
-    <module>ietf-netconf</module>
-    <module>ietf-netconf-acm</module>
-    <module>ietf-netconf-monitoring</module>
     <module>ietf-netconf-monitoring-extension</module>
-    <module>ietf-netconf-nmda</module>
-    <module>ietf-netconf-notifications</module>
-    <module>ietf-netconf-with-defaults</module>
-
-    <module>netconf-test-models</module>
   </modules>
 </project>

diff --git a/netconf/netconf-api/pom.xml b/netconf/netconf-api/pom.xml
index 1e339949f09ff8f3f2e5c69c39a54d2429e80df6..0dc1865640d88652296011131617ccbd5662b383 100644 (file)
--- a/netconf/netconf-api/pom.xml
+++ b/netconf/netconf-api/pom.xml
@@ -25,15 +25,15 @@
       <groupId>io.netty</groupId>
       <artifactId>netty-transport</artifactId>
     </dependency>
-
-    <dependency>
-      <groupId>${project.groupId}</groupId>
-      <artifactId>ietf-netconf-monitoring</artifactId>
-    </dependency>
     <dependency>
       <groupId>org.opendaylight.yangtools</groupId>
       <artifactId>yang-model-api</artifactId>
     </dependency>
+    <dependency>
+      <groupId>org.opendaylight.netconf.model</groupId>
+      <artifactId>rfc6022</artifactId>
+    </dependency>
+
     <dependency>
       <groupId>org.opendaylight.yangtools</groupId>
       <artifactId>mockito-configuration</artifactId>

diff --git a/netconf/netconf-impl/pom.xml b/netconf/netconf-impl/pom.xml
index c350de3ac2cacb87054712e6167a3b77e38c5199..861258dc86c04d700609f7e262a192179bb97336 100644 (file)
--- a/netconf/netconf-impl/pom.xml
+++ b/netconf/netconf-impl/pom.xml
@@ -22,8 +22,8 @@
 
   <dependencies>
     <dependency>
-      <groupId>${project.groupId}</groupId>
-      <artifactId>ietf-netconf-monitoring</artifactId>
+      <groupId>org.opendaylight.netconf.model</groupId>
+      <artifactId>rfc6022</artifactId>
     </dependency>
     <dependency>
       <groupId>${project.groupId}</groupId>

diff --git a/netconf/netconf-notifications-api/pom.xml b/netconf/netconf-notifications-api/pom.xml
index d2ff1ffcb9043e4ae230f7aeb1d32a60e3202a14..18c1b6b45af91e7083603bfd393647c18f5a81e6 100644 (file)
--- a/netconf/netconf-notifications-api/pom.xml
+++ b/netconf/netconf-notifications-api/pom.xml
@@ -27,13 +27,17 @@
             <groupId>${project.groupId}</groupId>
             <artifactId>netconf-api</artifactId>
         </dependency>
-        <dependency>
-            <groupId>${project.groupId}</groupId>
-            <artifactId>ietf-netconf-notifications</artifactId>
-        </dependency>
         <dependency>
             <groupId>org.opendaylight.mdsal.binding.model.ietf</groupId>
             <artifactId>rfc8525</artifactId>
         </dependency>
+        <dependency>
+            <groupId>org.opendaylight.netconf.model</groupId>
+            <artifactId>rfc5277</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.opendaylight.netconf.model</groupId>
+            <artifactId>rfc6470</artifactId>
+        </dependency>
     </dependencies>
 </project>

diff --git a/netconf/models/netconf-test-models/pom.xml b/netconf/netconf-test-models/pom.xml
similarity index 95%
rename from netconf/models/netconf-test-models/pom.xml
rename to netconf/netconf-test-models/pom.xml
index 0af95673a56cc3abc4b4fd9faa335141057330a2..e4b019e7d378fc2c8aab4cf47b7d1e07584268c7 100644 (file)
--- a/netconf/models/netconf-test-models/pom.xml
+++ b/netconf/netconf-test-models/pom.xml
@@ -13,7 +13,7 @@
         <groupId>org.opendaylight.netconf</groupId>
         <artifactId>netconf-parent</artifactId>
         <version>4.0.0-SNAPSHOT</version>
-        <relativePath>../../../parent</relativePath>
+        <relativePath>../../parent</relativePath>
     </parent>
 
     <artifactId>netconf-test-models</artifactId>

diff --git a/netconf/models/netconf-test-models/src/main/yang/network-topology-augment-test@2016-08-08.yang b/netconf/netconf-test-models/src/main/yang/network-topology-augment-test@2016-08-08.yang
similarity index 100%
rename from netconf/models/netconf-test-models/src/main/yang/network-topology-augment-test@2016-08-08.yang
rename to netconf/netconf-test-models/src/main/yang/network-topology-augment-test@2016-08-08.yang

diff --git a/netconf/pom.xml b/netconf/pom.xml
index 04b2635af52d45a738ba3407fbac6064abb92f2f..cc524d80428e59477bf174c354ac482d20771866 100644 (file)
--- a/netconf/pom.xml
+++ b/netconf/pom.xml
@@ -60,6 +60,8 @@
     <module>callhome-protocol</module>
     <module>callhome-provider</module>
 
+    <module>netconf-test-models</module>
+
     <module>shaded-exificient-jar</module>
     <module>shaded-exificient</module>
     <module>shaded-sshd-jar</module>

diff --git a/netconf/sal-netconf-connector/pom.xml b/netconf/sal-netconf-connector/pom.xml
index b395b64daf6a9db2706192d3ce77a29c2887501c..dcc6bb7920c48c2a736c267dbc0945f555909786 100644 (file)
--- a/netconf/sal-netconf-connector/pom.xml
+++ b/netconf/sal-netconf-connector/pom.xml
@@ -20,20 +20,20 @@
 
   <dependencies>
     <dependency>
-      <groupId>${project.groupId}</groupId>
-      <artifactId>ietf-netconf-monitoring</artifactId>
+      <groupId>org.opendaylight.mdsal.binding.model.ietf</groupId>
+      <artifactId>rfc8525</artifactId>
     </dependency>
     <dependency>
-      <groupId>${project.groupId}</groupId>
-      <artifactId>ietf-netconf-monitoring-extension</artifactId>
+      <groupId>org.opendaylight.netconf.model</groupId>
+      <artifactId>rfc5277</artifactId>
     </dependency>
     <dependency>
-      <groupId>${project.groupId}</groupId>
-      <artifactId>ietf-netconf-notifications</artifactId>
+      <groupId>org.opendaylight.netconf.model</groupId>
+      <artifactId>rfc6022</artifactId>
     </dependency>
     <dependency>
-      <groupId>org.opendaylight.mdsal.binding.model.ietf</groupId>
-      <artifactId>rfc8525</artifactId>
+      <groupId>${project.groupId}</groupId>
+      <artifactId>ietf-netconf-monitoring-extension</artifactId>
     </dependency>
     <dependency>
       <groupId>${project.groupId}</groupId>

diff --git a/netconf/tools/netconf-test-perf/pom.xml b/netconf/tools/netconf-test-perf/pom.xml
index ca0609235f466e0ddf8984d78f40492a6114d229..0d8e6442222a29732b77deae3d045309590eb286 100644 (file)
--- a/netconf/tools/netconf-test-perf/pom.xml
+++ b/netconf/tools/netconf-test-perf/pom.xml
@@ -32,8 +32,8 @@
             <artifactId>ietf-topology</artifactId>
         </dependency>
         <dependency>
-            <groupId>org.opendaylight.netconf</groupId>
-            <artifactId>ietf-netconf-notifications</artifactId>
+            <groupId>org.opendaylight.netconf.model</groupId>
+            <artifactId>rfc5277</artifactId>
         </dependency>
         <dependency>
             <groupId>org.opendaylight.netconf</groupId>

diff --git a/netconf/tools/netconf-testtool/pom.xml b/netconf/tools/netconf-testtool/pom.xml
index 97b71ba0444e840fc7edbf2cdcb4dc370e7bbf51..46872f9ddda606398f6ca018e6aa0c3928aeb6a5 100644 (file)
--- a/netconf/tools/netconf-testtool/pom.xml
+++ b/netconf/tools/netconf-testtool/pom.xml
@@ -78,8 +78,8 @@
             <artifactId>netconf-api</artifactId>
         </dependency>
         <dependency>
-            <groupId>${project.groupId}</groupId>
-            <artifactId>ietf-netconf-monitoring</artifactId>
+            <groupId>org.opendaylight.netconf.model</groupId>
+            <artifactId>rfc6022</artifactId>
         </dependency>
         <dependency>
             <groupId>${project.groupId}</groupId>

diff --git a/pom.xml b/pom.xml
index e6b8ca80876285a8dbf5b5b97811624b09716eae..4e798a9cc0d1f8a1b7aeaa2ba00bc84673a647c2 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -34,6 +34,7 @@
         <module>features</module>
         <module>karaf</module>
         <module>karaf-static</module>
+        <module>model</module>
         <module>netconf</module>
         <module>restconf</module>
     </modules>

diff --git a/restconf/pom.xml b/restconf/pom.xml
index 14366430ec910201901c69b22cd6afa03da3632e..6d0ac8afb9ad8fcf756b8e3d2d226ff6cfae668b 100644 (file)
--- a/restconf/pom.xml
+++ b/restconf/pom.xml
@@ -28,7 +28,6 @@
     </properties>
 
     <modules>
-        <module>restconf-models</module>
         <module>restconf-common-models</module>
         <module>restconf-common</module>
         <module>restconf-nb-rfc8040</module>

diff --git a/restconf/restconf-models/pom.xml b/restconf/restconf-models/pom.xml
deleted file mode 100644 (file)
index 1693896..0000000
--- a/restconf/restconf-models/pom.xml
+++ /dev/null
@@ -1,29 +0,0 @@
-<?xml version="1.0"?>
-<!--
-  ~ Copyright (c) 2016 Cisco Systems, Inc. and others.  All rights reserved.
-  ~
-  ~ This program and the accompanying materials are made available under the
-  ~ terms of the Eclipse Public License v1.0 which accompanies this distribution,
-  ~ and is available at http://www.eclipse.org/legal/epl-v10.html
-  -->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-  <modelVersion>4.0.0</modelVersion>
-
-  <parent>
-    <groupId>org.opendaylight.odlparent</groupId>
-    <artifactId>odlparent-lite</artifactId>
-    <version>11.0.0</version>
-    <relativePath/>
-  </parent>
-
-  <groupId>org.opendaylight.netconf</groupId>
-  <artifactId>restconf-models</artifactId>
-  <version>4.0.0-SNAPSHOT</version>
-  <packaging>pom</packaging>
-  <name>${project.artifactId}</name>
-
-  <modules>
-    <module>ietf-restconf-monitoring</module>
-    <module>ietf-subscribed-notifications</module>
-  </modules>
-</project>

diff --git a/restconf/restconf-nb-rfc8040/pom.xml b/restconf/restconf-nb-rfc8040/pom.xml
index 39c414711698e4cc6c6b1736fa74fc435ba79aab..7e1859555415068caca148990d9d8c7d6ac4c705 100644 (file)
--- a/restconf/restconf-nb-rfc8040/pom.xml
+++ b/restconf/restconf-nb-rfc8040/pom.xml
@@ -163,8 +163,8 @@
       <artifactId>rfc8525</artifactId>
     </dependency>
     <dependency>
-      <groupId>org.opendaylight.netconf</groupId>
-      <artifactId>ietf-restconf-monitoring</artifactId>
+      <groupId>org.opendaylight.netconf.model</groupId>
+      <artifactId>rfc8040-ietf-restconf-monitoring</artifactId>
     </dependency>
 
     <dependency>