aaa.git
22 months agoAdopt 2022.09 upstreams 91/101691/34
Robert Varga [Wed, 1 Jun 2022 01:02:09 +0000 (03:02 +0200)]
Adopt 2022.09 upstreams

Adopt:
- odlparent-11.0.0
- infrautils-4.0.0
- yangtools-9.0.0
- mdsal-10.0.0
- controller-6.0.0

Change-Id: Ic6ab892572b3ed46ea58a41b7f221482f684b902
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
22 months agoConvert web-impl-osgi to WhiteBoard 20/101720/10
Robert Varga [Mon, 4 Jul 2022 15:46:28 +0000 (17:46 +0200)]
Convert web-impl-osgi to WhiteBoard

We are using OSGi R7, which has a very much workable HTTP Whiteboard
specification. Rather than mucking with pax-web-api, use HTTP Whiteboard
for WebContext implementation. This has the nice side-effect of working
with any implementation, not only with pax-web.

JIRA: AAA-225
Change-Id: I6387333b44dc9b6a40f909c3d3ceb75693193014
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
22 months agoRevert "Publish ShiroWebEnvironmentLoaderListener to HTTP whiteboard" 30/101730/2
Robert Varga [Mon, 4 Jul 2022 21:18:07 +0000 (23:18 +0200)]
Revert "Publish ShiroWebEnvironmentLoaderListener to HTTP whiteboard"

This reverts commit a8e9e36a1c516a466ee90e6f58e4e902dd657ce9, as we are
keeping WebServer after all.

Change-Id: Ie1959b403d96a108116e2bf31b1e44c3fe5f4864
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
22 months agoRevert "Publish AAAShiroFilter as a proper Filter service" 29/101729/1
Robert Varga [Mon, 4 Jul 2022 21:13:48 +0000 (23:13 +0200)]
Revert "Publish AAAShiroFilter as a proper Filter service"

This reverts commit b4bab95a954e7600b0427b86540db1706ffcad5b, as we are
keeping web-api.

Change-Id: If108478fb88d83a3243699dce994faa54e2d13af
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
22 months agoCleanup odl-aaa-web feature 22/101722/3
Robert Varga [Mon, 4 Jul 2022 19:29:17 +0000 (21:29 +0200)]
Cleanup odl-aaa-web feature

Declare the feature so we can ditch project.version reference and make
sure odl-aaa-shiro does not pull in the osgi implementation artifact.

Also make sure the feature is mentioned in features-aaa and that in
turn uses the artifacts declaration.

Change-Id: Ibead8e8ea29e54258bbfddc80514b2655344b26d
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
22 months agoInject ServletSupport into KeystoneAuthRealm 18/101718/2
Robert Varga [Mon, 4 Jul 2022 11:53:23 +0000 (13:53 +0200)]
Inject ServletSupport into KeystoneAuthRealm

Do not rely on jax-rs working, but rather explicitly route to the
provider.

Change-Id: I75306b14d22512984deed91e6799e77956563039
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
22 months agoDo not use odl:type for DataBroker 14/101714/1
Robert Varga [Mon, 4 Jul 2022 07:53:19 +0000 (09:53 +0200)]
Do not use odl:type for DataBroker

Specifying odl:type has been deprecated, do not use it.

Change-Id: I684157ff8ffb9455103439ae893769ceb58f83ad
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
22 months agoClean up AAAShiroFilter a bit 07/101707/1
Robert Varga [Sun, 3 Jul 2022 19:18:35 +0000 (21:18 +0200)]
Clean up AAAShiroFilter a bit

Shorten refernces and remove unneeded @RequireHttpWhiteboard

Change-Id: I9d62b64bdb006a258d038e7ca643a68da8defd74
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
22 months agoEliminate ThreadLocals 05/101705/5
Robert Varga [Sun, 3 Jul 2022 03:40:11 +0000 (05:40 +0200)]
Eliminate ThreadLocals

We can nicely co-locate services with their users, eliminating one
instance of centralization.

Change-Id: Ibad16eb8241b5baa584782a2027ba0bd87b775ba
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
22 months agoMigrate more ThreadLocals 04/101704/8
Robert Varga [Sun, 3 Jul 2022 02:25:08 +0000 (04:25 +0200)]
Migrate more ThreadLocals

Move ThreadLocal instances to their sole consumer.

Change-Id: Ie46be3801d12987ca3cb3014b5e66096379fce7b
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
22 months agoMigrate CERT_MANAGER_TL 02/101702/10
Robert Varga [Sun, 3 Jul 2022 01:40:31 +0000 (03:40 +0200)]
Migrate CERT_MANAGER_TL

This thread local has a single user, make sure we encapsulate it.

