From 1f0f873cdf1e3871e9aef1b13e3a152ddf20690d Mon Sep 17 00:00:00 2001
From: Robert Varga <robert.varga@pantheon.tech>
Date: Sun, 17 Jul 2022 17:40:24 +0200
Subject: [PATCH] Move ietf-netconf-monitoring-extension

This is an implementation detail, let's make sure we treat it that way.

JIRA: NETCONF-891
Change-Id: I2de2dbf7c348f1790f9e2cec21db8b9cbfa0a2d2
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
---
 artifacts/pom.xml                             |  7 ----
 features/netconf/odl-netconf-api/pom.xml      |  4 ---
 .../ietf-netconf-monitoring-extension/pom.xml | 29 ----------------
 netconf/models/pom.xml                        | 33 -------------------
 netconf/netconf-impl/pom.xml                  |  4 ---
 .../ietf-netconf-monitoring-extension.yang    |  0
 netconf/pom.xml                               |  1 -
 netconf/tools/netconf-testtool/pom.xml        |  4 ---
 8 files changed, 82 deletions(-)
 delete mode 100644 netconf/models/ietf-netconf-monitoring-extension/pom.xml
 delete mode 100644 netconf/models/pom.xml
 rename netconf/{models/ietf-netconf-monitoring-extension => netconf-impl}/src/main/yang/ietf-netconf-monitoring-extension.yang (100%)

diff --git a/artifacts/pom.xml b/artifacts/pom.xml
index 7de87264be..9d1a9033c2 100644
--- a/artifacts/pom.xml
+++ b/artifacts/pom.xml
@@ -180,13 +180,6 @@
                 <version>${project.version}</version>
             </dependency>
 
-            <!-- FIXME: NETCONF-891: replace this model -->
-            <dependency>
-                <groupId>${project.groupId}</groupId>
-                <artifactId>ietf-netconf-monitoring-extension</artifactId>
-                <version>${project.version}</version>
-            </dependency>
-
             <!-- FIXME: place these models with their users -->
             <dependency>
                 <groupId>${project.groupId}</groupId>
diff --git a/features/netconf/odl-netconf-api/pom.xml b/features/netconf/odl-netconf-api/pom.xml
index 0db7ea92e0..e6c654c35a 100644
--- a/features/netconf/odl-netconf-api/pom.xml
+++ b/features/netconf/odl-netconf-api/pom.xml
@@ -54,10 +54,6 @@
             <groupId>org.opendaylight.netconf</groupId>
             <artifactId>netconf-auth</artifactId>
         </dependency>
-        <dependency>
-            <groupId>org.opendaylight.netconf</groupId>
-            <artifactId>ietf-netconf-monitoring-extension</artifactId>
-        </dependency>
         <dependency>
             <groupId>org.opendaylight.netconf.model</groupId>
             <artifactId>rfc5277</artifactId>
diff --git a/netconf/models/ietf-netconf-monitoring-extension/pom.xml b/netconf/models/ietf-netconf-monitoring-extension/pom.xml
deleted file mode 100644
index 30749d29fc..0000000000
--- a/netconf/models/ietf-netconf-monitoring-extension/pom.xml
+++ /dev/null
@@ -1,29 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- 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.netconf</groupId>
-    <artifactId>netconf-parent</artifactId>
-    <version>4.0.0-SNAPSHOT</version>
-    <relativePath>../../../parent</relativePath>
-  </parent>
-
-  <artifactId>ietf-netconf-monitoring-extension</artifactId>
-  <name>${project.artifactId}</name>
-  <packaging>bundle</packaging>
-
-  <dependencies>
-    <dependency>
-      <groupId>org.opendaylight.netconf.model</groupId>
-      <artifactId>rfc6022</artifactId>
-    </dependency>
-  </dependencies>
-</project>
diff --git a/netconf/models/pom.xml b/netconf/models/pom.xml
deleted file mode 100644
index c64ac8f735..0000000000
--- a/netconf/models/pom.xml
+++ /dev/null
@@ -1,33 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  ~ Copyright (c) 2015 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>netconf-models</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>ietf-netconf-monitoring-extension</module>
-  </modules>
-</project>
diff --git a/netconf/netconf-impl/pom.xml b/netconf/netconf-impl/pom.xml
index 861258dc86..e9955fe188 100644
--- a/netconf/netconf-impl/pom.xml
+++ b/netconf/netconf-impl/pom.xml
@@ -25,10 +25,6 @@
       <groupId>org.opendaylight.netconf.model</groupId>
       <artifactId>rfc6022</artifactId>
     </dependency>
-    <dependency>
-      <groupId>${project.groupId}</groupId>
-      <artifactId>ietf-netconf-monitoring-extension</artifactId>
-    </dependency>
     <!-- compile dependencies -->
     <dependency>
       <groupId>${project.groupId}</groupId>
diff --git a/netconf/models/ietf-netconf-monitoring-extension/src/main/yang/ietf-netconf-monitoring-extension.yang b/netconf/netconf-impl/src/main/yang/ietf-netconf-monitoring-extension.yang
similarity index 100%
rename from netconf/models/ietf-netconf-monitoring-extension/src/main/yang/ietf-netconf-monitoring-extension.yang
rename to netconf/netconf-impl/src/main/yang/ietf-netconf-monitoring-extension.yang
diff --git a/netconf/pom.xml b/netconf/pom.xml
index cc524d8042..c29e24a7c3 100644
--- a/netconf/pom.xml
+++ b/netconf/pom.xml
@@ -52,7 +52,6 @@
     <module>netconf-topology-singleton</module>
     <module>sal-netconf-connector</module>
     <module>yanglib</module>
-    <module>models</module>
     <module>tools</module>
     <module>netconf-console</module>
 
diff --git a/netconf/tools/netconf-testtool/pom.xml b/netconf/tools/netconf-testtool/pom.xml
index 46872f9ddd..b894a54c26 100644
--- a/netconf/tools/netconf-testtool/pom.xml
+++ b/netconf/tools/netconf-testtool/pom.xml
@@ -81,10 +81,6 @@
             <groupId>org.opendaylight.netconf.model</groupId>
             <artifactId>rfc6022</artifactId>
         </dependency>
-        <dependency>
-            <groupId>${project.groupId}</groupId>
-            <artifactId>ietf-netconf-monitoring-extension</artifactId>
-        </dependency>
         <dependency>
             <groupId>${project.groupId}</groupId>
             <artifactId>netconf-client</artifactId>
-- 
2.36.6