aaa.git
5 years agoRemove javax.annotation-api version overrides 48/80948/1
Robert Varga [Mon, 18 Mar 2019 12:29:13 +0000 (13:29 +0100)]
Remove javax.annotation-api version overrides

odlparent-4.0.9 is integrated, hence the override is not needed
anymore.

Change-Id: I535c5b9e93a0d324729a7c741cab178b6cae01a1
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
5 years agoEliminate powermock from aaa-encrypt-service 27/80727/1
Robert Varga [Thu, 7 Mar 2019 16:11:12 +0000 (17:11 +0100)]
Eliminate powermock from aaa-encrypt-service

The single test here is easily reformulated in terms of mockito,
hence remove static mocking and powermock.

Change-Id: I80b6ac652cd985cdd5e3f12244a503ec86e9560c
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
5 years agoMigrate to ArgumentMatchers 20/80720/2
Robert Varga [Thu, 7 Mar 2019 14:15:14 +0000 (15:15 +0100)]
Migrate to ArgumentMatchers

This fixes warnings in aaa-cert around use of deprecated mockito
methods.

Change-Id: Iadb9adbcc409d10dd85b12aa97204178df18faa5
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
5 years agoRemove powermock from KeyStoresDataUtilsTest 19/80719/2
Robert Varga [Thu, 7 Mar 2019 14:12:58 +0000 (15:12 +0100)]
Remove powermock from KeyStoresDataUtilsTest

This test uses static method mocking, but that can be easily
fixed by injecting proper DataBroker behavior.

Remove static mocking, eliminating the need for powermockito
in aaa-cert.

Change-Id: I507eadf7ac789c0aae3a057dc8440d425b90a90a
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
5 years agoRemove powermock from AaaCertProviderTest 18/80718/2
Robert Varga [Thu, 7 Mar 2019 13:59:54 +0000 (14:59 +0100)]
Remove powermock from AaaCertProviderTest

This test does not require powermock, use plain mockito instead.

Change-Id: Icbb330547fb1fe771b340e3db00600b5e7363e98
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
5 years agomake JettyWebServer accept WebContext path without slash (and test it) 06/80206/1
Michael Vorburger [Thu, 7 Feb 2019 13:23:30 +0000 (14:23 +0100)]
make JettyWebServer accept WebContext path without slash (and test it)

because that is, apparently, what the "real" (Jetty through Pax Web)
implementation in the Karaf run-time does.  This has come up in the
review of change I614a48bcc425db8faa1a79ebd6236236bcd09e73, where I
added a slash to a context to get a test to pass - with this, that is no
longer needed.

Change-Id: I3c632adbb4c4a9d9ac7bed4557bcaaece47dd0cf
Signed-off-by: Michael Vorburger <vorburger@redhat.com>
5 years agoBump versions by x.y.(z+1) 81/80081/1
jenkins-releng [Fri, 1 Feb 2019 13:06:28 +0000 (13:06 +0000)]
Bump versions by x.y.(z+1)

Change-Id: Ie79426eab5edd155329862d04fe9ce44c7d0c656
Signed-off-by: jenkins-releng <jenkins-releng@opendaylight.org>
5 years agoFix idmtool print error in case of using python3 39/79939/1
Yi Yang [Mon, 28 Jan 2019 02:50:35 +0000 (21:50 -0500)]
Fix idmtool print error in case of using python3

In Ubuntu 16.04, python3 is default python version, but idmtool
is still using non-strict print syntax, so it won't work if we
use python3, here is error information.

vagrant@odl:~$ python3 ./idmtool.py.orig
File "./idmtool.py.orig", line 143
print ''
^
SyntaxError: Missing parentheses in call to 'print'

In python3, print must use parentheses to embrace all the arguments.

Change-Id: Icec4c9c0225cae4c62e2189af9702789906d5e4f
JIRA: AAA-183
Signed-off-by: Yi Yang <yangyi01@inspur.com>
5 years agoMove BP xml files to standard OSGI-INF/blueprint 57/79857/1
Tom Pantelis [Wed, 23 Jan 2019 17:02:01 +0000 (12:02 -0500)]
Move BP xml files to standard OSGI-INF/blueprint

Change-Id: I79b9abc3e972fdea31eb5df4e53b05bc3565d35e
Signed-off-by: Tom Pantelis <tompantelis@gmail.com>
5 years agoBump powermock to version 2.0.0 29/79829/1
Robert Varga [Tue, 22 Jan 2019 22:52:44 +0000 (23:52 +0100)]
Bump powermock to version 2.0.0

This bumps from RC.4 to proper release.

Change-Id: I9533df7def94c361d3c3f3f3892ba980de744277
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
5 years agoBump to mdsal 3.0.6 05/79805/1
Stephen Kitt [Tue, 22 Jan 2019 08:49:41 +0000 (09:49 +0100)]
Bump to mdsal 3.0.6

Change-Id: I6432535435acbd096791d324cfa00903c986a469
Signed-off-by: Stephen Kitt <skitt@redhat.com>
5 years agoBump mdsal to 3.0.5 45/79745/4
Robert Varga [Sat, 19 Jan 2019 20:37:02 +0000 (21:37 +0100)]
Bump mdsal to 3.0.5

This aligns with odlparent-4.0.9 and yangtools-2.1.8.

Change-Id: If0c311f1c31cf0a99964ec14bde6ccc86527a382
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
5 years agoBump yangtools to 2.1.8 44/79744/2
Robert Varga [Sat, 19 Jan 2019 20:37:37 +0000 (21:37 +0100)]
Bump yangtools to 2.1.8

