Rename aaa-authn-odl-plugin to netconf-auth-aaa

This a plugins/ layer thing, as it integrates with AAA. Rename the
artifact, updating references. Also eliminate the -no-cluster part, as
it completely the same as odl-aaa-netconf-plugin.

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

diff --git a/artifacts/pom.xml b/artifacts/pom.xml
index 73a5813f82cc266dd3c2c8893c1c8974c7c5c729..e624ef7b042570bd864813fb88f4f1db047187a2 100644 (file)
--- a/artifacts/pom.xml
+++ b/artifacts/pom.xml
@@ -25,11 +25,6 @@
 
     <dependencyManagement>
         <dependencies>
-            <dependency>
-                <groupId>${project.groupId}</groupId>
-                <artifactId>aaa-authn-odl-plugin</artifactId>
-                <version>${project.version}</version>
-            </dependency>
             <dependency>
                 <groupId>${project.groupId}</groupId>
                 <artifactId>netconf-api</artifactId>
@@ -37,12 +32,12 @@
             </dependency>
             <dependency>
                 <groupId>${project.groupId}</groupId>
-                <artifactId>netconf-dom-api</artifactId>
+                <artifactId>netconf-auth</artifactId>
                 <version>${project.version}</version>
             </dependency>
             <dependency>
                 <groupId>${project.groupId}</groupId>
-                <artifactId>netconf-auth</artifactId>
+                <artifactId>netconf-auth-aaa</artifactId>
                 <version>${project.version}</version>
             </dependency>
             <dependency>
@@ -65,6 +60,11 @@
                 <artifactId>netconf-config</artifactId>
                 <version>${project.version}</version>
             </dependency>
+            <dependency>
+                <groupId>${project.groupId}</groupId>
+                <artifactId>netconf-dom-api</artifactId>
+                <version>${project.version}</version>
+            </dependency>
             <dependency>
                 <groupId>${project.groupId}</groupId>
                 <artifactId>netconf-server</artifactId>
@@ -342,13 +342,6 @@
                 <type>xml</type>
                 <classifier>features</classifier>
             </dependency>
-            <dependency>
-                <groupId>${project.groupId}</groupId>
-                <artifactId>odl-aaa-netconf-plugin-no-cluster</artifactId>
-                <version>${project.version}</version>
-                <type>xml</type>
-                <classifier>features</classifier>
-            </dependency>
             <dependency>
                 <groupId>${project.groupId}</groupId>
                 <artifactId>odl-netconf-all</artifactId>

diff --git a/features/netconf/features-netconf-testing/pom.xml b/features/netconf/features-netconf-testing/pom.xml
index e70ecfcd9c47cda655d2c62737e3361083d98f76..68fa4d6c3b2b625392041df190dd56a2cdfe4a2c 100644 (file)
--- a/features/netconf/features-netconf-testing/pom.xml
+++ b/features/netconf/features-netconf-testing/pom.xml
@@ -40,12 +40,6 @@
           <type>xml</type>
           <classifier>features</classifier>
       </dependency>
-      <dependency>
-          <groupId>${project.groupId}</groupId>
-          <artifactId>odl-aaa-netconf-plugin-no-cluster</artifactId>
-          <type>xml</type>
-          <classifier>features</classifier>
-      </dependency>
       <dependency>
           <groupId>${project.groupId}</groupId>
           <artifactId>odl-netconf-all</artifactId>

diff --git a/features/netconf/features-netconf/pom.xml b/features/netconf/features-netconf/pom.xml
index b84d110f5fdfb8e8bbaa51a72644416ed32b7612..fc44f00d259e39e13b24f1c741f2e4e16b5939f1 100644 (file)
--- a/features/netconf/features-netconf/pom.xml
+++ b/features/netconf/features-netconf/pom.xml
@@ -40,12 +40,6 @@
       <type>xml</type>
       <classifier>features</classifier>
     </dependency>