Change-Id: I6463aa48d1f2d6798f9dc2a8b5e1fa2eac21790d
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
22 months agoInject ServletSupport into MoonRealm 97/101697/10
Robert Varga [Sun, 3 Jul 2022 00:53:11 +0000 (02:53 +0200)]
Inject ServletSupport into MoonRealm

We cannot quite inject Jersey in OSGi environment. Make sure we indirect
through ServletSupport, which provides the proper binding.

Change-Id: I132d55f4fa4e9d853e96cf3e299e241df730cb00
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
22 months agoPre-instantiate a WebTarget 95/101695/6
Robert Varga [Sat, 2 Jul 2022 23:57:42 +0000 (01:57 +0200)]
Pre-instantiate a WebTarget

Rather than building single-use targets, create one when it is
configured. Also fix a potential thread safety issue.

Change-Id: I40a044ab86a63e242f0e70995f9b6624a7a3acdd
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
22 months agoCleanup MoonRealm 94/101694/4
Robert Varga [Sat, 2 Jul 2022 23:48:54 +0000 (01:48 +0200)]
Cleanup MoonRealm

Do silently ignore invalid URL and perform general cleanup. This results
in more descriptive authentication rejections.

Change-Id: I599cf13273c2baed80b38baa19619168483216bc
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
22 months agoTolerate empty lists 03/101703/2
Robert Varga [Sun, 3 Jul 2022 01:47:20 +0000 (03:47 +0200)]
Tolerate empty lists

Rather than throwing a NPE, treat missing lists as empty.

Change-Id: I60184026444829a47c8b26effb41463f2acb52d1
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
22 months agoClean up SimpleHttpClient 98/101698/3
Robert Varga [Sun, 3 Jul 2022 01:01:22 +0000 (03:01 +0200)]
Clean up SimpleHttpClient

We should be operating on a ClientBuilder, make sure we inject one.

Change-Id: I176a2398676e6e5a31dcc15ee9364d912f841eaa
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
22 months agoInline buildCache() 01/101701/2
Robert Varga [Sun, 3 Jul 2022 01:12:36 +0000 (03:12 +0200)]
Inline buildCache()

This is an implementation detail, make sure we express it as such.

Change-Id: I405f1e2abef28a39a6ab93bc56c1a912d233ac06
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
22 months agoImprove principal handling 99/101699/2
Robert Varga [Sun, 3 Jul 2022 01:08:23 +0000 (03:08 +0200)]
Improve principal handling

Use an implicit type check instead of a CCE.

Change-Id: I3b9a897b05ecb6391a5613045f759799e619191f
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
22 months agoRemove unneed @SupressWarnings 00/101700/1
Robert Varga [Sun, 3 Jul 2022 01:22:54 +0000 (03:22 +0200)]
Remove unneed @SupressWarnings

We can use Throwables to clean up the throwing logic here, improving
code layout.

Change-Id: I4fb568775769e53a2797bfe4f430ac28b5092444
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
22 months agoFix MapDictionary init 92/101692/2
Robert Varga [Sat, 2 Jul 2022 21:57:09 +0000 (23:57 +0200)]
Fix MapDictionary init

We need to be able to downcast Map<String,String> to
MapDictionary<String,Object>. Adjust signature to allow that.

Change-Id: I2aabe8455e246a625216b0eb56acbad5a8454cc1
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
22 months agoClarify ShiroWebEnvironmentLoaderListener FIXMEs 96/101696/2
Robert Varga [Sun, 3 Jul 2022 00:35:32 +0000 (02:35 +0200)]
Clarify ShiroWebEnvironmentLoaderListener FIXMEs

The two fixmes deal with configuration injection. Update the fixme.

Change-Id: Ifa0a905af81012183333a48b7b6bcf3903325012
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
22 months agoRemove docs/jetty dependency 87/101687/9
Robert Varga [Fri, 1 Jul 2022 16:40:44 +0000 (18:40 +0200)]
Remove docs/jetty dependency

We no longer rely on jetty-servlets, do not pull them into docs.

Change-Id: I95a7255e82079b07ee4d330593334f2638eab59d
JIRA: AAA-213
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
22 months agoUse descriptive statuses 80/101680/16
Robert Varga [Fri, 1 Jul 2022 13:17:04 +0000 (15:17 +0200)]
Use descriptive statuses

Rather than using literals, use well-known constants and utility methods
to create responses.

Change-Id: I99d7eaaa414df10c60f21fdc56bbe1cae482250b
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
22 months agoUse MediaType.APPLICATION_JSON 81/101681/14
Robert Varga [Fri, 1 Jul 2022 13:38:10 +0000 (15:38 +0200)]
Use MediaType.APPLICATION_JSON

We have a number of repetitions of application/json -- use the JAX-RS
constant for that.

Change-Id: I672440b10ec1ee181240b85ac4fd6d91ac9c6121
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
22 months agoClean up UserHandler 79/101679/14
Robert Varga [Fri, 1 Jul 2022 12:56:05 +0000 (14:56 +0200)]
Clean up UserHandler