This align with odlparent-4.0.9.

Change-Id: I555b1b04676c3f37ee7c67cb971f91ea4aea4fb5
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
5 years agoBump to odlparent 4.0.9 61/79661/1
Stephen Kitt [Fri, 18 Jan 2019 15:31:56 +0000 (16:31 +0100)]
Bump to odlparent 4.0.9

Change-Id: Ibf8eb27fcf75562498547adcbbc7a15833550c7a
Signed-off-by: Stephen Kitt <skitt@redhat.com>
5 years agoMerge "introduce aaa.web.testutils with WebTestModule & TestWebClient"
Tom Pantelis [Wed, 16 Jan 2019 14:25:00 +0000 (14:25 +0000)]
Merge "introduce aaa.web.testutils with WebTestModule & TestWebClient"

5 years agointroduce aaa.web.testutils with WebTestModule & TestWebClient 84/79384/2
Michael Vorburger [Wed, 9 Jan 2019 23:08:42 +0000 (00:08 +0100)]
introduce aaa.web.testutils with WebTestModule & TestWebClient

Change-Id: Ib8570f3998ee99d84d3742529379990a29fbe013
Signed-off-by: Michael Vorburger <vorburger@redhat.com>
5 years agoBump mdsal to 3.0.4 27/79427/1
Robert Varga [Thu, 10 Jan 2019 15:39:21 +0000 (16:39 +0100)]
Bump mdsal to 3.0.4

This realigns odlparent/yangtools/mdsal and brings in the latest
improvements.

Change-Id: I45bfb98de61cd780d50fa8c6c9d42744815e1a07
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
5 years agoBump yangtools to 2.1.7 21/79421/1
Robert Varga [Thu, 10 Jan 2019 15:26:27 +0000 (16:26 +0100)]
Bump yangtools to 2.1.7

This realigns odlparent/yangtools and brings in a few minor
improvements.

Change-Id: Ia158bcda7a39c48505369933f00c5a3be989c22e
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
5 years agoBump to odlparent 4.0.8 56/79356/1
Stephen Kitt [Wed, 9 Jan 2019 14:54:46 +0000 (15:54 +0100)]
Bump to odlparent 4.0.8

Change-Id: Id8eaf6ac9a9b00e57aef34171566dc4c5aee0eba
Signed-off-by: Stephen Kitt <skitt@redhat.com>
5 years agoDrop javax.annotation-api scope 12/79212/1
Robert Varga [Thu, 3 Jan 2019 18:28:35 +0000 (19:28 +0100)]
Drop javax.annotation-api scope

scope=provided does not seem to be necessary, remove it.

Change-Id: I185d18287dc02269cd33fa157e288e666cf4dce2
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
5 years agoAdd javax.annotation dependencies 97/79197/2
Robert Varga [Thu, 3 Jan 2019 18:28:35 +0000 (19:28 +0100)]
Add javax.annotation dependencies

Java 11 does not ship with javax.annotation package, hence
we need to declare our dependency on them.

Change-Id: Iffec742af6f9375f62cb34b72ee5a0c4505aaadd
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
5 years agoFix compilation with JDK11 07/79107/7
Robert Varga [Tue, 1 Jan 2019 22:59:08 +0000 (23:59 +0100)]
Fix compilation with JDK11

PowerMock-1.7.4 just does not work with JDK11, update it to version
2.0.0.RC-4, which mostly works, and add javax.xml exclusions to
work around the remaining issue.

Change-Id: I947bd4f721a0cfaad5e0bc02ec5f87665eb0bddd
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
5 years agoUse scope=provided for karaf console 96/79196/1
Robert Varga [Thu, 3 Jan 2019 18:08:04 +0000 (19:08 +0100)]
Use scope=provided for karaf console

We expect karaf shell to be provided by the base distribution,
hence we should not use scope=compile here.

Change-Id: I1b71bb68014dfd629d56ab63810a3988a16105c6
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
5 years agoBump odlparent to 4.0.7 00/79100/5
Robert Varga [Tue, 1 Jan 2019 21:17:56 +0000 (22:17 +0100)]
Bump odlparent to 4.0.7

This fixes SFT compatibility with JDK11.

Change-Id: I17087d0966d3070bc504338767b6e52f61bee457
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
5 years agoSwitch to using spotbugs 41/79141/2
Robert Varga [Wed, 2 Jan 2019 14:38:31 +0000 (15:38 +0100)]
Switch to using spotbugs

findbugs throws ugly warnings and generally does not work with
JDK9+. Switch to spotbugs, which works fine.

Change-Id: I07809138b06a664cda825612658685e31d348aae
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
5 years agoLower aaa-cli dependency on shell 32/79132/1
Robert Varga [Wed, 2 Jan 2019 12:17:14 +0000 (13:17 +0100)]
Lower aaa-cli dependency on shell

karaf.shell.core is providing all the interfaces required for
this artifact, make sure we depend only on that.

Change-Id: Ia24ca6fb9339d8fc43b2003e498c3df5dc25ab39
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
5 years agoEliminate unneeded jaxb-api version/exclusion 06/79106/2
Robert Varga [Tue, 1 Jan 2019 22:21:49 +0000 (23:21 +0100)]
Eliminate unneeded jaxb-api version/exclusion

odlparent is declaring the correct dependency, reuse it from there.