-    <dependency>
-      <groupId>${project.groupId}</groupId>
-      <artifactId>odl-aaa-netconf-plugin-no-cluster</artifactId>
-      <type>xml</type>
-      <classifier>features</classifier>
-    </dependency>
     <dependency>
       <groupId>${project.groupId}</groupId>
       <artifactId>odl-netconf-all</artifactId>

diff --git a/features/netconf/odl-aaa-netconf-plugin-no-cluster/pom.xml b/features/netconf/odl-aaa-netconf-plugin-no-cluster/pom.xml
deleted file mode 100644 (file)
index d6da77d..0000000
--- a/features/netconf/odl-aaa-netconf-plugin-no-cluster/pom.xml
+++ /dev/null
@@ -1,39 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- Copyright © 2017 Red Hat, Inc. and others.
-
- 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>feature-parent</artifactId>
-        <version>6.0.0-SNAPSHOT</version>
-        <relativePath>../../parent</relativePath>
-    </parent>
-
-    <artifactId>odl-aaa-netconf-plugin-no-cluster</artifactId>
-    <packaging>feature</packaging>
-    <name>OpenDaylight :: AAA :: ODL NETCONF Plugin - NO CLUSTER</name>
-
-    <dependencies>
-        <dependency>
-            <groupId>org.opendaylight.netconf</groupId>
-            <artifactId>netconf-auth</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.opendaylight.aaa</groupId>
-            <artifactId>odl-aaa-shiro</artifactId>
-            <type>xml</type>
-            <classifier>features</classifier>
-        </dependency>
-        <dependency>
-            <groupId>org.opendaylight.netconf</groupId>
-            <artifactId>aaa-authn-odl-plugin</artifactId>
-        </dependency>
-    </dependencies>
-</project>

diff --git a/features/netconf/odl-aaa-netconf-plugin-no-cluster/src/main/feature/feature.xml b/features/netconf/odl-aaa-netconf-plugin-no-cluster/src/main/feature/feature.xml
deleted file mode 100644 (file)
index e60e727..0000000
--- a/features/netconf/odl-aaa-netconf-plugin-no-cluster/src/main/feature/feature.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<!--
- Copyright © 2021 PANTHEON.tech, s.r.o. and others.
- 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
- -->
-<features xmlns="http://karaf.apache.org/xmlns/features/v1.4.0" name="odl-aaa-netconf-plugin-no-cluster">
-    <feature name="odl-aaa-netconf-plugin-no-cluster">
-        <feature version="[0.17,1)">odl-aaa-shiro</feature>
-    </feature>
-</features>

diff --git a/features/netconf/odl-aaa-netconf-plugin/pom.xml b/features/netconf/odl-aaa-netconf-plugin/pom.xml
index 7acdaed0a2bc2331bf996d2f5402b305369ec602..ff8d83ad7fd7367d357eca14f48b843cc2236528 100644 (file)
--- a/features/netconf/odl-aaa-netconf-plugin/pom.xml
+++ b/features/netconf/odl-aaa-netconf-plugin/pom.xml
@@ -18,7 +18,7 @@
 
     <artifactId>odl-aaa-netconf-plugin</artifactId>
     <packaging>feature</packaging>
-    <name>OpenDaylight :: AAA :: ODL NETCONF Plugin</name>
+    <name>OpenDaylight :: Netconf :: AAA Authorization Plugin</name>
 
     <dependencies>
         <dependency>
@@ -29,11 +29,11 @@
         </dependency>
         <dependency>
             <groupId>${project.groupId}</groupId>
-            <artifactId>aaa-authn-odl-plugin</artifactId>
+            <artifactId>netconf-auth</artifactId>
         </dependency>
         <dependency>
             <groupId>${project.groupId}</groupId>
-            <artifactId>netconf-auth</artifactId>
+            <artifactId>netconf-auth-aaa</artifactId>
         </dependency>
     </dependencies>
 </project>

