From f5dd226d85bfeaadd900c02e442d4db9b0000c99 Mon Sep 17 00:00:00 2001
From: Robert Varga <robert.varga@pantheon.tech>
Date: Sun, 30 Apr 2023 20:27:31 +0200
Subject: [PATCH] Rename mdsal-netconf-impl to netconf-nb

This is a northbound NETCONF application bound to MD-SAL, rename it as
such.

JIRA: NETCONF-945
Change-Id: I7c01fbeea0145e5707f3c0d9fde1409db51fc039
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
---
 apps/netconf-nb/pom.xml                       | 66 +++++++++++++++
 .../DefaultNetconfMonitoringService.java      |  2 +-
 .../DefaultNetconfServerDispatcher.java       |  2 +-
 .../northbound}/OSGiNetconfServer.java        |  2 +-
 apps/pom.xml                                  |  1 +
 artifacts/pom.xml                             | 10 +--
 features/netconf/odl-netconf-mdsal/pom.xml    |  2 +-
 netconf/mdsal-netconf-impl/pom.xml            | 80 -------------------
 netconf/pom.xml                               |  1 -
 9 files changed, 76 insertions(+), 90 deletions(-)
 create mode 100644 apps/netconf-nb/pom.xml
 rename {netconf/mdsal-netconf-impl/src/main/java/org/opendaylight/netconf/impl/mdsal => apps/netconf-nb/src/main/java/org/opendaylight/netconf/northbound}/DefaultNetconfMonitoringService.java (98%)
 rename {netconf/mdsal-netconf-impl/src/main/java/org/opendaylight/netconf/impl/mdsal => apps/netconf-nb/src/main/java/org/opendaylight/netconf/northbound}/DefaultNetconfServerDispatcher.java (97%)
 rename {netconf/mdsal-netconf-impl/src/main/java/org/opendaylight/netconf/impl/mdsal => apps/netconf-nb/src/main/java/org/opendaylight/netconf/northbound}/OSGiNetconfServer.java (98%)
 delete mode 100644 netconf/mdsal-netconf-impl/pom.xml

diff --git a/apps/netconf-nb/pom.xml b/apps/netconf-nb/pom.xml
new file mode 100644
index 0000000000..5993c20be7
--- /dev/null
+++ b/apps/netconf-nb/pom.xml
@@ -0,0 +1,66 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Copyright (c) 2016 Inocybe Technologies 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>6.0.0-SNAPSHOT</version>
+        <relativePath>../../parent</relativePath>
+    </parent>
+
+    <artifactId>netconf-nb</artifactId>
+    <name>${project.artifactId}</name>
+    <packaging>bundle</packaging>
+    <description>NETCONF Northbound</description>
+
+    <dependencies>
+        <dependency>
+            <groupId>com.google.guava</groupId>
+            <artifactId>guava</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>io.netty</groupId>
+            <artifactId>netty-common</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>io.netty</groupId>
+            <artifactId>netty-transport</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.opendaylight.controller</groupId>
+            <artifactId>threadpool-config-api</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.opendaylight.netconf</groupId>
+            <artifactId>netconf-api</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.opendaylight.netconf</groupId>
+            <artifactId>netconf-server</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.osgi</groupId>
+            <artifactId>org.osgi.framework</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.osgi</groupId>
+            <artifactId>org.osgi.service.component</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.osgi</groupId>
+            <artifactId>org.osgi.service.component.annotations</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.osgi</groupId>
+            <artifactId>org.osgi.service.metatype.annotations</artifactId>
+        </dependency>
+    </dependencies>
+</project>
diff --git a/netconf/mdsal-netconf-impl/src/main/java/org/opendaylight/netconf/impl/mdsal/DefaultNetconfMonitoringService.java b/apps/netconf-nb/src/main/java/org/opendaylight/netconf/northbound/DefaultNetconfMonitoringService.java
similarity index 98%
rename from netconf/mdsal-netconf-impl/src/main/java/org/opendaylight/netconf/impl/mdsal/DefaultNetconfMonitoringService.java
rename to apps/netconf-nb/src/main/java/org/opendaylight/netconf/northbound/DefaultNetconfMonitoringService.java
index 813a59d2a0..4f353b11fe 100644
--- a/netconf/mdsal-netconf-impl/src/main/java/org/opendaylight/netconf/impl/mdsal/DefaultNetconfMonitoringService.java
+++ b/apps/netconf-nb/src/main/java/org/opendaylight/netconf/northbound/DefaultNetconfMonitoringService.java
@@ -5,7 +5,7 @@
  * terms of the Eclipse Public License v1.0 which accompanies this distribution,
  * and is available at http://www.eclipse.org/legal/epl-v10.html
  */