Change-Id: I227235ad69c786dacb6bdc83edb0cce21b9eab77
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
5 years agoUse odl-jersey-2 35/79035/2
Robert Varga [Mon, 24 Dec 2018 20:46:09 +0000 (21:46 +0100)]
Use odl-jersey-2

odlparent is packaging a global version of Jersey, make sure we
use that feature instead of rolling our own.

Change-Id: I4e8444669a3ae487b2f9d7b8d11107fa60242921
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
5 years agoTrim odl-aaa-api bundles 34/79034/2
Robert Varga [Mon, 24 Dec 2018 20:37:50 +0000 (21:37 +0100)]
Trim odl-aaa-api bundles

odlparent bundles servlet and JAX-RS APIs, use those features
instead of packaging artifacts ourselves.

Change-Id: Ic47199e2980bd7f2ebb32894968ff3ecf259a9eb
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
5 years agoRemove unneeded sshd-core dependency 33/79033/2
Robert Varga [Mon, 24 Dec 2018 20:32:42 +0000 (21:32 +0100)]
Remove unneeded sshd-core dependency

This dependency was missed in
I6d96764f36c8d60944c68361e63d613120098946, remove it now as
it's completely defunct.

Change-Id: I1068d51805a3541d724c0e14aef4bffe98f6c84d
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
5 years agoUse odl-apache-commons-codec 32/79032/2
Robert Varga [Mon, 24 Dec 2018 20:22:33 +0000 (21:22 +0100)]
Use odl-apache-commons-codec

odlparent is packaging commons-codec in a feature, use that rather
than packaging it ourselves.

Change-Id: Ic8162e2c9e7bd8767d5e8985b8d6f37fc66dbf01
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
5 years agoRemove unneeded commons-codec dependency 31/79031/2
Robert Varga [Mon, 24 Dec 2018 20:10:32 +0000 (21:10 +0100)]
Remove unneeded commons-codec dependency

This dependency is not used in the feature, drop it.

Change-Id: I107a5f141ccc8f7fbce7ba1d7df0500716caa85f
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
5 years agoBump mdsal to 3.0.3 11/79011/1
Robert Varga [Sun, 23 Dec 2018 10:29:00 +0000 (11:29 +0100)]
Bump mdsal to 3.0.3

This brings in latest fixes and alignes with odlparent-4.0.5.

Change-Id: I63451fb8aba600c7bdb71367478c6ee30576888e
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
5 years agoBump to yangtools-2.1.6 02/79002/1
Robert Varga [Sun, 23 Dec 2018 07:01:12 +0000 (08:01 +0100)]
Bump to yangtools-2.1.6

This brings in latest fixes and odlparent-4.0.5 alignment.

Change-Id: I02eb190591a1e86fdcbd36bb4bdd7f073c7e1d12
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
5 years agoBump to odlparent 4.0.5 57/78957/1
Stephen Kitt [Fri, 21 Dec 2018 09:09:23 +0000 (10:09 +0100)]
Bump to odlparent 4.0.5

Change-Id: Ib338b90ed38c1359a3327187d8a58e8e51ef7bb6
Signed-off-by: Stephen Kitt <skitt@redhat.com>
5 years agoDo not override odlparent versions 10/78410/1
Robert Varga [Tue, 4 Dec 2018 08:51:54 +0000 (09:51 +0100)]
Do not override odlparent versions

odlparent is specifying 2.25.1 in dependencyManagement, there is
no need to override.

Change-Id: I24ad7f0a43eb9898f8b84ebcebfed2ce55ebd862
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
5 years agoRequire jaxb-api 37/78337/1
Robert Varga [Sat, 1 Dec 2018 23:02:40 +0000 (00:02 +0100)]
Require jaxb-api

Java 9+ does not contain jaxb-api classes, hence we need to add
an explicit dependency. Since karaf is providing it in runtime,
we also need corresponding feature exclusions -- which will be
rendered unnecessary with odlparent-4.0.3.

Change-Id: I199a642dba59b94047676384d99a740037731df5
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
5 years agoUpdate mockito references 36/78336/1
Robert Varga [Sat, 1 Dec 2018 23:21:03 +0000 (00:21 +0100)]
Update mockito references

This updates use of Mockito method to their non-deprecated
equivalents.

Change-Id: I14fdf09abb675762cdd51f68bc27f475e894b165
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
5 years agoMerge "Bump to yangtools-2.1.4 and mdsal-3.0.2"
Anil Belur [Sat, 1 Dec 2018 04:42:57 +0000 (04:42 +0000)]
Merge "Bump to yangtools-2.1.4 and mdsal-3.0.2"

5 years agoSimplify install/deploy skip 36/78236/2
Robert Varga [Tue, 27 Nov 2018 23:31:58 +0000 (00:31 +0100)]
Simplify install/deploy skip

odlparent-lite handles magic properties, without the need for
plugin boiler-plate.

Change-Id: I9af8d638f410ec5f74e3bf8030cd518a6326a21f
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
5 years agoAdd aggragate coverage support 35/78235/2
Robert Varga [Tue, 27 Nov 2018 23:31:08 +0000 (00:31 +0100)]
Add aggragate coverage support

This adds the build-system-side of aggragating jacoco reports
for sonar.

Change-Id: Ia81dbc428e62c530de0cc5cc0ffdeb77d6dee1eb
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
5 years agoBump to yangtools-2.1.4 and mdsal-3.0.2 42/78142/2
Robert Varga [Mon, 26 Nov 2018 09:22:08 +0000 (10:22 +0100)]
Bump to yangtools-2.1.4 and mdsal-3.0.2