Use minimal try/catch blocks, make methods static and clean up argument
handling.

Change-Id: Idd32d0256eb3525f1b0c86a373ca8443feffae47
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
22 months agoClean up RoleHandler 78/101678/13
Robert Varga [Fri, 1 Jul 2022 12:45:02 +0000 (14:45 +0200)]
Clean up RoleHandler

Use minimal try/catch blocks and clean up argument handling.

Change-Id: I5ff238452e6d1522d39d447869cf0a13882b2518
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
22 months agoRemove final class suppression 86/101686/5
Robert Varga [Fri, 1 Jul 2022 15:14:12 +0000 (17:14 +0200)]
Remove final class suppression

Rework constructor design to remove the need for @SuppressWarnings.

Change-Id: Ifac715ba69b2cb4268c15ecef2d40abfc759b022
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
22 months agoDo not use ClientConfig 84/101684/5
Robert Varga [Fri, 1 Jul 2022 15:02:08 +0000 (17:02 +0200)]
Do not use ClientConfig

We are not doing anything with the configuration, just take a plain
client instead. This removes a dependency on the actual implementation.

Change-Id: I398b1bf40237788c52d28c01ac5c4117ae40e0ec
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
22 months agoClean up DomainHandler 77/101677/10
Robert Varga [Fri, 1 Jul 2022 12:38:06 +0000 (14:38 +0200)]
Clean up DomainHandler

Use static import for requireNonNull() and clean up method arguments.

Change-Id: I889e96a576a85eebbb46e94baf4ef07330788372
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
22 months agoDo not use odl:type=default 83/101683/2
Robert Varga [Fri, 1 Jul 2022 14:32:43 +0000 (16:32 +0200)]
Do not use odl:type=default

Use of this type has been deprecated, do not use it.

Change-Id: I1c6a831334495d2dfd26ea18d2adffaae845bc61
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
22 months agoDo not use blueprint-cm 82/101682/2
Robert Varga [Fri, 1 Jul 2022 14:31:33 +0000 (16:31 +0200)]
Do not use blueprint-cm

We are not using this namespace, do not reference it.

Change-Id: I92089c5c130767b2c8373180d93a1139c307adc1
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
22 months agoClean up IdmLightApplication 76/101676/3
Robert Varga [Fri, 1 Jul 2022 12:01:48 +0000 (14:01 +0200)]
Clean up IdmLightApplication

Use ImmutableSet.of() and static import of requireNonNull().

Change-Id: I5ed0a6a9cec357a508ed3ecca8e8b9063b666054
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
22 months agoCleanup TokenAuthRealm 75/101675/3
Robert Varga [Fri, 1 Jul 2022 11:58:25 +0000 (13:58 +0200)]
Cleanup TokenAuthRealm

Use static import of requireNonNull(), do not perform blind casts
and inline single-use constants.

Change-Id: I9defff8f9809be9bddf5bd0d9c88561b698eeb58
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
22 months agoConvert ThreadLocals to a final class 74/101674/1
Robert Varga [Fri, 1 Jul 2022 11:48:02 +0000 (13:48 +0200)]
Convert ThreadLocals to a final class

This is a holder for constants, it should not be an interface.

Change-Id: I14aec0f4ea3419da99c4dfe5f0f0eb3dfee54a92
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
22 months agoClean up CustomFilterAdapter 71/101671/2
Robert Varga [Fri, 1 Jul 2022 09:31:56 +0000 (11:31 +0200)]
Clean up CustomFilterAdapter

Make sure internal variable is an ImmutableList and compact the code a
bit.

Change-Id: I13d65b2ce8d79724533b77a64aee8d2e28b1807b
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
22 months agoRemove CORS filter from ShiroWebContextSecurer 40/101640/1
Robert Varga [Wed, 29 Jun 2022 14:21:10 +0000 (16:21 +0200)]
Remove CORS filter from ShiroWebContextSecurer

Remove the CORS defaults, so that we do not have a dependency on Jetty.

JIRA: AAA-213
Change-Id: Id16fadbd7e1e7da9b6986f20e20e254c2d00421a
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
22 months agoImprove H2 store tests 34/101634/1
Robert Varga [Tue, 28 Jun 2022 14:39:15 +0000 (16:39 +0200)]
Improve H2 store tests

We have weird asserts and general ugliness in the tests. Clean that up.

JIRA: AAA-221
Change-Id: I7a03c9e091f6fa4a53643688aa673e8169b83e1f
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
22 months agoFixup dependency-check 28/101628/1
Robert Varga [Mon, 27 Jun 2022 09:05:03 +0000 (11:05 +0200)]
Fixup dependency-check

We have updated our artifacts, make sure that is reflected in
dependency-check.

