Remove callhome-server

The server/provider split does not make sense here -- we end up with
ping-pong through callbacks and whatnot.

Bring the thwo parts into a single component, as callhome-server touches
topology anyway.

While this is not directly tied to the SSL context work, callhome-server
is monitoring netconf-keystore, so the lifecycle needs to tied together
correctly.

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

diff --git a/apps/callhome-provider/pom.xml b/apps/callhome-provider/pom.xml
index 40418e4cf52eec36d253b0ce7e3fcd00035a4c1b..3ae8bbc4403cd8fe4449b13bdf0c9de3015b3bc5 100644 (file)
--- a/apps/callhome-provider/pom.xml
+++ b/apps/callhome-provider/pom.xml
@@ -73,10 +73,6 @@
             <groupId>org.opendaylight.netconf</groupId>
             <artifactId>netconf-topology</artifactId>
         </dependency>
-        <dependency>
-            <groupId>org.opendaylight.netconf</groupId>
-            <artifactId>callhome-server</artifactId>
-        </dependency>
         <dependency>
             <groupId>org.opendaylight.netconf</groupId>
             <artifactId>netconf-client-mdsal</artifactId>
@@ -98,11 +94,21 @@
             <artifactId>org.osgi.service.metatype.annotations</artifactId>
         </dependency>
 
+        <dependency>
+            <groupId>org.bouncycastle</groupId>
+            <artifactId>bcpkix-jdk18on</artifactId>
+            <scope>test</scope>
+        </dependency>
         <dependency>
             <groupId>org.opendaylight.mdsal</groupId>
             <artifactId>mdsal-binding-dom-adapter</artifactId>
             <type>test-jar</type>
             <scope>test</scope>
         </dependency>
+        <dependency>
+            <groupId>org.opendaylight.netconf</groupId>
+            <artifactId>netconf-server</artifactId>
+            <scope>test</scope>
+        </dependency>
     </dependencies>
 </project>

diff --git a/netconf/callhome-server/src/main/java/org/opendaylight/netconf/callhome/server/AbstractCallHomeSessionContextManager.java b/apps/callhome-provider/src/main/java/org/opendaylight/netconf/callhome/server/AbstractCallHomeSessionContextManager.java
similarity index 100%
rename from netconf/callhome-server/src/main/java/org/opendaylight/netconf/callhome/server/AbstractCallHomeSessionContextManager.java
rename to apps/callhome-provider/src/main/java/org/opendaylight/netconf/callhome/server/AbstractCallHomeSessionContextManager.java

diff --git a/netconf/callhome-server/src/main/java/org/opendaylight/netconf/callhome/server/CallHomeSessionContext.java b/apps/callhome-provider/src/main/java/org/opendaylight/netconf/callhome/server/CallHomeSessionContext.java
similarity index 100%
rename from netconf/callhome-server/src/main/java/org/opendaylight/netconf/callhome/server/CallHomeSessionContext.java
rename to apps/callhome-provider/src/main/java/org/opendaylight/netconf/callhome/server/CallHomeSessionContext.java

diff --git a/netconf/callhome-server/src/main/java/org/opendaylight/netconf/callhome/server/CallHomeSessionContextManager.java b/apps/callhome-provider/src/main/java/org/opendaylight/netconf/callhome/server/CallHomeSessionContextManager.java
similarity index 100%
rename from netconf/callhome-server/src/main/java/org/opendaylight/netconf/callhome/server/CallHomeSessionContextManager.java
rename to apps/callhome-provider/src/main/java/org/opendaylight/netconf/callhome/server/CallHomeSessionContextManager.java

diff --git a/netconf/callhome-server/src/main/java/org/opendaylight/netconf/callhome/server/CallHomeStatusRecorder.java b/apps/callhome-provider/src/main/java/org/opendaylight/netconf/callhome/server/CallHomeStatusRecorder.java
similarity index 100%
rename from netconf/callhome-server/src/main/java/org/opendaylight/netconf/callhome/server/CallHomeStatusRecorder.java
rename to apps/callhome-provider/src/main/java/org/opendaylight/netconf/callhome/server/CallHomeStatusRecorder.java

diff --git a/netconf/callhome-server/src/main/java/org/opendaylight/netconf/callhome/server/CallHomeTransportChannelListener.java b/apps/callhome-provider/src/main/java/org/opendaylight/netconf/callhome/server/CallHomeTransportChannelListener.java
similarity index 100%
rename from netconf/callhome-server/src/main/java/org/opendaylight/netconf/callhome/server/CallHomeTransportChannelListener.java
rename to apps/callhome-provider/src/main/java/org/opendaylight/netconf/callhome/server/CallHomeTransportChannelListener.java