This bumps the dependencies to 2.1.4 and 3.0.2, respectively.

Change-Id: I1de2b3d9f09d726477605fde0df54d82aea6648f
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
5 years agoadd support for automatically choosing free port to JettyWebServer 03/77903/1
Michael Vorburger [Fri, 16 Nov 2018 17:39:40 +0000 (18:39 +0100)]
add support for automatically choosing free port to JettyWebServer

This is useful for tests.  It could allow parallel running of web tests.

Change-Id: I75de07bf6a6575e840432c9c96e4cde744122455
Signed-off-by: Michael Vorburger <vorburger@redhat.com>
5 years agoMigrate aaa-cli to JDT annotations 47/77547/4
Robert Varga [Tue, 6 Nov 2018 14:38:16 +0000 (15:38 +0100)]
Migrate aaa-cli to JDT annotations

This eliminates a reference to javax.annotation from aaa-cli,
favoring JDT annotations instead.

Change-Id: I0b61ef01e4514681feba2938b67e319b7d65c1bd
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
5 years agoMigrate aaa-filterchain to JDT annotations 46/77546/4
Robert Varga [Tue, 6 Nov 2018 14:35:56 +0000 (15:35 +0100)]
Migrate aaa-filterchain to JDT annotations

Remove more dependencies on javax.annotation, favoring JDT
instead.

Change-Id: I8f5c81d1091b38ca2da0693a2d2b0ad89170c8a3
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
5 years agoMigrate aaa-cert to JDT annotations 45/77545/4
Robert Varga [Tue, 6 Nov 2018 14:33:23 +0000 (15:33 +0100)]
Migrate aaa-cert to JDT annotations

Remove use of JSR305 annotations in favor of JDT ones.

Change-Id: I4be5568a792a7b78a4636a28d3c20883f01a1f28
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
5 years agoRemove unneeded javax.annotations from aaa-shiro 44/77544/3
Robert Varga [Tue, 6 Nov 2018 14:25:27 +0000 (15:25 +0100)]
Remove unneeded javax.annotations from aaa-shiro

These are used only internally, remove them to lower dependencies
on javax.annotation.

Change-Id: I3e271f5d1b4737f5eca7f45e34bf5168ad5af664
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
5 years agoMigrate aaa-shiro to MD-SAL APIs 43/77543/2
Robert Varga [Tue, 6 Nov 2018 14:15:48 +0000 (15:15 +0100)]
Migrate aaa-shiro to MD-SAL APIs

This patch performs the trivial migration to MD-SAL APIs.

Change-Id: Ie534f36e72a1eaf53b57756294e77459f3b2001d
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
5 years agoMigrate aaa-encrypt-service to MD-SAL APIs 42/77542/1
Robert Varga [Tue, 6 Nov 2018 14:06:49 +0000 (15:06 +0100)]
Migrate aaa-encrypt-service to MD-SAL APIs

This performs a straightforward migration of the implementation.

Change-Id: Id1e2b2705ca8f3f5477f2d596bc77ea90d4f000d
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
5 years agoMigrate aaa-cert to MD-SAL APIs 41/77541/1
Robert Varga [Tue, 6 Nov 2018 14:01:31 +0000 (15:01 +0100)]
Migrate aaa-cert to MD-SAL APIs

This performs the very simple migration of aaa-cert.

Change-Id: I9a3e32222a9847ab491df797545798652aa562bc
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
5 years agoRemove use of sshd-core in aaa-encrypt-service 02/77302/4
Robert Varga [Fri, 26 Oct 2018 13:55:18 +0000 (15:55 +0200)]
Remove use of sshd-core in aaa-encrypt-service

The only thing we are using is SecurityUtils to access three
KeyFactories. Initialize them as constants instead, removing
the dependency completely.

Change-Id: I6d96764f36c8d60944c68361e63d613120098946
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
5 years agoMerge "Integrate MRI projects for Neon"
Thanh Ha (zxiiro) [Thu, 25 Oct 2018 19:47:53 +0000 (19:47 +0000)]
Merge "Integrate MRI projects for Neon"

5 years agoBump ehcache 2.8.3 → 2.10.6 62/77262/1
Stephen Kitt [Wed, 24 Oct 2018 16:14:53 +0000 (18:14 +0200)]
Bump ehcache 2.8.3 â†’ 2.10.6

Release notes:
https://jira.terracotta.org/jira/browse/EHC/?selectedTab=com.atlassian.jira.jira-projects-plugin:changelog-panel

This fixes a number of security vulnerabilities (which might not
affect us anyway, but we might as well upgrade).

Change-Id: I3a5eadadf3541ab7b31822dae54fb9bfaa76ef88
Signed-off-by: Stephen Kitt <skitt@redhat.com>
5 years agoIntegrate MRI projects for Neon 64/74964/30
Robert Varga [Thu, 9 Aug 2018 09:36:52 +0000 (11:36 +0200)]
Integrate MRI projects for Neon

This patch bumps:
- odlparent to 4.0.2
- yangtools to 2.1.2
- mdsal to 3.0.1

It also deals with mockito changes by:
- updating ShiroWebContextSecurer
- updating WebContextApiTest
- removing trivial use of powermock
- overriding javassist/mockito version where powermock is used
- move blueprint files to a standard location
- remove sshd overrides

