From 5b5f546ccc244be5eef581edb89320e9f2d6bbab Mon Sep 17 00:00:00 2001 From: Robert Varga Date: Sun, 30 Apr 2023 21:39:20 +0200 Subject: [PATCH] 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 --- artifacts/pom.xml | 21 ++++------ .../netconf/features-netconf-testing/pom.xml | 6 --- features/netconf/features-netconf/pom.xml | 6 --- .../odl-aaa-netconf-plugin-no-cluster/pom.xml | 39 ------------------- .../src/main/feature/feature.xml | 12 ------ .../netconf/odl-aaa-netconf-plugin/pom.xml | 6 +-- features/netconf/pom.xml | 1 - .../netconf/auth/AuthProvider.java | 3 -- netconf/pom.xml | 1 - .../netconf-auth-aaa}/pom.xml | 6 +-- .../aaa}/CredentialServiceAuthProvider.java | 2 +- .../auth/aaa}/DefaultPasswordCredentials.java | 2 +- .../CredentialServiceAuthProviderTest.java | 1 + plugins/pom.xml | 1 + 14 files changed, 15 insertions(+), 92 deletions(-) delete mode 100644 features/netconf/odl-aaa-netconf-plugin-no-cluster/pom.xml delete mode 100644 features/netconf/odl-aaa-netconf-plugin-no-cluster/src/main/feature/feature.xml rename {netconf/aaa-authn-odl-plugin => plugins/netconf-auth-aaa}/pom.xml (89%) rename {netconf/aaa-authn-odl-plugin/src/main/java/org/opendaylight/netconf/authprovider => plugins/netconf-auth-aaa/src/main/java/org/opendaylight/netconf/auth/aaa}/CredentialServiceAuthProvider.java (97%) rename {netconf/aaa-authn-odl-plugin/src/main/java/org/opendaylight/netconf/authprovider => plugins/netconf-auth-aaa/src/main/java/org/opendaylight/netconf/auth/aaa}/DefaultPasswordCredentials.java (95%) rename {netconf/aaa-authn-odl-plugin => plugins/netconf-auth-aaa}/src/test/java/org/opendaylight/netconf/authprovider/CredentialServiceAuthProviderTest.java (96%) diff --git a/artifacts/pom.xml b/artifacts/pom.xml index 73a5813f82..e624ef7b04 100644 --- a/artifacts/pom.xml +++ b/artifacts/pom.xml @@ -25,11 +25,6 @@ - - ${project.groupId} - aaa-authn-odl-plugin - ${project.version} - ${project.groupId} netconf-api @@ -37,12 +32,12 @@ ${project.groupId} - netconf-dom-api + netconf-auth ${project.version} ${project.groupId} - netconf-auth + netconf-auth-aaa ${project.version} @@ -65,6 +60,11 @@ netconf-config ${project.version} + + ${project.groupId} + netconf-dom-api + ${project.version} + ${project.groupId} netconf-server @@ -342,13 +342,6 @@ xml features - - ${project.groupId} - odl-aaa-netconf-plugin-no-cluster - ${project.version} - xml - features - ${project.groupId} odl-netconf-all diff --git a/features/netconf/features-netconf-testing/pom.xml b/features/netconf/features-netconf-testing/pom.xml index e70ecfcd9c..68fa4d6c3b 100644 --- a/features/netconf/features-netconf-testing/pom.xml +++ b/features/netconf/features-netconf-testing/pom.xml @@ -40,12 +40,6 @@ xml features - - ${project.groupId} - odl-aaa-netconf-plugin-no-cluster - xml - features - ${project.groupId} odl-netconf-all diff --git a/features/netconf/features-netconf/pom.xml b/features/netconf/features-netconf/pom.xml index b84d110f5f..fc44f00d25 100644 --- a/features/netconf/features-netconf/pom.xml +++ b/features/netconf/features-netconf/pom.xml @@ -40,12 +40,6 @@ xml features - - ${project.groupId} - odl-aaa-netconf-plugin-no-cluster - xml - features - ${project.groupId} odl-netconf-all 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 index d6da77d8cf..0000000000 --- a/features/netconf/odl-aaa-netconf-plugin-no-cluster/pom.xml +++ /dev/null @@ -1,39 +0,0 @@ - - - - 4.0.0 - - - org.opendaylight.netconf - feature-parent - 6.0.0-SNAPSHOT - ../../parent - - - odl-aaa-netconf-plugin-no-cluster - feature - OpenDaylight :: AAA :: ODL NETCONF Plugin - NO CLUSTER - - - - org.opendaylight.netconf - netconf-auth - - - org.opendaylight.aaa - odl-aaa-shiro - xml - features - - - org.opendaylight.netconf - aaa-authn-odl-plugin - - - 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 index e60e727a4c..0000000000 --- a/features/netconf/odl-aaa-netconf-plugin-no-cluster/src/main/feature/feature.xml +++ /dev/null @@ -1,12 +0,0 @@ - - - - - odl-aaa-shiro - - diff --git a/features/netconf/odl-aaa-netconf-plugin/pom.xml b/features/netconf/odl-aaa-netconf-plugin/pom.xml index 7acdaed0a2..ff8d83ad7f 100644 --- a/features/netconf/odl-aaa-netconf-plugin/pom.xml +++ b/features/netconf/odl-aaa-netconf-plugin/pom.xml @@ -18,7 +18,7 @@ odl-aaa-netconf-plugin feature - OpenDaylight :: AAA :: ODL NETCONF Plugin + OpenDaylight :: Netconf :: AAA Authorization Plugin @@ -29,11 +29,11 @@ ${project.groupId} - aaa-authn-odl-plugin + netconf-auth ${project.groupId} - netconf-auth + netconf-auth-aaa diff --git a/features/netconf/pom.xml b/features/netconf/pom.xml index 5a4940c288..82b0af5bf3 100644 --- a/features/netconf/pom.xml +++ b/features/netconf/pom.xml @@ -28,7 +28,6 @@ features-netconf odl-aaa-netconf-plugin - odl-aaa-netconf-plugin-no-cluster odl-netconf-all odl-netconf-api odl-netconf-client 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 e32b20bf34..db46d48663 100644 --- 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 37d8220545..5e927fab51 100644 --- a/netconf/pom.xml +++ b/netconf/pom.xml @@ -35,7 +35,6 @@ mdsal-netconf-yang-library netconf-netty-util netconf-auth - aaa-authn-odl-plugin yanglib tools 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 b6f62e0227..5fc4d7992d 100644 --- a/netconf/aaa-authn-odl-plugin/pom.xml +++ b/plugins/netconf-auth-aaa/pom.xml @@ -16,7 +16,7 @@ ../../parent - aaa-authn-odl-plugin + netconf-auth-aaa bundle @@ -24,10 +24,6 @@ org.opendaylight.aaa aaa-authn-api - - org.slf4j - slf4j-api - org.opendaylight.netconf netconf-auth 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 aa05830cd1..e90d506994 100644 --- 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 70798a7c57..c5e862e12b 100644 --- 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 a2ebe91c9d..74e403dd7c 100644 --- 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 2ab00025c5..468ef0004b 100644 --- a/plugins/pom.xml +++ b/plugins/pom.xml @@ -29,6 +29,7 @@ + netconf-auth-aaa netconf-common-mdsal netconf-dom-api netconf-server-mdsal -- 2.36.6