-package org.opendaylight.netconf.impl.mdsal;
+package org.opendaylight.netconf.northbound;
 
 import static java.util.Objects.requireNonNull;
 
diff --git a/netconf/mdsal-netconf-impl/src/main/java/org/opendaylight/netconf/impl/mdsal/DefaultNetconfServerDispatcher.java b/apps/netconf-nb/src/main/java/org/opendaylight/netconf/northbound/DefaultNetconfServerDispatcher.java
similarity index 97%
rename from netconf/mdsal-netconf-impl/src/main/java/org/opendaylight/netconf/impl/mdsal/DefaultNetconfServerDispatcher.java
rename to apps/netconf-nb/src/main/java/org/opendaylight/netconf/northbound/DefaultNetconfServerDispatcher.java
index 1a57fd33cc..c2c6f4f8aa 100644
--- a/netconf/mdsal-netconf-impl/src/main/java/org/opendaylight/netconf/impl/mdsal/DefaultNetconfServerDispatcher.java
+++ b/apps/netconf-nb/src/main/java/org/opendaylight/netconf/northbound/DefaultNetconfServerDispatcher.java
@@ -5,7 +5,7 @@
  * terms of the Eclipse Public License v1.0 which accompanies this distribution,
  * and is available at http://www.eclipse.org/legal/epl-v10.html
  */
-package org.opendaylight.netconf.impl.mdsal;
+package org.opendaylight.netconf.northbound;
 
 import static java.util.Objects.requireNonNull;
 
diff --git a/netconf/mdsal-netconf-impl/src/main/java/org/opendaylight/netconf/impl/mdsal/OSGiNetconfServer.java b/apps/netconf-nb/src/main/java/org/opendaylight/netconf/northbound/OSGiNetconfServer.java
similarity index 98%
rename from netconf/mdsal-netconf-impl/src/main/java/org/opendaylight/netconf/impl/mdsal/OSGiNetconfServer.java
rename to apps/netconf-nb/src/main/java/org/opendaylight/netconf/northbound/OSGiNetconfServer.java
index c58b104377..644ba53a3b 100644
--- a/netconf/mdsal-netconf-impl/src/main/java/org/opendaylight/netconf/impl/mdsal/OSGiNetconfServer.java
+++ b/apps/netconf-nb/src/main/java/org/opendaylight/netconf/northbound/OSGiNetconfServer.java
@@ -5,7 +5,7 @@
  * terms of the Eclipse Public License v1.0 which accompanies this distribution,
  * and is available at http://www.eclipse.org/legal/epl-v10.html
  */
-package org.opendaylight.netconf.impl.mdsal;
+package org.opendaylight.netconf.northbound;
 
 import static com.google.common.base.Verify.verifyNotNull;
 import static java.util.Objects.requireNonNull;
diff --git a/apps/pom.xml b/apps/pom.xml
index 9551434a47..c3429c5bce 100644
--- a/apps/pom.xml
+++ b/apps/pom.xml
@@ -35,5 +35,6 @@
         <module>netconf-topology-singleton</module>
         <module>callhome-provider</module>
         <module>netconf-console</module>
+        <module>netconf-nb</module>
     </modules>
 </project>
diff --git a/artifacts/pom.xml b/artifacts/pom.xml
index 2334d13746..744d186770 100644
--- a/artifacts/pom.xml
+++ b/artifacts/pom.xml
@@ -91,11 +91,6 @@
                 <artifactId>mdsal-netconf-yang-library</artifactId>
                 <version>${project.version}</version>
             </dependency>