JIRA: AAA-179
Change-Id: Iee47e06877b877c8345cbee3c327b91f71ee1cac
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
Signed-off-by: Stephen Kitt <skitt@redhat.com>
5 years agoadd DI annotations to WebInitializer 12/76812/1
Michael Vorburger [Tue, 9 Oct 2018 22:15:02 +0000 (00:15 +0200)]
add DI annotations to WebInitializer

I need this in https://github.com/vorburger/opendaylight-simple to fix:

com.google.inject.CreationException: Unable to create injector, see the
following errors:

1) Could not find a suitable constructor in
org.opendaylight.aaa.shiro.web.env.WebInitializer. Classes must have
either one (and only one) constructor annotated with @Inject or a
zero-argument constructor that is not private.
  at org.opendaylight.aaa.shiro.web.env.WebInitializer.class(WebInitializer.java:39)
  at org.opendaylight.infrautils.simple.DiagStatusWiring.configure(DiagStatusWiring.java:30)

1 error
at com.google.inject.internal.Errors.throwCreationExceptionIfErrorsExist(Errors.java:470)
at com.google.inject.internal.InternalInjectorCreator.initializeStatically(InternalInjectorCreator.java:155)
at com.google.inject.internal.InternalInjectorCreator.build(InternalInjectorCreator.java:107)
at com.google.inject.Guice.createInjector(Guice.java:99)
at org.opendaylight.infrautils.inject.guice.testutils.GuiceRule.setUpGuice(GuiceRule.java:93)
at org.opendaylight.infrautils.inject.guice.testutils.GuiceRule$1.evaluate(GuiceRule.java:83)
at org.junit.runners.ParentRunner.runLeaf(ParentRunner.java:271)
at org.junit.runners.BlockJUnit4ClassRunner.runChild(BlockJUnit4ClassRunner.java:70)
at org.junit.runners.BlockJUnit4ClassRunner.runChild(BlockJUnit4ClassRunner.java:50)
at org.junit.runners.ParentRunner$3.run(ParentRunner.java:238)
at org.junit.runners.ParentRunner$1.schedule(ParentRunner.java:63)
at org.junit.runners.ParentRunner.runChildren(ParentRunner.java:236)
at org.junit.runners.ParentRunner.access$000(ParentRunner.java:53)
at org.junit.runners.ParentRunner$2.evaluate(ParentRunner.java:229)
at org.junit.runners.ParentRunner.run(ParentRunner.java:309)
at org.eclipse.jdt.internal.junit4.runner.JUnit4TestReference.run(JUnit4TestReference.java:89)
at org.eclipse.jdt.internal.junit.runner.TestExecution.run(TestExecution.java:41)
at org.eclipse.jdt.internal.junit.runner.RemoteTestRunner.runTests(RemoteTestRunner.java:541)
at org.eclipse.jdt.internal.junit.runner.RemoteTestRunner.runTests(RemoteTestRunner.java:763)
at org.eclipse.jdt.internal.junit.runner.RemoteTestRunner.run(RemoteTestRunner.java:463)
at org.eclipse.jdt.internal.junit.runner.RemoteTestRunner.main(RemoteTestRunner.java:209)

Change-Id: Icda5a93e6943336b45c0a4683de04a55a8e64fe4
Signed-off-by: Michael Vorburger <vorburger@redhat.com>
5 years agoremove maven-site from aaa-shiro 20/76720/1
Michael Vorburger [Sat, 6 Oct 2018 01:48:05 +0000 (03:48 +0200)]
remove maven-site from aaa-shiro

Change-Id: I0e725c1ef77f8727b62bcd34d7f80fa66f8db071
Signed-off-by: Michael Vorburger <vorburger@redhat.com>
5 years agoAllow custom Filters advertised as OSGi services 18/76018/2
Tom Pantelis [Wed, 12 Sep 2018 02:23:41 +0000 (22:23 -0400)]
Allow custom Filters advertised as OSGi services

Currently, custom filters are hooked in via the
org.opendaylight.aaa.filterchain.cfg file. The Filter
instances are instantiated and initialized via reflection.
This mechanism is useful for pre-existing filters to be
dynamically registered externally. However it's a bit
cumbersome for components that want to hook in their
own Filter in code like the TSDR restconf collector. It
has to manipulate the .cfg file and inject dependencies
statically. To alleviate this, support was added to allow
a custom Filter to be advertised as a service.

Change-Id: Id5572386bf65e06bfaf19e6463d6d45e9412fb5b
Signed-off-by: Tom Pantelis <tompantelis@gmail.com>
5 years agoMigrate AAA docs to the AAA project 63/75863/2
Thanh Ha [Sun, 9 Sep 2018 00:21:26 +0000 (20:21 -0400)]
Migrate AAA docs to the AAA project

Issue: DOCS-69
Change-Id: I7892ceacb80b12e5ec118e2004e9afbbcbbf60c6
Signed-off-by: Thanh Ha <thanh.ha@linuxfoundation.org>
5 years agoBootstrap AAA documentation 62/75862/1
Thanh Ha [Sun, 9 Sep 2018 00:18:06 +0000 (20:18 -0400)]
Bootstrap AAA documentation

Issue: DOCS-69
Change-Id: Ie5acf18dad0146f5c4fd49d4c1f1ecf0699e64ab
Signed-off-by: Thanh Ha <thanh.ha@linuxfoundation.org>
5 years agoRevert "Avoid depending on immutables.value at runtime" 68/75668/1
Robert Varga [Mon, 3 Sep 2018 08:40:09 +0000 (10:40 +0200)]
Revert "Avoid depending on immutables.value at runtime"