diff --git a/features/netconf/pom.xml b/features/netconf/pom.xml
index 5a4940c2886bafd7295dc8748f0fdfc95da00701..82b0af5bf307a7a462e0e4e6a41ed8033309f5de 100644 (file)
--- a/features/netconf/pom.xml
+++ b/features/netconf/pom.xml
@@ -28,7 +28,6 @@
   <modules>
     <module>features-netconf</module>
     <module>odl-aaa-netconf-plugin</module>
-    <module>odl-aaa-netconf-plugin-no-cluster</module>
     <module>odl-netconf-all</module>
     <module>odl-netconf-api</module>
     <module>odl-netconf-client</module>

diff --git a/netconf/netconf-auth/src/main/java/org/opendaylight/netconf/auth/AuthProvider.java b/netconf/netconf-auth/src/main/java/org/opendaylight/netconf/auth/AuthProvider.java
index e32b20bf3451ea44a0c46f59c8ebab295b92142d..db46d48663104ff78f062a2b2123aa53e25cebd3 100644 (file)
--- a/netconf/netconf-auth/src/main/java/org/opendaylight/netconf/auth/AuthProvider.java
+++ b/netconf/netconf-auth/src/main/java/org/opendaylight/netconf/auth/AuthProvider.java
@@ -5,14 +5,12 @@
  * 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.auth;
 
 /**
  * Authentication Service definition for netconf.
  */
 public interface AuthProvider {
-
     /**
      * Authenticate user by username/password.
      *
@@ -21,5 +19,4 @@ public interface AuthProvider {
      * @return true if authentication is successful, false otherwise
      */
     boolean authenticated(String username, String password);
-
 }

diff --git a/netconf/pom.xml b/netconf/pom.xml
index 37d8220545525d3d6ead69df1c56e5f701ca5fdc..5e927fab5110894de0be20c749bfdb1353a7f824 100644 (file)
--- a/netconf/pom.xml
+++ b/netconf/pom.xml
@@ -35,7 +35,6 @@
     <module>mdsal-netconf-yang-library</module>
     <module>netconf-netty-util</module>
     <module>netconf-auth</module>
-    <module>aaa-authn-odl-plugin</module>
     <module>yanglib</module>
     <module>tools</module>
 

diff --git a/netconf/aaa-authn-odl-plugin/pom.xml b/plugins/netconf-auth-aaa/pom.xml
similarity index 89%
rename from netconf/aaa-authn-odl-plugin/pom.xml
rename to plugins/netconf-auth-aaa/pom.xml
index b6f62e022726755daf7416cea8fa13a5e722f8eb..5fc4d7992dc426c160c2b9366b022a595429c802 100644 (file)
--- a/netconf/aaa-authn-odl-plugin/pom.xml
+++ b/plugins/netconf-auth-aaa/pom.xml
@@ -16,7 +16,7 @@
         <relativePath>../../parent</relativePath>
     </parent>
 
-    <artifactId>aaa-authn-odl-plugin</artifactId>
+    <artifactId>netconf-auth-aaa</artifactId>
     <packaging>bundle</packaging>
 
     <dependencies>
@@ -24,10 +24,6 @@
             <groupId>org.opendaylight.aaa</groupId>
             <artifactId>aaa-authn-api</artifactId>
         </dependency>
-        <dependency>
-            <groupId>org.slf4j</groupId>
-            <artifactId>slf4j-api</artifactId>
-        </dependency>
         <dependency>
             <groupId>org.opendaylight.netconf</groupId>
             <artifactId>netconf-auth</artifactId>

diff --git a/netconf/aaa-authn-odl-plugin/src/main/java/org/opendaylight/netconf/authprovider/CredentialServiceAuthProvider.java b/plugins/netconf-auth-aaa/src/main/java/org/opendaylight/netconf/auth/aaa/CredentialServiceAuthProvider.java
similarity index 97%
rename from netconf/aaa-authn-odl-plugin/src/main/java/org/opendaylight/netconf/authprovider/CredentialServiceAuthProvider.java
rename to plugins/netconf-auth-aaa/src/main/java/org/opendaylight/netconf/auth/aaa/CredentialServiceAuthProvider.java
index aa05830cd1c3b44547096f1d87e45ad2c47741b6..e90d5069946de73ceaa94c44413b9f9a6358d535 100644 (file)
--- a/netconf/aaa-authn-odl-plugin/src/main/java/org/opendaylight/netconf/authprovider/CredentialServiceAuthProvider.java
+++ b/plugins/netconf-auth-aaa/src/main/java/org/opendaylight/netconf/auth/aaa/CredentialServiceAuthProvider.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.authprovider;
+package org.opendaylight.netconf.auth.aaa;
 
 import static java.util.Objects.requireNonNull;
 