Change-Id: I26c56ef6ab550e8e96eb45b7392e072058c42bf5
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
23 months agoRemove WebContextRegistration 01/101401/2
Robert Varga [Wed, 1 Jun 2022 01:02:09 +0000 (03:02 +0200)]
Remove WebContextRegistration

We have yangtools as a dependecy and WebContextRegistration is not
bringing anything to the table when compared to
yangtools.concepts.Registration. Remove it and use a simple Regisration
instead.

Change-Id: Iec504fad5c56c5c8ee2cc5744700ec544fc0f7f5
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
23 months agoRemove redundant version declarations 00/101400/2
Robert Varga [Wed, 1 Jun 2022 00:47:54 +0000 (02:47 +0200)]
Remove redundant version declarations

We are inheriting from a version-specific parent, do not declare
versions.

Change-Id: Ice96e877d5389127db871308824fb5a95fd3dba8
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
23 months agoFix URL pattern logging 99/101399/1
Robert Varga [Wed, 1 Jun 2022 00:25:41 +0000 (02:25 +0200)]
Fix URL pattern logging

Logging an array is no quite useful, wrap it in a List.

Change-Id: Id30b21c8cb3fad00033b10852851013c3517b164
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
23 months agoPublish AAAShiroFilter as a proper Filter service 31/100931/11
Robert Varga [Mon, 2 May 2022 20:38:44 +0000 (22:38 +0200)]
Publish AAAShiroFilter as a proper Filter service

We do not really need WebContextSecurer to address these paths. Also add
@WebFilter annotation so the filter works without web.xml.

Change-Id: Ie4258f2533e6eaa104ae2de0f2866e9ad04a10b2
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
23 months agoPublish ShiroWebEnvironmentLoaderListener to HTTP whiteboard 30/100930/9
Robert Varga [Mon, 2 May 2022 20:04:52 +0000 (22:04 +0200)]
Publish ShiroWebEnvironmentLoaderListener to HTTP whiteboard

As part of ditching WebSecurer, convert let HTTP Whiteboard understand
this is a listener.

Change-Id: I8840055856a6730197b11471b2e315dc6f83764f
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
23 months agoUse SCR/HTTP Whiteboard for MoonTokenEndpoint 27/100927/6
Robert Varga [Mon, 2 May 2022 18:55:08 +0000 (20:55 +0200)]
Use SCR/HTTP Whiteboard for MoonTokenEndpoint

Rather than going through blueprint and HttpService directly, use SCR to
publish MoonTokenEndpoint to HTTP Whiteboard so it is properly
processed.

Also add @WebServlet so the servlet gets activated without the
corresponding web.xml file.

Change-Id: I10a1bad89448d071785b6f76649be817a0721874
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
23 months agoODLPrincipal extends Principal 75/101175/3
Peter Puškár [Tue, 17 May 2022 12:08:37 +0000 (14:08 +0200)]
ODLPrincipal extends Principal

JAX-RS SecurityContext returns ODLPrincipal when method getPrincipal() is called on SecurityContext.
Method getPrincipal() is returning object of type Principal.
Now we currently cannot cast this object to ODLPrincipal as ClassCastException is thrown,
that makes this completely unusable when using SecurityContext.
Principal.getName() is not providing enough information as it just returns toString() by default.

Signed-off-by: Peter Puškár <ppuskar@frinx.io>
Change-Id: Id17d3b6859732a61de9be48a7b46775c13de6f27

2 years agoClean up TokenAuthenticators 33/100933/1
Robert Varga [Tue, 3 May 2022 08:48:16 +0000 (10:48 +0200)]
Clean up TokenAuthenticators

Make the class final and use a List instead of a plain collection.

Change-Id: Ibb1fc1c6b536ebd8138560c27296d8b1f7248f27
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
2 years agoClean up AAAShiroProvider 32/100932/3
Robert Varga [Tue, 3 May 2022 08:22:16 +0000 (10:22 +0200)]
Clean up AAAShiroProvider

AAAShiroProvider has a ton of constructor arguments, which are not
really used anywhere. Remove them along with their fields and accessors.

Change-Id: I49112e08c9af629c5ba62fe19a01d6306229dae8
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
2 years agoDo not require commons-text 26/100926/1
Robert Varga [Mon, 2 May 2022 19:14:58 +0000 (21:14 +0200)]
Do not require commons-text

This dependency seems to be unused, remove it.

Change-Id: Ifc7943de3575e0fce2370e2a920ea8ca66003291
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
2 years agoDitch references to oauth2 25/100925/1
Robert Varga [Mon, 2 May 2022 18:49:16 +0000 (20:49 +0200)]
Ditch references to oauth2

This string is defunct, remove it.