This reverts commit 3b376e1d3a24bab738524785c5b3420ece2e0382. This
is no longer needed with immutables.org 2.7.1.

Change-Id: Idc158f85a49956358df81d74029234c33adf39ae
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
5 years agoAvoid depending on immutables.value at runtime 51/75451/1
Robert Varga [Thu, 23 Aug 2018 22:23:32 +0000 (00:23 +0200)]
Avoid depending on immutables.value at runtime

Change-Id: Ib378a2d174c6242499e9c8680351bc4a1d593947
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
5 years agoFix findbugs issues 41/75441/1
Robert Varga [Thu, 23 Aug 2018 21:23:12 +0000 (23:23 +0200)]
Fix findbugs issues

Upgraded findbugs is finding violations related to use of slf4j,
fix those isses before we upgrade.

Change-Id: I2eaca145b4aee017169a552ccd151b989ed9382c
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
5 years agoFix logging string 75/75275/1
Robert Varga [Fri, 17 Aug 2018 16:30:07 +0000 (18:30 +0200)]
Fix logging string

As per guidelines and now checkstyle, format string should be constant.

Change-Id: I54e982afdaf9f30013c01699943b7013aec050b8
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
5 years agoBump versions by x.(y+1).z for next dev cycle 85/74985/1
Anil Belur [Thu, 9 Aug 2018 12:40:14 +0000 (18:10 +0530)]
Bump versions by x.(y+1).z for next dev cycle

Change-Id: I1d1a6b7bbd20bf3b8fb2f48367c43df8130ac462
Signed-off-by: Anil Belur <abelur@linuxfoundation.org>
5 years agoMerge "Bump yangtools to 2.0.10"
Tom Pantelis [Tue, 7 Aug 2018 11:54:45 +0000 (11:54 +0000)]
Merge "Bump yangtools to 2.0.10"

5 years agoBump yangtools to 2.0.10 86/74886/1
Robert Varga [Mon, 6 Aug 2018 15:57:49 +0000 (17:57 +0200)]
Bump yangtools to 2.0.10

This fixes an issue with actions, hence we need it in Fluorine.

Change-Id: I94cb8eab95987c8703bf9e05590b3b57085c6ac4
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
5 years agoRemove ListenableFuture in CustomFilterAdapter 71/74771/1
Tom Pantelis [Thu, 2 Aug 2018 14:54:26 +0000 (10:54 -0400)]
Remove ListenableFuture in CustomFilterAdapter

The CustomFilterAdapterConfiguration field no longer needs to be
a ListenableFuture - this was a remnant from when it was obtained async.

Change-Id: Ib9bb64d988ecd560997f91e437bbc694feed8549
Signed-off-by: Tom Pantelis <tompantelis@gmail.com>
5 years agoBump yangtools to 2.0.9 69/74569/2
Robert Varga [Fri, 27 Jul 2018 12:05:16 +0000 (14:05 +0200)]
Bump yangtools to 2.0.9

This patch bumps yangtools to latest release.

Change-Id: I0a59adc4feeae4f29e892d02eb5039fdbf70f7a4
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
5 years agoBump to odlparent 3.1.3 90/74190/1
Stephen Kitt [Wed, 18 Jul 2018 16:06:31 +0000 (18:06 +0200)]
Bump to odlparent 3.1.3

Change-Id: I70f9ac83b235adf06dc744604948c14dea69fbbe
Signed-off-by: Stephen Kitt <skitt@redhat.com>
5 years agoRemove dynamicAuthorization 57/74157/1
Jamo Luhrsen [Tue, 17 Jul 2018 21:02:03 +0000 (14:02 -0700)]
Remove dynamicAuthorization

This is in response to some bugs like these:
https://jira.opendaylight.org/browse/CONTROLLER-1838
https://jira.opendaylight.org/browse/CONTROLLER-1849

where we believe not having things fail at this
level may help give us more details about a root
cause.

Change-Id: I7416c4d61133f1553e4ae83d9f3e0be48f55de6e
Signed-off-by: Jamo Luhrsen <jluhrsen@redhat.com>
5 years agoMerge changes I65221cae,If580af40
Tom Pantelis [Wed, 11 Jul 2018 00:53:26 +0000 (00:53 +0000)]
Merge changes I65221cae,If580af40

* changes:
  Subscribe to authentication information instead of reading it
  Subscribe to authorization information instead of reading it

5 years agoHandle UnknownSessionException in ODLAuthenticator 21/73821/1
Tom Pantelis [Sun, 8 Jul 2018 15:42:19 +0000 (11:42 -0400)]
Handle UnknownSessionException in ODLAuthenticator

UnknownSessionException seems to indicate the internal stored/cached
session has expired so do an explicit logout and retry the login.

Since it appears we just use the subject/session for a one-shot
authentication, perhaps we should logout immediately after login,
however that can be investigated later.

Change-Id: I72f5a418869e5cf480b21df81be4c1b2aebf4f60
JIRA: AAA-176
Signed-off-by: Tom Pantelis <tompantelis@gmail.com>
5 years agoSubscribe to authentication information instead of reading it 75/73475/4
Robert Varga [Wed, 27 Jun 2018 12:43:05 +0000 (14:43 +0200)]
Subscribe to authentication information instead of reading it

Instead of explicitly reading authentication information, pull it
through a DTCL, so we can access the information without actually
touching the datastore.