-            <dependency>
-                <groupId>org.opendaylight.netconf</groupId>
-                <artifactId>mdsal-netconf-impl</artifactId>
-                <version>${project.version}</version>
-            </dependency>
             <dependency>
                 <groupId>${project.groupId}</groupId>
                 <artifactId>netconf-netty-util</artifactId>
@@ -304,6 +299,11 @@
                 <artifactId>netconf-events-mdsal</artifactId>
                 <version>${project.version}</version>
             </dependency>
+            <dependency>
+                <groupId>org.opendaylight.netconf</groupId>
+                <artifactId>netconf-nb</artifactId>
+                <version>${project.version}</version>
+            </dependency>
             <dependency>
                 <groupId>${project.groupId}</groupId>
                 <artifactId>netconf-topology</artifactId>
diff --git a/features/netconf/odl-netconf-mdsal/pom.xml b/features/netconf/odl-netconf-mdsal/pom.xml
index e72937654e..4a3912c1ac 100644
--- a/features/netconf/odl-netconf-mdsal/pom.xml
+++ b/features/netconf/odl-netconf-mdsal/pom.xml
@@ -71,7 +71,7 @@
         </dependency>
         <dependency>
             <groupId>${project.groupId}</groupId>
-            <artifactId>mdsal-netconf-impl</artifactId>
+            <artifactId>netconf-nb</artifactId>
         </dependency>
     </dependencies>
 </project>
diff --git a/netconf/mdsal-netconf-impl/pom.xml b/netconf/mdsal-netconf-impl/pom.xml
deleted file mode 100644
index 022f8188cb..0000000000
--- a/netconf/mdsal-netconf-impl/pom.xml
+++ /dev/null
@@ -1,80 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- Copyright (c) 2016 Inocybe Technologies 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>6.0.0-SNAPSHOT</version>
-    <relativePath>../../parent</relativePath>
-  </parent>
-
-  <artifactId>mdsal-netconf-impl</artifactId>
-  <name>${project.artifactId}</name>
-  <packaging>bundle</packaging>
-
-  <dependencies>
-    <dependency>
-      <groupId>com.google.guava</groupId>
-      <artifactId>guava</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>io.netty</groupId>
-      <artifactId>netty-common</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>io.netty</groupId>
-      <artifactId>netty-transport</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.opendaylight.controller</groupId>
-      <artifactId>threadpool-config-api</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.opendaylight.netconf</groupId>
-      <artifactId>netconf-api</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.opendaylight.netconf</groupId>
-      <artifactId>netconf-server</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.osgi</groupId>
-      <artifactId>org.osgi.framework</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.osgi</groupId>
-      <artifactId>org.osgi.service.component</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.osgi</groupId>
-      <artifactId>org.osgi.service.component.annotations</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.osgi</groupId>
-      <artifactId>org.osgi.service.metatype.annotations</artifactId>
-    </dependency>
-  </dependencies>
-
-  <build>
-    <plugins>
-      <plugin>
-        <groupId>org.apache.felix</groupId>
-        <artifactId>maven-bundle-plugin</artifactId>
-        <extensions>true</extensions>
-        <configuration>
-          <instructions>
-            <Bundle-SymbolicName>${project.artifactId}</Bundle-SymbolicName>
-          </instructions>
-        </configuration>
-      </plugin>
-    </plugins>
-  </build>
-</project>
diff --git a/netconf/pom.xml b/netconf/pom.xml
index 6ca46912fc..8d5b6f0ac6 100644
--- a/netconf/pom.xml
+++ b/netconf/pom.xml
@@ -34,7 +34,6 @@
     <module>mdsal-netconf-tcp</module>
     <module>mdsal-netconf-monitoring</module>
     <module>mdsal-netconf-yang-library</module>
-    <module>mdsal-netconf-impl</module>
     <module>netconf-netty-util</module>
     <module>netconf-auth</module>
     <module>aaa-authn-odl-plugin</module>
-- 
2.36.6