Change-Id: I7ff56b61643884fbe809eb7c6ddd9fa7723084dd
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
2 years agoAdd an @Override annotation 24/100924/1
Robert Varga [Mon, 2 May 2022 18:40:14 +0000 (20:40 +0200)]
Add an @Override annotation

We are implementing a method from superclass, annotate that.

Change-Id: Id63bfbcd637db03546a60f0e7c9bdc6bb00f82c7
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
2 years agoRemove AAAShiroProvider.INSTANCE_FUTURE 23/100923/1
Robert Varga [Mon, 2 May 2022 18:23:41 +0000 (20:23 +0200)]
Remove AAAShiroProvider.INSTANCE_FUTURE

Last user of this future was KarafIniWebEnvironment, remove it to
reduce leakage.

Change-Id: I6279c5f7018484317f105195ccadc945e3a2ecbf
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
2 years agoDo not reference yangtools.concepts.Builder 22/100922/1
Robert Varga [Mon, 2 May 2022 16:25:35 +0000 (18:25 +0200)]
Do not reference yangtools.concepts.Builder

Builder is being retired, just do not use it.

Change-Id: I3c1fba0010b89cf466847065cce18e47a2f2c7db
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
2 years agoMerge "Bump versions to 0.16.0-SNAPSHOT"
Robert Varga [Thu, 28 Apr 2022 21:36:10 +0000 (21:36 +0000)]
Merge "Bump versions to 0.16.0-SNAPSHOT"

2 years agoModernize FileUtils.delete() 81/100881/1
Robert Varga [Thu, 28 Apr 2022 19:26:43 +0000 (21:26 +0200)]
Modernize FileUtils.delete()

We have Java 8, hence we can cut down on the code here.

Change-Id: I7e82ca15d0c7c27f2868770ec90029f03ed068b9
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
2 years agoDitch Truth from aaa-cli-jar 80/100880/1
Robert Varga [Thu, 28 Apr 2022 19:00:03 +0000 (21:00 +0200)]
Ditch Truth from aaa-cli-jar

Simple JUnit assertions are good enough to cover the tests here, ditch
Truth.

Change-Id: Ic2f80c5ae18e84c985cb0b8021d7e9ba4c4b94d0
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
2 years agoDitch Truth from web-jetty-impl 79/100879/1
Robert Varga [Thu, 28 Apr 2022 18:30:37 +0000 (20:30 +0200)]
Ditch Truth from web-jetty-impl

Use JUnit assertions instead.

Change-Id: Id5cc0addd95c0b313c86bc825f128163e7b6aa6e
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
2 years agoDitch Truth from IdmLightConfigTest 78/100878/1
Robert Varga [Thu, 28 Apr 2022 18:16:04 +0000 (20:16 +0200)]
Ditch Truth from IdmLightConfigTest

The use case here is a verbose alternative to assertEquals(), just ditch
Truth.

Change-Id: I9391e5bb6611a1986d9991b1d51e3f4ea3fbf956
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
2 years agoDitch Google Truth from web/testutils 77/100877/1
Robert Varga [Thu, 28 Apr 2022 18:11:34 +0000 (20:11 +0200)]
Ditch Google Truth from web/testutils

There are only two simple asserts there, use plain JUnit instead of
Google Truth. Also fixup the testing servlet.

Change-Id: Iea922ebe5c2d6888fb1116a28c9cab88c66eb6e8
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
2 years agoDitch Google Truth from web-api 76/100876/1
Robert Varga [Thu, 28 Apr 2022 18:07:31 +0000 (20:07 +0200)]
Ditch Google Truth from web-api

Use plain JUnit/Hamcrest matchers instead. Also improve a few
assertions.

Change-Id: I2539e01bd441cbd7e72a8a911de89929fc91949a
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
2 years agoBump versions to 0.16.0-SNAPSHOT 75/100875/1
Robert Varga [Thu, 28 Apr 2022 15:07:46 +0000 (17:07 +0200)]
Bump versions to 0.16.0-SNAPSHOT

This starts the next major development iteration.

Change-Id: Iaa15978d6ab7ea9db3d2cbc61cfd7b0625a0ea98
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
2 years agoBump versions to 0.15.4-SNAPSHOT 84/100784/1
Robert Varga [Sun, 24 Apr 2022 21:56:10 +0000 (23:56 +0200)]
Bump versions to 0.15.4-SNAPSHOT

This starts the next development iteration.

Change-Id: I205a001d824110d48a081697634891a59523391b
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
2 years agoBump controller to 5.0.3 83/100783/1
Robert Varga [Sun, 24 Apr 2022 21:55:39 +0000 (23:55 +0200)]
Bump controller to 5.0.3

Pick up fixes from upstream.

Change-Id: If086e2384305135dd2cc7da6c22f7030e1da1fee
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
2 years agoBump versions to 0.15.3-SNAPSHOT 12/100612/1
Robert Varga [Thu, 14 Apr 2022 11:43:52 +0000 (13:43 +0200)]
Bump versions to 0.15.3-SNAPSHOT