Change-Id: I65221caed40d932c45cb2e29ac06e712fe85ba3b
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
5 years agoSubscribe to authorization information instead of reading it 55/73455/7
Robert Varga [Tue, 26 Jun 2018 16:57:25 +0000 (18:57 +0200)]
Subscribe to authorization information instead of reading it

Instead of explicitly reading authorization information, pull it
through a DTCL, so we can access the information without actually
touching the datastore.

Change-Id: If580af40b3a1c22c1e2ad8a550c075adcba20ed1
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
6 years agoBump yangtools to 2.0.7 09/73509/1
Robert Varga [Thu, 28 Jun 2018 06:57:29 +0000 (08:57 +0200)]
Bump yangtools to 2.0.7

This patch bumps yangtools to latest release.

Change-Id: Iaba93bd609f4ee76a35f183c9e61a334212026ab
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
6 years agoBump odlparent to 3.1.2 89/72489/2
Stephen Kitt [Wed, 30 May 2018 13:44:25 +0000 (15:44 +0200)]
Bump odlparent to 3.1.2

Change-Id: I43fc0c6807b445ad5b40c38ebd2d10d54b797367
Signed-off-by: Stephen Kitt <skitt@redhat.com>
6 years agoBump yangtools to 2.0.5 64/72564/3
Robert Varga [Fri, 1 Jun 2018 13:29:45 +0000 (15:29 +0200)]
Bump yangtools to 2.0.5

To pick up the latest fixes.

Change-Id: I75e8408049dd91d3a08473232152da98ab63b748
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
6 years agoMerge "Fixup Augmentable and Identifiable methods changing"
Tom Pantelis [Mon, 4 Jun 2018 14:48:37 +0000 (14:48 +0000)]
Merge "Fixup Augmentable and Identifiable methods changing"

6 years agoRemove Accounter impl 32/72432/4
Ryan Goulding [Tue, 29 May 2018 14:22:08 +0000 (10:22 -0400)]
Remove Accounter impl

Accounter is purely impl and not API.  It was meant to be a
means to funnel important accounting messages, but it really
doesn't provide anything above what the standard Logger provides.
Additionally, it is less configurable.  Thus, get rid of it.

Just use log4j instead.

Change-Id: I39ae4fe49f496382989a8676fba0c9bfe66db9a3
Signed-off-by: Ryan Goulding <ryandgoulding@gmail.com>
6 years agoFixup Augmentable and Identifiable methods changing 54/71254/6
Robert Varga [Tue, 24 Apr 2018 13:15:44 +0000 (15:15 +0200)]
Fixup Augmentable and Identifiable methods changing

This is a fixup of the change in binding codegen, adjusting:
- getKey() -> key()
- setKey() -> withKey()
- getAugmentation() -> augmentation()

Change-Id: I84a38f788b84e4db50cf1006ad36f6fb0863907b
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
6 years agoMerge changes I737d5336,Ied83aaa0
Ryan Goulding [Sun, 3 Jun 2018 18:19:43 +0000 (18:19 +0000)]
Merge changes I737d5336,Ied83aaa0

* changes:
  Undeprecate PKIUtil
  Cleanup MDSALDynamicAuthorizationFilterTest

6 years agoMerge changes I57664369,Ie46f76d3
Ryan Goulding [Sun, 3 Jun 2018 18:19:13 +0000 (18:19 +0000)]
Merge changes I57664369,Ie46f76d3

* changes:
  Remove odl-config-core from odl-aaa-encryption-service feature
  Convert CLI commands to Action

6 years agoRemove odl-config-core from odl-aaa-encryption-service feature 25/72625/1
Tom Pantelis [Sun, 3 Jun 2018 15:44:30 +0000 (11:44 -0400)]
Remove odl-config-core from odl-aaa-encryption-service feature

odl-config-core is a CSS feature which isn't needed and is going away.

Change-Id: I57664369cae15325f17392cac37bcbc61de1a503
Signed-off-by: Tom Pantelis <tompantelis@gmail.com>
6 years agoConvert CLI commands to Action 79/72579/1
Tom Pantelis [Fri, 1 Jun 2018 17:57:35 +0000 (13:57 -0400)]
Convert CLI commands to Action

OsgiCommandSupport et al are deprecated.

Change-Id: Ie46f76d30b452eee1a76867dc7b105c0274808ab
Signed-off-by: Tom Pantelis <tompantelis@gmail.com>
6 years agoUndeprecate PKIUtil 55/72555/1
Tom Pantelis [Fri, 1 Jun 2018 11:18:47 +0000 (07:18 -0400)]
Undeprecate PKIUtil

There's no alternative for users to switch to and not
clear whether it actually warrants a service with API and impl.

Change-Id: I737d53362330b1aba9329d565b16476322df5a59
Signed-off-by: Tom Pantelis <tompantelis@gmail.com>
6 years agoDo not repackage yangtools concepts 45/72545/1
Robert Varga [Fri, 1 Jun 2018 08:47:02 +0000 (10:47 +0200)]
Do not repackage yangtools concepts

Depend of the feature providing the bundle, cutting duplicate
packaging.

Change-Id: Ia24477789545c3cbc9e2061dc82fdab3289bfe6b
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
6 years agoMerge "update README.md"
Tom Pantelis [Fri, 1 Jun 2018 00:57:32 +0000 (00:57 +0000)]
Merge "update README.md"

6 years agoCleanup MDSALDynamicAuthorizationFilterTest 42/72542/1
Tom Pantelis [Thu, 31 May 2018 22:52:38 +0000 (18:52 -0400)]
Cleanup MDSALDynamicAuthorizationFilterTest