diff --git a/netconf/callhome-server/src/main/java/org/opendaylight/netconf/callhome/server/ssh/CallHomeSshAuthProvider.java b/apps/callhome-provider/src/main/java/org/opendaylight/netconf/callhome/server/ssh/CallHomeSshAuthProvider.java
similarity index 100%
rename from netconf/callhome-server/src/main/java/org/opendaylight/netconf/callhome/server/ssh/CallHomeSshAuthProvider.java
rename to apps/callhome-provider/src/main/java/org/opendaylight/netconf/callhome/server/ssh/CallHomeSshAuthProvider.java

diff --git a/netconf/callhome-server/src/main/java/org/opendaylight/netconf/callhome/server/ssh/CallHomeSshAuthSettings.java b/apps/callhome-provider/src/main/java/org/opendaylight/netconf/callhome/server/ssh/CallHomeSshAuthSettings.java
similarity index 100%
rename from netconf/callhome-server/src/main/java/org/opendaylight/netconf/callhome/server/ssh/CallHomeSshAuthSettings.java
rename to apps/callhome-provider/src/main/java/org/opendaylight/netconf/callhome/server/ssh/CallHomeSshAuthSettings.java

diff --git a/netconf/callhome-server/src/main/java/org/opendaylight/netconf/callhome/server/ssh/CallHomeSshServer.java b/apps/callhome-provider/src/main/java/org/opendaylight/netconf/callhome/server/ssh/CallHomeSshServer.java
similarity index 100%
rename from netconf/callhome-server/src/main/java/org/opendaylight/netconf/callhome/server/ssh/CallHomeSshServer.java
rename to apps/callhome-provider/src/main/java/org/opendaylight/netconf/callhome/server/ssh/CallHomeSshServer.java

diff --git a/netconf/callhome-server/src/main/java/org/opendaylight/netconf/callhome/server/ssh/CallHomeSshSessionContext.java b/apps/callhome-provider/src/main/java/org/opendaylight/netconf/callhome/server/ssh/CallHomeSshSessionContext.java
similarity index 100%
rename from netconf/callhome-server/src/main/java/org/opendaylight/netconf/callhome/server/ssh/CallHomeSshSessionContext.java
rename to apps/callhome-provider/src/main/java/org/opendaylight/netconf/callhome/server/ssh/CallHomeSshSessionContext.java

diff --git a/netconf/callhome-server/src/main/java/org/opendaylight/netconf/callhome/server/ssh/CallHomeSshSessionContextManager.java b/apps/callhome-provider/src/main/java/org/opendaylight/netconf/callhome/server/ssh/CallHomeSshSessionContextManager.java
similarity index 100%
rename from netconf/callhome-server/src/main/java/org/opendaylight/netconf/callhome/server/ssh/CallHomeSshSessionContextManager.java
rename to apps/callhome-provider/src/main/java/org/opendaylight/netconf/callhome/server/ssh/CallHomeSshSessionContextManager.java

diff --git a/netconf/callhome-server/src/main/java/org/opendaylight/netconf/callhome/server/tls/CallHomeTlsAuthProvider.java b/apps/callhome-provider/src/main/java/org/opendaylight/netconf/callhome/server/tls/CallHomeTlsAuthProvider.java
similarity index 100%
rename from netconf/callhome-server/src/main/java/org/opendaylight/netconf/callhome/server/tls/CallHomeTlsAuthProvider.java
rename to apps/callhome-provider/src/main/java/org/opendaylight/netconf/callhome/server/tls/CallHomeTlsAuthProvider.java

diff --git a/netconf/callhome-server/src/main/java/org/opendaylight/netconf/callhome/server/tls/CallHomeTlsServer.java b/apps/callhome-provider/src/main/java/org/opendaylight/netconf/callhome/server/tls/CallHomeTlsServer.java
similarity index 100%
rename from netconf/callhome-server/src/main/java/org/opendaylight/netconf/callhome/server/tls/CallHomeTlsServer.java
rename to apps/callhome-provider/src/main/java/org/opendaylight/netconf/callhome/server/tls/CallHomeTlsServer.java

diff --git a/netconf/callhome-server/src/main/java/org/opendaylight/netconf/callhome/server/tls/CallHomeTlsSessionContext.java b/apps/callhome-provider/src/main/java/org/opendaylight/netconf/callhome/server/tls/CallHomeTlsSessionContext.java
similarity index 100%
rename from netconf/callhome-server/src/main/java/org/opendaylight/netconf/callhome/server/tls/CallHomeTlsSessionContext.java
rename to apps/callhome-provider/src/main/java/org/opendaylight/netconf/callhome/server/tls/CallHomeTlsSessionContext.java