This starts the next development iteration.

Change-Id: I5880b948ab4e2e2dbcd6aea32cfce0138e805b02
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
2 years agoBump upstream versions 11/100611/1
Robert Varga [Thu, 14 Apr 2022 11:42:45 +0000 (13:42 +0200)]
Bump upstream versions

Adopt:
- yangtools-8.0.3
- mdsal-9.0.2
- controller-5.0.2

Change-Id: I2d51e10cd444e587d431397b64e2a09134833f12
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
2 years agoBump shiro to 1.9.0 54/100354/2
Robert Varga [Fri, 1 Apr 2022 09:04:46 +0000 (11:04 +0200)]
Bump shiro to 1.9.0

https://shiro.apache.org/blog/2022/03/22/apache-shiro-190-released.html

JIRA: AAA-223
Change-Id: Idcf1a3b802e6c0c1fc21c420c13db9c67398c56a
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
2 years agoBump versions to 0.15.2-SNAPSHOT 66/100266/2
Robert Varga [Fri, 25 Mar 2022 18:10:36 +0000 (19:10 +0100)]
Bump versions to 0.15.2-SNAPSHOT

This starts the next development iteration.

Change-Id: I53b9cfa330fdd5b92effa1fad77e7899c954158a
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
2 years agoBump upstreams 65/100265/1
Robert Varga [Fri, 25 Mar 2022 18:01:06 +0000 (19:01 +0100)]
Bump upstreams

Adopt:
- yangtools-8.0.2
- mdsal-9.0.1
- controller-5.0.1

Change-Id: I6cf224fa634df78ae58017f78556d15c32ab37b9
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
2 years agoBump versions to 0.15.1-SNAPSHOT 61/100161/1
Robert Varga [Sun, 20 Mar 2022 16:32:31 +0000 (17:32 +0100)]
Bump versions to 0.15.1-SNAPSHOT

This starts the next development iteration.

Change-Id: I616c716d23bae88c4a54d97f50aa698e6253625e
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
2 years agoUse controller-5.0.0 60/100160/1
Robert Varga [Sun, 20 Mar 2022 16:31:43 +0000 (17:31 +0100)]
Use controller-5.0.0

Use released artifacts instead of snapshots.

Change-Id: Icd5a95fb9616b03e1b05b0b82107908d6ef4895f
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
2 years agoUse mdsal-9.0.0 58/100158/1
Robert Varga [Sun, 20 Mar 2022 13:32:35 +0000 (14:32 +0100)]
Use mdsal-9.0.0

Use released artifacts instead of snapshots.

Change-Id: Ia573833bb970d61e8d2d65a80953615b6402f7af
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
2 years agoBump yangtools to 8.0.1 13/100113/1
Robert Varga [Sun, 13 Mar 2022 23:16:09 +0000 (00:16 +0100)]
Bump yangtools to 8.0.1

There is a slight regression in yangtools-8.0.1, pick up the fix.

Change-Id: I2c04349f46f662219725ba479165ca3a8b21d470
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
2 years agoBump yangtools to 8.0.0 08/100108/1
Robert Varga [Sun, 13 Mar 2022 20:02:32 +0000 (21:02 +0100)]
Bump yangtools to 8.0.0

Pick up release instead of snapshots.

Change-Id: Ic2b2c9e68fc8169c75170de6c4ac677fb63b140f
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
2 years agoBump upstreams 06/99506/7
Robert Varga [Thu, 27 Jan 2022 19:15:27 +0000 (20:15 +0100)]
Bump upstreams

Adopt:
- odlparent-10.0.0
- infrautils-3.0.0
- yangtools-8.0.0-SNAPSHOT
- mdsal-9.0.0-SNAPSHOT
- controller-5.0.0-SNAPSHOT

Change-Id: I76f7fe3dcaba9b981445e56de36b1f00154a22bc
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
2 years agoBump versions to 0.15.0-SNAPSHOT 17/100017/1
Robert Varga [Wed, 9 Mar 2022 09:18:56 +0000 (10:18 +0100)]
Bump versions to 0.15.0-SNAPSHOT

This starts the next major development iteration.

Change-Id: Iea15e413e9fd44ae480d46d292382b0ac0384052
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
2 years agoBump versions to 0.14.11-SNAPSHOT 38/99738/1
Robert Varga [Mon, 14 Feb 2022 16:29:05 +0000 (17:29 +0100)]
Bump versions to 0.14.11-SNAPSHOT

This starts the next development iteration.

Change-Id: Ic035a41c81e3a8043794f665f8e059a332d13d2a
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
2 years agoAdopt controller-4.0.10 37/99737/1
Robert Varga [Mon, 14 Feb 2022 15:29:50 +0000 (16:29 +0100)]
Adopt controller-4.0.10