Consolidated some common code for reuse and to reduce the
deprecation warnings due to CheckedFuture. Also used the
real Optional and CheckedFuture classes - no need to mock
such clsses.

Change-Id: Ied83aaa0d266658fbda73c6b53beadd19d523816
Signed-off-by: Tom Pantelis <tompantelis@gmail.com>
6 years agoRemove deprecated SHA256Calculator 39/72539/1
Tom Pantelis [Thu, 31 May 2018 20:42:37 +0000 (16:42 -0400)]
Remove deprecated SHA256Calculator

Not used anywhere.

Change-Id: I1bfa0db35eb3e692cc1c98cf55b3c8ed004d3deb
Signed-off-by: Tom Pantelis <tompantelis@gmail.com>
6 years agoRemove deprecated StoreBuilder#init 38/72538/1
Tom Pantelis [Thu, 31 May 2018 20:29:29 +0000 (16:29 -0400)]
Remove deprecated StoreBuilder#init

Change-Id: I9f4a92572b0db28c9a07ad596a7b9f7cf92cf841
Signed-off-by: Tom Pantelis <tompantelis@gmail.com>
6 years agoRemove deprecated IdmLightConfig#getDbPath 37/72537/1
Tom Pantelis [Thu, 31 May 2018 20:13:13 +0000 (16:13 -0400)]
Remove deprecated IdmLightConfig#getDbPath

Change-Id: I00e1b1143a6d4c38f42f1d9d26a6cce359a884ed
Signed-off-by: Tom Pantelis <tompantelis@gmail.com>
6 years agoRemove static CustomFilterAdapterConfigurationImpl instance 36/72536/2
Tom Pantelis [Thu, 31 May 2018 19:55:09 +0000 (15:55 -0400)]
Remove static CustomFilterAdapterConfigurationImpl instance

This was kept for backwards compatibility for web.xml's which
have been removed.

Change-Id: I9a7269a4807bf54fa3945c28ee78ad32a1725f24
Signed-off-by: Tom Pantelis <tompantelis@gmail.com>
6 years agoFix some deprecation warnings 33/72533/4
Tom Pantelis [Thu, 31 May 2018 18:22:13 +0000 (14:22 -0400)]
Fix some deprecation warnings

CheckedFuture et al.

Change-Id: Ibd4324fbc57367eb1ab1508bc56053977fb5e47a
Signed-off-by: Tom Pantelis <tompantelis@gmail.com>
6 years agoRemove KarafIniWebEnvironment 28/72528/1
Tom Pantelis [Thu, 31 May 2018 15:25:24 +0000 (11:25 -0400)]
Remove KarafIniWebEnvironment

Deprecated and not used anymore.

Change-Id: Id06ffe5768c8564a97c9c7c08db1cdd622b82e10
Signed-off-by: Tom Pantelis <tompantelis@gmail.com>
6 years agoupdate README.md 21/72421/7
Ryan Goulding [Tue, 29 May 2018 13:44:18 +0000 (09:44 -0400)]
update README.md

Update README.md to utilize correct max line lengths as well as
maven versions and target releases for future work.

Change-Id: Ie7aecca9b8c7bbedb98a06d218c33e5d72dd6b16
Signed-off-by: Ryan Goulding <ryandgoulding@gmail.com>
6 years agoadjust to use password-service 69/72169/5
Ryan Goulding [Thu, 17 May 2018 20:13:26 +0000 (16:13 -0400)]
adjust to use password-service

Use the simplified password-service instead of SHA256Calculator.
After all, SHA256Calculator is deprecated since it combines API
and IMPL even in the name!

This is also more configurable and secure.

Change-Id: I471e0fe1d11d6b65ab574c5286ce1a874a2231fb
Signed-off-by: Ryan Goulding <ryandgoulding@gmail.com>
6 years agoMerge "Split aaa-encryption-service api and impl"
Tom Pantelis [Wed, 30 May 2018 13:45:51 +0000 (13:45 +0000)]
Merge "Split aaa-encryption-service api and impl"

6 years agoMerge "Convert to jersey 2"
Ryan Goulding [Wed, 30 May 2018 13:17:22 +0000 (13:17 +0000)]
Merge "Convert to jersey 2"

6 years agoSplit aaa-encryption-service api and impl 76/72176/6
Ryan Goulding [Tue, 22 May 2018 20:18:01 +0000 (16:18 -0400)]
Split aaa-encryption-service api and impl

The original contributor jammed api and impl into one bundle.  This is
bad practice for SOA, so this change separates out api and impl.  The
API class package remains the same for outside consumers (i.e., it is
left as org.opendaylight.aaa.encrypt instead of the normal convention
of org.opendaylight.aaa.encrypt.api).

Additionally, a maven-bundle-plugin instruction was added to explicitly
not export any impl bundle classes.  This is important to avoid possible
consumption from downstream consumers.

Change-Id: I0e2fca345501deaf9645b4b044dbc549b222c69b
Signed-off-by: Ryan Goulding <ryandgoulding@gmail.com>
6 years agoadd .apt_generated_tests/ to .gitignore 97/72397/1
Michael Vorburger [Tue, 29 May 2018 10:10:53 +0000 (12:10 +0200)]
add .apt_generated_tests/ to .gitignore

Change-Id: Ie2c3be4911874cf59d7f691d357e45f03bdfee71
Signed-off-by: Michael Vorburger <vorburger@redhat.com>