diff --git a/netconf/aaa-authn-odl-plugin/src/main/java/org/opendaylight/netconf/authprovider/DefaultPasswordCredentials.java b/plugins/netconf-auth-aaa/src/main/java/org/opendaylight/netconf/auth/aaa/DefaultPasswordCredentials.java
similarity index 95%
rename from netconf/aaa-authn-odl-plugin/src/main/java/org/opendaylight/netconf/authprovider/DefaultPasswordCredentials.java
rename to plugins/netconf-auth-aaa/src/main/java/org/opendaylight/netconf/auth/aaa/DefaultPasswordCredentials.java
index 70798a7c579bdfac4fdf58148bfc249f1099ffd1..c5e862e12bd0824b86707841bcf85bd5578fed76 100644 (file)
--- a/netconf/aaa-authn-odl-plugin/src/main/java/org/opendaylight/netconf/authprovider/DefaultPasswordCredentials.java
+++ b/plugins/netconf-auth-aaa/src/main/java/org/opendaylight/netconf/auth/aaa/DefaultPasswordCredentials.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.authprovider;
+package org.opendaylight.netconf.auth.aaa;
 
 import org.opendaylight.aaa.api.PasswordCredentials;
 

diff --git a/netconf/aaa-authn-odl-plugin/src/test/java/org/opendaylight/netconf/authprovider/CredentialServiceAuthProviderTest.java b/plugins/netconf-auth-aaa/src/test/java/org/opendaylight/netconf/authprovider/CredentialServiceAuthProviderTest.java
similarity index 96%
rename from netconf/aaa-authn-odl-plugin/src/test/java/org/opendaylight/netconf/authprovider/CredentialServiceAuthProviderTest.java
rename to plugins/netconf-auth-aaa/src/test/java/org/opendaylight/netconf/authprovider/CredentialServiceAuthProviderTest.java
index a2ebe91c9d9dc255e957427567d04d8f1357615d..74e403dd7c3621d2e362da4ea3dc05fb289677c0 100644 (file)
--- a/netconf/aaa-authn-odl-plugin/src/test/java/org/opendaylight/netconf/authprovider/CredentialServiceAuthProviderTest.java
+++ b/plugins/netconf-auth-aaa/src/test/java/org/opendaylight/netconf/authprovider/CredentialServiceAuthProviderTest.java
@@ -22,6 +22,7 @@ import org.opendaylight.aaa.api.AuthenticationException;
 import org.opendaylight.aaa.api.Claim;
 import org.opendaylight.aaa.api.PasswordCredentialAuth;
 import org.opendaylight.aaa.api.PasswordCredentials;
+import org.opendaylight.netconf.auth.aaa.CredentialServiceAuthProvider;
 
 @RunWith(MockitoJUnitRunner.StrictStubs.class)
 public class CredentialServiceAuthProviderTest {

diff --git a/plugins/pom.xml b/plugins/pom.xml
index 2ab00025c5400980632d7ae5b4dbb3d93a9bfbbe..468ef0004b559bdb8afb88bee0b2c2fd69e75cd7 100644 (file)
--- a/plugins/pom.xml
+++ b/plugins/pom.xml
@@ -29,6 +29,7 @@
     </properties>
 
     <modules>
+        <module>netconf-auth-aaa</module>
         <module>netconf-common-mdsal</module>
         <module>netconf-dom-api</module>
         <module>netconf-server-mdsal</module>