controller-4.0.9 has broken yangtools dependencies, adopt a fixed-up
version.

Change-Id: I22b2ff27b5ab50bd118d559640272b48ba5f5f7b
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
2 years agoBump versions to 0.14.10-SNAPSHOT 15/99715/1
Robert Varga [Mon, 14 Feb 2022 10:34:03 +0000 (11:34 +0100)]
Bump versions to 0.14.10-SNAPSHOT

This starts the next development iteration.

Change-Id: Ie4554d92e8b31c960bcb912b9922a7cbabe6f058
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
2 years agoBump upstreams 13/99713/1
Robert Varga [Mon, 14 Feb 2022 10:12:11 +0000 (11:12 +0100)]
Bump upstreams

Adopt:
- odlparent-9.0.13
- infrautils-2.0.13
- mdsal-8.0.11
- controller-4.0.9

Change-Id: I87d114aaee1a96964e99b99cf7c9495656c45a48
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
2 years agoAdd explicit storage for authentication methods 69/99569/2
Shibu Vijayakumar [Thu, 3 Feb 2022 13:38:02 +0000 (13:38 +0000)]
Add explicit storage for authentication methods

We seem to need an explicit field for methods, add it.

JIRA: AAA-220
Change-Id: I503f0118370eea6e6ba4ff6909c652314c2ca8b3
Signed-off-by: Shibu Vijayakumar <shibu.vijayakumar@infosys.com>
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
2 years agoUse JsonParser.parseString() 42/99642/1
Robert Varga [Tue, 8 Feb 2022 09:20:23 +0000 (10:20 +0100)]
Use JsonParser.parseString()

Instantiating JsonParser is deprecate, do not use it.

Change-Id: I5486632f3ac00c89941df93096817fca2f820b22
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
2 years agoBump versions to 0.14.9-SNAPSHOT 03/99403/1
Robert Varga [Thu, 20 Jan 2022 13:09:26 +0000 (14:09 +0100)]
Bump versions to 0.14.9-SNAPSHOT

This starts the next development iteration.

Change-Id: I4b5723082888157f9d0025f030aba548262c6fc7
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
2 years agoBump upstreams 02/99402/1
Robert Varga [Thu, 20 Jan 2022 13:08:04 +0000 (14:08 +0100)]
Bump upstreams

Adopt:
- odlparent-9.0.12
- infrautils-2.0.12
- mdsal-8.0.10
- controller-4.0.8

Change-Id: Ic029bf0fffa8e6d124e1222c2d946c6fd58379cc
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
2 years agominor updates to dev and user guide 03/98603/1
Bancala, Benjamin (bb3476) [Wed, 17 Nov 2021 19:46:15 +0000 (14:46 -0500)]
minor updates to dev and user guide

shiro.ini is no longer directly used. point the user to the new file.

Issue-ID: AAA-219
Signed-off-by: Bancala, Benjamin (bb3476) <bb3476@att.com>
Change-Id: I2f378be0a93c7d54eb898423b88b927abbe77428

2 years agoBump versions to 0.14.8-SNAPSHOT 01/98501/1
Robert Varga [Sun, 14 Nov 2021 11:40:56 +0000 (12:40 +0100)]
Bump versions to 0.14.8-SNAPSHOT

This starts the next development iteration.

Change-Id: I7222ea7c3b4dd4b6dbe5c40a70298c19e61693a3
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
2 years agoBump controller to 4.0.7 96/98496/1
Robert Varga [Sun, 14 Nov 2021 09:15:54 +0000 (10:15 +0100)]
Bump controller to 4.0.7

Adopt latest fixes from upstream.

Change-Id: I8b01853a00626cee2ff18f943d1b3553a06fda53
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
2 years agoBump shiro to 1.8.0 68/98368/2
Robert Varga [Mon, 8 Nov 2021 13:15:49 +0000 (14:15 +0100)]
Bump shiro to 1.8.0

https://issues.apache.org/jira/secure/ReleaseNote.jspa?projectId=12310950&version=12350384

JIRA: AAA-218
Change-Id: Icc353a995eb567cb1a55876d87c22f07f108831c
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
2 years agoBump versions to 0.14.7-SNAPSHOT 25/98325/1
Robert Varga [Sun, 7 Nov 2021 11:20:41 +0000 (12:20 +0100)]
Bump versions to 0.14.7-SNAPSHOT

This starts the next development iteration.

Change-Id: I607ebc876348343aae70b43553d2af4509b907b7
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
2 years agoBump controller to 4.0.6 24/98324/1
Robert Varga [Sun, 7 Nov 2021 11:05:40 +0000 (12:05 +0100)]
Bump controller to 4.0.6

Pick up latest fixes from upstream.