diff --git a/netconf/callhome-server/src/main/java/org/opendaylight/netconf/callhome/server/tls/CallHomeTlsSessionContextManager.java b/apps/callhome-provider/src/main/java/org/opendaylight/netconf/callhome/server/tls/CallHomeTlsSessionContextManager.java
similarity index 100%
rename from netconf/callhome-server/src/main/java/org/opendaylight/netconf/callhome/server/tls/CallHomeTlsSessionContextManager.java
rename to apps/callhome-provider/src/main/java/org/opendaylight/netconf/callhome/server/tls/CallHomeTlsSessionContextManager.java

diff --git a/netconf/callhome-server/src/test/java/org/opendaylight/netconf/callhome/server/ssh/CallHomeSshServerTest.java b/apps/callhome-provider/src/test/java/org/opendaylight/netconf/callhome/server/ssh/CallHomeSshServerTest.java
similarity index 100%
rename from netconf/callhome-server/src/test/java/org/opendaylight/netconf/callhome/server/ssh/CallHomeSshServerTest.java
rename to apps/callhome-provider/src/test/java/org/opendaylight/netconf/callhome/server/ssh/CallHomeSshServerTest.java

diff --git a/netconf/callhome-server/src/test/java/org/opendaylight/netconf/callhome/server/tls/CallHomeTlsServerTest.java b/apps/callhome-provider/src/test/java/org/opendaylight/netconf/callhome/server/tls/CallHomeTlsServerTest.java
similarity index 100%
rename from netconf/callhome-server/src/test/java/org/opendaylight/netconf/callhome/server/tls/CallHomeTlsServerTest.java
rename to apps/callhome-provider/src/test/java/org/opendaylight/netconf/callhome/server/tls/CallHomeTlsServerTest.java

diff --git a/artifacts/pom.xml b/artifacts/pom.xml
index 6e94b2b69c2288b598fa630799c5870bcd8617e7..78bb91e23efa2220fff77479610564dc11eeac22 100644 (file)
--- a/artifacts/pom.xml
+++ b/artifacts/pom.xml
@@ -289,17 +289,6 @@
                 <version>${project.version}</version>
             </dependency>
 
-            <dependency>
-                <groupId>org.opendaylight.netconf</groupId>
-                <artifactId>callhome-server</artifactId>
-                <version>${project.version}</version>
-            </dependency>
-            <dependency>
-                <groupId>org.opendaylight.netconf</groupId>
-                <artifactId>callhome-provider</artifactId>
-                <version>${project.version}</version>
-            </dependency>
-
             <dependency>
                 <groupId>${project.groupId}</groupId>
                 <artifactId>netconf-client</artifactId>
@@ -309,6 +298,11 @@
             </dependency>
 
             <!-- Applications -->
+            <dependency>
+                <groupId>org.opendaylight.netconf</groupId>
+                <artifactId>callhome-provider</artifactId>
+                <version>${project.version}</version>
+            </dependency>
             <dependency>
                 <groupId>${project.groupId}</groupId>
                 <artifactId>netconf-console</artifactId>

diff --git a/netconf/callhome-server/pom.xml b/netconf/callhome-server/pom.xml
deleted file mode 100644 (file)
index fa62f52..0000000
--- a/netconf/callhome-server/pom.xml
+++ /dev/null
@@ -1,44 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  Copyright (c) 2023 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>7.0.0-SNAPSHOT</version>
-        <relativePath>../../parent</relativePath>
-    </parent>
-
-    <artifactId>callhome-server</artifactId>
-    <name>${project.artifactId}</name>
-    <packaging>bundle</packaging>
-
-    <dependencies>
-        <dependency>
-            <groupId>com.google.guava</groupId>
-            <artifactId>guava</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.opendaylight.netconf</groupId>
-            <artifactId>netconf-client</artifactId>
-        </dependency>
-
-        <dependency>
-            <groupId>org.bouncycastle</groupId>
-            <artifactId>bcpkix-jdk18on</artifactId>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.opendaylight.netconf</groupId>
-            <artifactId>netconf-server</artifactId>
-            <scope>test</scope>
-        </dependency>
-    </dependencies>
-</project>

diff --git a/netconf/pom.xml b/netconf/pom.xml
index 50bbe1b852a5979b50c4df624dd5c2f9ed3bff68..9e5812802a32a0847cca1544b10284a789048758 100644 (file)
--- a/netconf/pom.xml
+++ b/netconf/pom.xml
@@ -34,8 +34,6 @@
     <module>yanglib</module>
     <module>tools</module>
 
-    <module>callhome-server</module>
-
     <module>netconf-test-models</module>
   </modules>
 </project>