Change-Id: I72aee62c6f050b0d2d0db1f63f67913076f8478e
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
2 years agoBump versions to 0.14.6-SNAPSHOT 58/98158/1
Robert Varga [Wed, 27 Oct 2021 08:58:04 +0000 (10:58 +0200)]
Bump versions to 0.14.6-SNAPSHOT

This starts the next development iteration.

Change-Id: I26e5eaa7fa142aa83f6eb2ab4228348813957e30
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
2 years agoBump upstreams 57/98157/1
Robert Varga [Wed, 27 Oct 2021 08:49:47 +0000 (10:49 +0200)]
Bump upstreams

Adopt:
- odlparent-9.0.8
- infrautils-2.0.8
- mdsal-8.0.7
- controller-4.0.5

JIRA: AAA-217
Change-Id: I80db0e5d87ac405cfa828de9b9e443be0819d4d0
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
2 years agoBump ehcache to 2.10.9.2 58/98058/1
Robert Varga [Sat, 23 Oct 2021 07:35:34 +0000 (09:35 +0200)]
Bump ehcache to 2.10.9.2

Release notes are not available.

Change-Id: Ibf4ebd7436491ea1cfe239a49b14289c7f766f26
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
2 years agoBump versions to 0.14.5-SNAPSHOT 30/98030/1
Robert Varga [Thu, 21 Oct 2021 10:46:00 +0000 (12:46 +0200)]
Bump versions to 0.14.5-SNAPSHOT

This starts the next development iteration.

Change-Id: I3aeb317aa8e18146ca8f22a14e57d655cc59423e
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
2 years agoBump upstreams 28/98028/1
Robert Varga [Thu, 21 Oct 2021 09:58:28 +0000 (11:58 +0200)]
Bump upstreams

We adopt:
- odlparent-9.0.7
- yangtools-7.0.9
- mdsal-8.0.6
- infrautils-2.0.7
- controller-4.0.4

Change-Id: I57372a4df00de12a3c9ec1d90aca594d91ef0105
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
2 years agoUse Base64.encoder() in ODLKeyTool 24/97724/2
Robert Varga [Sun, 3 Oct 2021 16:43:59 +0000 (18:43 +0200)]
Use Base64.encoder() in ODLKeyTool

There is no point in depending on jaxb-api, just use the encoder from
java.util.

Change-Id: I67228d64beff56f41aaeafac1be285c5c5607f1f
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
2 years agoBump versions to 0.14.4-SNAPSHOT 96/97496/1
Robert Varga [Wed, 15 Sep 2021 13:00:42 +0000 (15:00 +0200)]
Bump versions to 0.14.4-SNAPSHOT

This starts the next development iteration.

Change-Id: I9a90e13d42965176cbf18b5e9dea1cdd84990b43
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
2 years agoAlign to controller-4.0.3 95/97495/2
Robert Varga [Wed, 15 Sep 2021 12:03:52 +0000 (14:03 +0200)]
Align to controller-4.0.3

This is an intermediate step to align with upcoming controller release.
We adopt:
- odlparent-9.0.6
- yangtools-7.0.7
- mdsal-8.0.5
- infrautils-2.0.6
- controller-4.0.3

Change-Id: I6c5bd4a9ffc1af3a1f7e7d56929eaf9482a31e22
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
2 years agoBump versions to 0.14.3-SNAPSHOT 26/97326/1
Robert Varga [Wed, 25 Aug 2021 10:27:30 +0000 (12:27 +0200)]
Bump versions to 0.14.3-SNAPSHOT

This starts the next development iteration.

Change-Id: I3acb85914313371da6ff807f2157ffd9f241c9c8
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
2 years agoUse controller-4.0.2 25/97325/1
Robert Varga [Wed, 25 Aug 2021 10:26:51 +0000 (12:26 +0200)]
Use controller-4.0.2

We have a released version, use it instead of snapshots.

Change-Id: I7404c2321e657304bb2e8ae737d7f5f97e0868fa
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
2 years agoAlign to controller-4.0.2-SNAPSHOT 83/97283/6
Robert Varga [Fri, 20 Aug 2021 13:22:13 +0000 (15:22 +0200)]
Align to controller-4.0.2-SNAPSHOT

This is an intermediate step to align with upcoming controller release.
We adopt:
- odlparent-9.0.5
- yangtools-7.0.7
- mdsal-8.0.4
- infrautils-2.0.5
- controller-4.0.2-SNAPSHOT

Change-Id: I4b745bb98ec97d00ccddd76e86461d47cdbba16c
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
2 years agoFix raw type warnings 91/97291/1
Robert Varga [Mon, 23 Aug 2021 13:09:44 +0000 (15:09 +0200)]
Fix raw type warnings

Component{Factory,Instance} are generic with OSGi R7, fix a few raw type
warnings.

Change-Id: I6a923e164a99d0e1959d217401116e0bf381b930
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>