openflowplugin.git
3 months agoClean up MatchNormalizationUtil 60/110160/1
Robert Varga [Tue, 6 Feb 2024 17:03:59 +0000 (18:03 +0100)]
Clean up MatchNormalizationUtil

Multiple things going on here:
- create a secondary weak cache for normalizers
- use ImmutableSet in both normalizer registries
- correct @NonNull placement
- ditch Optional.ofNullable() logic, clarifying what is going on

Change-Id: I1bccb2ae98c5239cb1b7e832bd2f03ddddcc3d91
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
3 months agoReuse singleLayer boolean 59/110159/1
Robert Varga [Tue, 6 Feb 2024 16:28:25 +0000 (17:28 +0100)]
Reuse singleLayer boolean

We have already checked this property, reuse the result.

Change-Id: Ia21b4bb9d7f927d4c922cbeb58c1a82b6c6e9621
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
3 months agoDecompose RPC implementation classes 52/110152/11
Robert Varga [Mon, 5 Feb 2024 16:29:34 +0000 (17:29 +0100)]
Decompose RPC implementation classes

RpcContextImpl registers a multitude of RPC services when it becomes
active. We really want to make that registration atomic -- which is
something we can do with
RpcProviderService.registerRpcImplementations().

This patch splits up our implementation classes to individual RPCs and
then uses a single call to register them in one go.

For bonus points we get rid of the horrible java.lang.IllegalAccessError
throws and correctly report RPC unavailability (because we do not
register those RPCs).

We also ditch OpendaylightDirectStatisticsServiceProvider and its
associated *LayerDirectStatisticsProviderInitializer, as they can be
cleanly bound without per-request lookups.

JIRA: OPNFLWPLUG-1125
Change-Id: I80ade2f9f51fc765c0d685f544e5b102061d033c
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
3 months agoRemove unused routedRpcRegistration 50/110150/1
Robert Varga [Mon, 5 Feb 2024 16:06:06 +0000 (17:06 +0100)]
Remove unused routedRpcRegistration

This field is not referenced, remove it.

JIRA: OPNFLWPLUG-1125
Change-Id: Ia5c3b9c8e701e93268b1ff61e0d99ccb7e0e33b8
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
3 months agoRefactor RpcContext 47/110147/3
Robert Varga [Mon, 5 Feb 2024 13:28:14 +0000 (14:28 +0100)]
Refactor RpcContext

The public API here does not make sense:
- lookup is only used in tests
- register is only used internally
- unregister is only used internally to lookup already-registered
  service

Eliminate public API methods and inline MdSalRegistrationUtils,
eliminate the need for various lookups.

JIRA: OPNFLWPLUG-1125
Change-Id: I28b4d8e4b8b63e715921cf8e851dcb3bb2f6a13a
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
3 months agoClean up RoleService 46/110146/5
Robert Varga [Mon, 5 Feb 2024 13:04:06 +0000 (14:04 +0100)]
Clean up RoleService

Use a switch expression to convert the OFJ enum, resulting in
elimination of the default case.

While we are here, perform overall cleanups by using:
- builders fluently
- adding listener directly
- accessing errors only once

Change-Id: I0a09d57cef2bd76ef33177077a8c347e4d9d17ce
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
3 months agoRemove AbstractVoidService 45/110145/2
Robert Varga [Mon, 5 Feb 2024 12:54:29 +0000 (13:54 +0100)]
Remove AbstractVoidService

RPCs have not been producing Void for a long time, remove
AbstractVoidService, as it has only be useful in that context.

Change-Id: I09194eaff79767df9c291fe2639761cb45f4339f
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
3 months agoMigrate StatisticsManagerImpl 16/108216/8
Robert Varga [Mon, 5 Feb 2024 12:15:58 +0000 (13:15 +0100)]
Migrate StatisticsManagerImpl

Migrate to not use generated roll-up RPC service.

JIRA: OPNFLWPLUG-1125
Change-Id: I8b2bcf9d113d6d140d96bb64f374d500bea20241
Signed-off-by: lubos-cicut <lubos.cicut@pantheon.tech>
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
3 months agoDo not use RpcService in test-provider module 96/108096/8
lubos-cicut [Sun, 1 Oct 2023 20:50:09 +0000 (22:50 +0200)]
Do not use RpcService in test-provider module

Removed usage of RpcService from test-provider by registering individual
RPC implementations.

While we are at it, split up activation, so that we have
properly-decomposed components.

JIRA: OPNFLWPLUG-1125
Change-Id: I02bdb491b517bc5898bfa43bab7430fa69c28b6a
Signed-off-by: lubos-cicut <lubos.cicut@pantheon.tech>
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
4 months agoBump upstreams 63/109563/1
Robert Varga [Tue, 23 Jan 2024 11:46:20 +0000 (12:46 +0100)]
Bump upstreams

Adopt:
- odparent-13.0.10
- infrautils-6.0.5
- yangtools-11.0.5
- mdsal-12.0.4
- controller-8.0.4
- aaa-0.18.4
- netconf-6.0.6

Also fixes up fallout from I35697d2544464d6cdc4ee88d13978eaabcf33353,
which broke unregistration -- this is now found by SpotBugs.

Change-Id: Id58314c7a4157e3c00a1ac0929964b9302be1756
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
(cherry picked from commit 0267562f3c2be39373f289008a367776dd325ff8)

4 months agoBump upstreams 90/109890/1
Robert Varga [Wed, 15 Nov 2023 09:13:31 +0000 (10:13 +0100)]
Bump upstreams

Adopt:
- odlparent-13.0.7
- infrautils-6.0.4
- yangtools-11.0.4
- mdsal-12.0.3
- controller-8.0.3
- aaa-0.18.3
- netconf-6.0.5

Change-Id: I137ef1ac5d3e68f713badfefd84b47526b090693
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
(cherry picked from commit 44ff926b40d9f14f8967bb7392c9eeb24f6eaf09)

8 months agoBump upstreams 77/107977/1
Robert Varga [Sun, 24 Sep 2023 22:42:38 +0000 (00:42 +0200)]
Bump upstreams

Adopt
- yangtools-11.0.2
- mdsal-12.0.2
- controller-8.0.2
- aaa-0.18.2
- netconf-6.0.4

Change-Id: I07b7995ad42d1edc9b7f35409188aad067f1ead2
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
(cherry picked from commit a7a40b42de14c0a2cd14729d192718c300d63d21)

8 months agoBump versions by x.(y+1).z 22/107822/1
jenkins-releng [Tue, 12 Sep 2023 02:20:52 +0000 (02:20 +0000)]
Bump versions by x.(y+1).z

Change-Id: I58b328c207c8052bd98e4805fd3b5d5db9a24496
Signed-off-by: jenkins-releng <jenkins-releng@opendaylight.org>
8 months agoBump netconf to 6.0.3 70/107770/1
Robert Varga [Fri, 8 Sep 2023 15:24:26 +0000 (17:24 +0200)]
Bump netconf to 6.0.3

Adopt latest fixes.

Change-Id: Ie2fbb4324f0bddea768ce89208c4a5f7157af4ce
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
9 months agoFix odl-openflowplugin-flow-services-rest 47/107647/1
Robert Varga [Thu, 31 Aug 2023 18:50:02 +0000 (20:50 +0200)]
Fix odl-openflowplugin-flow-services-rest

We have a odl-restconf reference which is fixed to a single version. We
should be using a range.

Change-Id: I602f4080b029eda8bf86c74fc21e5cf52a8e2039
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
9 months agoBump upstreams 41/107641/1
Robert Varga [Thu, 31 Aug 2023 15:37:06 +0000 (17:37 +0200)]
Bump upstreams

Adopt:
- odparent-13.0.4
- infrautils-6.0.2
- yangtools-11.0.1
- mdsal-12.0.1
- controller-8.0.1
- aaa-0.18.1
- netconf-6.0.2

Change-Id: I4ab0b93d34c5fd1268e8727ef7f7145bcd034b24
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
9 months agoFixup checkstyle 40/107640/1
Robert Varga [Thu, 31 Aug 2023 15:53:54 +0000 (17:53 +0200)]
Fixup checkstyle

Upgraded checkstyle is catching new violations, fix them up.

Change-Id: I81bc794f3216c25b22cec79f53d9646f9b24b069
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
9 months agoBump netconf to 6.0.1 94/107294/1
Robert Varga [Mon, 7 Aug 2023 11:41:21 +0000 (13:41 +0200)]
Bump netconf to 6.0.1

Pick up latest fixes.

Change-Id: I7ccfa78a74c5990c28fc3f688f52b416b39017ed
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
10 months agoBump upstreams 71/106571/8
Robert Varga [Tue, 20 Jun 2023 23:57:05 +0000 (01:57 +0200)]
Bump upstreams

Adopt:
- odparent-13.0.3
- infrautils-6.0.1
- yangtools-11.0.0
- mdsal-12.0.0
- controller-8.0.0
- aaa-0.18.0
- netconf-6.0.0

Change-Id: Ib9356fbcefafbdc2a72d849c33bc433efcd4ab4d
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
10 months agoModernize codebase 32/106832/2
Robert Varga [Wed, 5 Jul 2023 22:55:12 +0000 (00:55 +0200)]
Modernize codebase

Use following constructs:
- Optional.orElseThrow()
- BindingMap.of()
- List.of()

Also do not mock binding constructs, but rather rely of builders to
provide completely-functioning implementations.

Change-Id: Ie0753166443bdf85e7437e7911a8d3f91afc0efe
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
11 months agoEnforce modernize in openflowjava-extension-eric 88/105788/2
Robert Varga [Tue, 2 May 2023 17:15:57 +0000 (19:15 +0200)]
Enforce modernize in openflowjava-extension-eric

We have a few violations here -- migrate to using Math.toIntExact() and
Objects.requireNonNull(). Flip enforcement on.

Change-Id: I0a581d20b4cfb27489d1d09ac757cf17b22485d7
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
13 months agoEnforce modernizer in openflowplugin-impl 87/105787/1
Robert Varga [Tue, 2 May 2023 17:09:31 +0000 (19:09 +0200)]
Enforce modernizer in openflowplugin-impl

We are using different objects here, which unfortunately is bound to
break at some point in the future. For now change the values to lie
outside of the cached range, use Integer.valueOf() and flip modernizer
to enforcing mode.

Change-Id: I8b2a1f4c24846d4d95fc610f25de1fa978b8e649
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
13 months agoModernize openflowplugin-impl 39/104239/5
Robert Varga [Fri, 3 Feb 2023 11:28:58 +0000 (12:28 +0100)]
Modernize openflowplugin-impl

We have a ton of modernizer warnings here, bring them almost completely
under control.

Change-Id: I602ef4296db21106ab18dd21fa3b58344340234d
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
13 months agoMigrate users of Optional.get() 21/105621/4
Robert Varga [Sun, 23 Apr 2023 12:33:31 +0000 (14:33 +0200)]
Migrate users of Optional.get()

Upgraded modernizer is flagging these users, migrate them to better
alternatives. Since we require Java 17, also convert switches on enum
to switch expressions.

Change-Id: Iffea317aedce4e2e6660217b2a9d4fd277f9c451
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
(cherry picked from commit 38f326861531f68cb5aa48cc2b1fbdcc2d75885c)

14 months agoBump versions by x.(y+1).z 32/105132/1
jenkins-releng [Sat, 1 Apr 2023 12:15:43 +0000 (12:15 +0000)]
Bump versions by x.(y+1).z

Signed-off-by: jenkins-releng <jenkins-releng@opendaylight.org>
Change-Id: Ia97314bec8b49bf2d2a72a4a2d2deb0f6987263d

14 months agoBump upstreams 85/105085/1
Robert Varga [Tue, 28 Mar 2023 12:31:18 +0000 (14:31 +0200)]
Bump upstreams

Adopt:
- aaa-0.17.7
- netconf-5.0.4

Change-Id: I943021348d36fa9e9ef0afcbe63d5cb099c4036e
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
15 months agoBump upstreams 54/104754/1
Robert Varga [Fri, 3 Mar 2023 12:00:17 +0000 (13:00 +0100)]
Bump upstreams

Adopt:
- odlparent-12.0.3
- infrautils-5.0.3
- yangtools-10.0.4
- mdsal-11.0.7
- controller-7.0.4
- aaa-0.17.6
- netconf-5.0.3

Change-Id: Ie6afca5137e83c9ee3392d924e561d82959ce79c
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
15 months agoCorrect yangtools bump 24/104424/1
Robert Varga [Thu, 16 Feb 2023 11:48:31 +0000 (12:48 +0100)]
Correct yangtools bump

Use yangtools-10.0.3.

Change-Id: If86c3956fcba44e3b0c1057956faa9e35e13e6c1
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
15 months agoBump upstreams 12/104412/1
Robert Varga [Thu, 16 Feb 2023 06:26:36 +0000 (07:26 +0100)]
Bump upstreams

Adopt:
- odlparent-12.0.2
- infrautils-5.0.2
- yangtools-10.0.3
- mdsal-11.0.6
- controller-7.0.3
- aaa-0.17.5
- netconf-5.0.2

Change-Id: I0f4936a1f516d692031a8a84bbb62f9d251e3007
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
15 months agoUpdate docs version 45/104245/1
Sangwook Ha [Sat, 4 Feb 2023 23:01:05 +0000 (15:01 -0800)]
Update docs version

The version on 'master' is 'Argon'. Update the version in the docs
configuration.

Change-Id: I2a092fcfcb1ed582f42edd04d070750f9435f6e1
Signed-off-by: Sangwook Ha <sangwook.ha@verizon.com>
16 months agoDo not guard registration with retries 17/104117/3
Robert Varga [Tue, 24 Jan 2023 22:35:17 +0000 (23:35 +0100)]
Do not guard registration with retries

DTCL registration cannot really fail, do not loop on it needlessly.

Change-Id: Ifd0c1b820ada46cca921e09c3866e0bbc25fa9b4
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
Signed-off-by: Sangwook Ha <sangwook.ha@verizon.com>
16 months agoClean up DropTest{Committer,RpcSender} 16/104116/1
Robert Varga [Tue, 24 Jan 2023 22:29:24 +0000 (23:29 +0100)]
Clean up DropTest{Committer,RpcSender}

There is no point in catching exceptions during DTCL registration,
those are not allowed to fail transiently. Also do not catch exceptions
around Registration.close(), as those can never fail, either.

Change-Id: I8411c0b3a5da508a0a59db95f4bca982f6a4ce21
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
16 months agoAdopt 2023.03 Argon upstreams 39/104039/6
Robert Varga [Mon, 16 Jan 2023 12:31:36 +0000 (13:31 +0100)]
Adopt 2023.03 Argon upstreams

Adopt:
- odlparent-12.0.1
- infrautils-5.0.1
- yangtools-10.0.2
- mdsal-11.0.4
- controller-7.0.2
- aaa-0.17.3
- netconf-5.0.1

Deal with:
- yang.binding.Enumeration becoming EnumTypeObject
- BitsTypeObject components being primitive booleans
  - this implies that PortState has its fields set to false, unlike
    previously, when they could have been null
- DataBroker not allowing combined transactions
- Unions no longer accepting null member

Change-Id: I26c98ee1b0ae8eed3a6dacefb3c6ed8a34ff7b15
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
16 months agoClean up PortUpdateTranslator/PortTranslatorUtil 98/104098/1
Robert Varga [Mon, 23 Jan 2023 16:13:30 +0000 (17:13 +0100)]
Clean up PortUpdateTranslator/PortTranslatorUtil

Use a simple return with null check and instanceof pattern to reduce
verbosity a bit.

Change-Id: I45bc37e7f252a3bbe9c5a916a1b7c690f7771041
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
18 months agoReplace slf4j-log4j12 00/103300/1
Sangwook Ha [Sat, 16 Apr 2022 00:00:43 +0000 (17:00 -0700)]
Replace slf4j-log4j12

Log4j12 is not developed any more and slf4j-simple should be used
instead of slf4j-log4j12 for routing test outputs.

Also remove unnecessary stubbings detected in some test classes.

JIRA: OPNFLWPLUG-1124
Change-Id: I7b17dfae58125523a3f3c570dd02d0323a3066ab
Signed-off-by: Sangwook Ha <sangwook.ha@verizon.com>
18 months agoMigrate test-provider to CompositeListener 78/102678/6
Sangwook Ha [Fri, 18 Nov 2022 00:05:40 +0000 (16:05 -0800)]
Migrate test-provider to CompositeListener

Do not use generated Listener interface and prefer a CompositeListeners,
which allow more flexible dispatch.

Change-Id: I7848c91eb80900ed1bdde70f2f75c13325a41680
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
Signed-off-by: Sangwook Ha <sangwook.ha@verizon.com>
18 months agoRemove OSGiOpenflowDiagStatusProvider 71/103171/4
Robert Varga [Tue, 8 Nov 2022 22:35:36 +0000 (23:35 +0100)]
Remove OSGiOpenflowDiagStatusProvider

We have constructor injection, hence we can unify this class with
DefaultOpenflowDiagStatusProvider.

Change-Id: I0a9d826c9d306b29c2325228294ad41dcff61141
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
Signed-off-by: Sangwook Ha <sangwook.ha@verizon.com>
19 months agoMigrate topology-manager to CompositeListener 79/102679/3
Robert Varga [Thu, 13 Oct 2022 18:57:00 +0000 (20:57 +0200)]
Migrate topology-manager to CompositeListener

Do not use generated Listener interface and prefer a CompositeListeners,
which allow more flexible dispatch. A husk FlowCapableTopologyExporter
is left intact for testing.

Change-Id: I2577fabc9eb8f50a3f98ef57977670f2a24535a3
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
19 months agoMigrate topology-lldp-discovery to simplified Listener 77/102677/1
Robert Varga [Thu, 13 Oct 2022 18:06:54 +0000 (20:06 +0200)]
Migrate topology-lldp-discovery to simplified Listener

Rather than using the composite notification service, use the simpler
NotificationService.Listener.

Change-Id: Icdd28937645c74c5a5a268103409790473937c55
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
19 months agoModernize test-common's use of NotificationService 76/102676/1
Robert Varga [Thu, 13 Oct 2022 17:46:51 +0000 (19:46 +0200)]
Modernize test-common's use of NotificationService

Do not user generated PacketProcessingServiceListener, but rather
rely on modernized Listener interface.

Change-Id: I6376aec57152f33b75f5b2806a39e70a67d4cda1
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
19 months agoDo not use PacketProcessingListener in learning-switch 75/102675/2
Robert Varga [Thu, 13 Oct 2022 17:39:27 +0000 (19:39 +0200)]
Do not use PacketProcessingListener in learning-switch

We have only a single notification here, do not rely on generated
Listener interface.

Change-Id: Ic6371a321ed8eff781f57a3b7c79f71d3359b326
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
20 months agoBump versions by x.(y+1).z 87/102487/1
jenkins-releng [Sat, 24 Sep 2022 23:08:26 +0000 (23:08 +0000)]
Bump versions by x.(y+1).z

Signed-off-by: jenkins-releng <jenkins-releng@opendaylight.org>
Change-Id: I71903583b0807bbd0abc9dd3ca1c85a69b643c5c

20 months agoBump MRI upstreams 59/102459/1
Robert Varga [Fri, 23 Sep 2022 13:11:24 +0000 (15:11 +0200)]
Bump MRI upstreams

Adopt the following versions:
- mdsal-10.0.2
- controller-6.0.2
- aaa-0.16.3
- netconf-4.0.2

Change-Id: Ic032ea6118c684fe955381b4158ca9811b3a198e
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
21 months agoBump MRI upstreams 66/102166/3
Robert Varga [Fri, 19 Aug 2022 12:41:46 +0000 (14:41 +0200)]
Bump MRI upstreams

Adopt the following versions:
- odlparent-11.0.1
- infrautils-4.0.1
- yangtools-9.0.1
- mdsal-10.0.1
- controller-6.0.1
- aaa-0.16.1
- netconf-4.0.1

Change-Id: I3b3ce85ac6482744e687a92d5438d3c0af2fb4f6
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
21 months agoRemove argparse4j declaration 67/102167/1
Robert Varga [Fri, 19 Aug 2022 12:42:29 +0000 (14:42 +0200)]
Remove argparse4j declaration

odlparent is already providing this at a newer version, remove the
downgrade.

Change-Id: I11728a02143ae5e14aac4f14553d0406d646861c
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
22 months agoBump upstreams for 2022.09 Chlorine 45/101745/10
Robert Varga [Tue, 5 Jul 2022 17:00:03 +0000 (19:00 +0200)]
Bump upstreams for 2022.09 Chlorine

Adopt the following versions:
- odlparent-11.0.0
- infrautils-4.0.0
- yangtools-9.0.0
- mdsal-10.0.0
- controller-6.0.0
- aaa-0.16.0
- netconf-4.0.0

Change-Id: Iafb6b4012ed7cce7b3d621b2fc7bb12dc8c2aaf0
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
23 months agoUse netconf-3.0.5 61/101561/1
Robert Varga [Fri, 10 Jun 2022 06:53:54 +0000 (08:53 +0200)]
Use netconf-3.0.5

Pick up latest fixes from upstream.

Change-Id: Iab387451205c55d89490b8c7b79d3b7ef2ffff90
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
23 months agoBump upstream versions 37/101537/1
Robert Varga [Wed, 8 Jun 2022 20:36:24 +0000 (22:36 +0200)]
Bump upstream versions

Adopt:
- yangtools-8.0.6
- mdsal-9.0.4
- controller-5.0.5
- aaa-0.15.5
- netconf-3.0.4

Change-Id: I1e0502f1f3bd27924b4313b0436172fdddf5e3c5
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
(cherry picked from commit 3beb7b777502c069891a197c1c194e8cf3a13a9c)

23 months agoBump MRI upstreams 36/101536/1
Robert Varga [Sat, 14 May 2022 08:14:42 +0000 (10:14 +0200)]
Bump MRI upstreams

Adopt the following versions:
- odlparent-10.0.2
- infrautils-3.0.1
- yangtools-8.0.5
- mdsal-9.0.3
- controller-5.0.4
- aaa-0.15.4
- netconf-3.0.3

Change-Id: Id99ba0f08e53663af0771c39e60106d3996d89eb
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
(cherry picked from commit 99bd25a7bb2305490b0ead613b264a278ca7ebd8)

23 months agoBump upstreams 35/101535/1
Robert Varga [Mon, 25 Apr 2022 12:33:28 +0000 (14:33 +0200)]
Bump upstreams

Adopt:
- controller-5.0.3
- aaa-0.15.3
- netconf-3.0.2

Change-Id: I24887574b7003ed21c954e5774d28a83f48632a4
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
(cherry picked from commit 808a80eac8162ccdbe8db51f34a1fb05fcd2e971)

2 years agoFix useless object 50/101150/2
Robert Varga [Sun, 15 May 2022 18:31:23 +0000 (20:31 +0200)]
Fix useless object

There is a leftover object, remove it.

Change-Id: I23894f11c0b4e4b350bfdc712ab4cc0c6b101419
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
(cherry picked from commit aec89be5adfd49e87c63fa56eed02172c5e1152e)

2 years agoRemove commons-codec dependency 27/101227/1
Robert Varga [Wed, 18 May 2022 12:10:35 +0000 (14:10 +0200)]
Remove commons-codec dependency

This dependency is not used anywhere, make sure we do not get confused.

Change-Id: I43389b71cdd3a58b7b117f1cdb97f9e549c8f934
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
2 years agoClean up GetReconciliationStateProvider 49/101149/1
Robert Varga [Sat, 14 May 2022 09:29:23 +0000 (11:29 +0200)]
Clean up GetReconciliationStateProvider

Eliminate @SuppressFBWarnings and use Java Base64 encoder.

Change-Id: Ia9e52cd761cc252b7a2ae53cc89cfc55f76677a2
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
(cherry picked from commit 2b878b3d096edaf41da2e3b4cf62617572f90978)

2 years agoBump versions by x.(y+1).z 01/100701/1
jenkins-releng [Thu, 21 Apr 2022 02:15:45 +0000 (02:15 +0000)]
Bump versions by x.(y+1).z

Signed-off-by: jenkins-releng <jenkins-releng@opendaylight.org>
Change-Id: Id01ce0ac3e1803a50e14844298544d3240e45ec0

2 years agoBump upstream versions 22/100622/1
Robert Varga [Thu, 14 Apr 2022 15:45:44 +0000 (17:45 +0200)]
Bump upstream versions

Adopt:
- yangtools-8.0.3
- mdsal-9.0.2
- controller-5.0.2
- aaa-0.15.2
- netconf-3.0.1

Change-Id: I2b8337b63a4cd6c1505d2ca8291f9a27f7c9d007
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
2 years agoUse explicit checkState() to guard against nulls 72/100472/2
Robert Varga [Thu, 7 Apr 2022 12:54:24 +0000 (14:54 +0200)]
Use explicit checkState() to guard against nulls

Rather than relying on implicit NPE, perform an explicit checkState().
Fixes tests on JDK17.

Change-Id: I51435ec17f3efe88baf2013c461ee8804c0e4d9e
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
2 years agoModernize SwitchConnectionProviderImplTest 71/100471/1
Robert Varga [Thu, 7 Apr 2022 12:47:51 +0000 (14:47 +0200)]
Modernize SwitchConnectionProviderImplTest

There is a ton of things wrong here, modernize the test. We will revisit
it soon for JDK17 compatibility.

Change-Id: I741fd6bf8fed7499b4c06055c085fc1abcadea23
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
2 years agoFix topology-manager Blueprint XML location 67/100367/1
Sangwook Ha [Sat, 2 Apr 2022 22:48:51 +0000 (15:48 -0700)]
Fix topology-manager Blueprint XML location

topology-manager container is not created at runtime because
the Blueprint XML file is not in the expected location:
'OSGI-INF/blueprint/' or 'org/opendaylight/blueprint/'.

Move the XML file into the standard Blueprint directory.

Change-Id: I47c166c4f1923299150eecc3053d36c5324fe2f1
Signed-off-by: Sangwook Ha <sangwook.ha@verizon.com>
2 years agoRename autowire.xml 27/100127/2
Sangwook Ha [Tue, 15 Mar 2022 00:00:03 +0000 (17:00 -0700)]
Rename autowire.xml

Rename autowire.xml to use the module name for consistency with
other Blueprint XML files.

Change-Id: Icb69c6cedcaa5abe9bb5559ad102b13bfeba7cbc
Signed-off-by: Sangwook Ha <sangwook.ha@verizon.com>
2 years agoConsolidate blueprint XML files for of-switch-config-pusher 26/100126/2
Sangwook Ha [Mon, 14 Mar 2022 23:29:53 +0000 (16:29 -0700)]
Consolidate blueprint XML files for of-switch-config-pusher

There are two Blueprint XML files cross-referencing between them.
Merge them into a single file for better readability.

Change-Id: I903989a3251ab69c50c36498522c50fc16739414
Signed-off-by: Sangwook Ha <sangwook.ha@verizon.com>
2 years agoConsolidate blueprint XML files for FRM 25/100125/2
Sangwook Ha [Mon, 14 Mar 2022 23:10:54 +0000 (16:10 -0700)]
Consolidate blueprint XML files for FRM

There are two Blueprint XML files cross-referencing between them.
Merge them into a single file for better readability.

Change-Id: Ic72a7c1a16c131ba479627284defc8f786a06f2c
Signed-off-by: Sangwook Ha <sangwook.ha@verizon.com>
2 years agoConsolidate blueprint XML files for topology-lldp-discovery 24/100124/2
Sangwook Ha [Mon, 14 Mar 2022 21:46:37 +0000 (14:46 -0700)]
Consolidate blueprint XML files for topology-lldp-discovery

There are two Blueprint XML files cross-referencing between them.
Merge them into a single file for better readability.

Change-Id: I0de4d6f80337a83136a4bc90caf496f943cc9108
Signed-off-by: Sangwook Ha <sangwook.ha@verizon.com>
2 years agoConsolidate blueprint XML files for openflowplugin-impl 23/100123/2
Sangwook Ha [Mon, 14 Mar 2022 21:28:27 +0000 (14:28 -0700)]
Consolidate blueprint XML files for openflowplugin-impl

There are two Blueprint XML files cross-referencing between them.
Merge them into a single file for better readability.

Change-Id: Ib46dd02259658484a278908dc8af46f553a9d4f7
Signed-off-by: Sangwook Ha <sangwook.ha@verizon.com>
2 years agoFixup duplicate reference 05/100305/1
Robert Varga [Thu, 31 Mar 2022 15:19:27 +0000 (17:19 +0200)]
Fixup duplicate reference

Previous patch introduced a duplicate declaration, remove it.

Change-Id: I28a4a62e867952e07166763e0eb7afc8aad57567
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
2 years agoBump MRI upstreams 77/100077/17
Robert Varga [Fri, 11 Mar 2022 10:35:45 +0000 (11:35 +0100)]
Bump MRI upstreams

Adopt the following versions:
- odlparent-10.0.0
- infrautils-3.0.0
- yangtools-8.0.2
- controller-5.0.1
- aaa-0.15.1
- netconf-3.0.0

Also reconcile leaf-list mapping and correct feature packaging, so that
we do not repackage upstream bundles.

Change-Id: I5fc015361626e3c8721ac30255e8a4efacfb568e
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
2 years agoCleanup switch certificate chain handling 01/100301/4
Robert Varga [Thu, 31 Mar 2022 07:41:19 +0000 (09:41 +0200)]
Cleanup switch certificate chain handling

SpotBugs is identifying a leak into static state. This is caused by a
rather thorough layering violation. Refactor ConnectionAdapter to always
report switch certificate -- cleaning up the code in process, making it
properly defensive.

JIRA: OPNFLWPLUG-1094
Change-Id: If48b57175347dab056424b8f1b169bd552ea029f
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
2 years agoMigrate test-provider to OSGi DS 67/100067/7
Sangwook Ha [Thu, 17 Mar 2022 08:13:14 +0000 (01:13 -0700)]
Migrate test-provider to OSGi DS

This is a very simple component, just migrate it over.

Change-Id: I455184dea3c1df406bad8e85e23886f86a4b3595
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
Signed-off-by: Sangwook Ha <sangwook.ha@verizon.com>
2 years agoDo not use blueprint-maven-plugin in of-switch-config-pusher 76/100076/6
Robert Varga [Fri, 11 Mar 2022 13:59:36 +0000 (14:59 +0100)]
Do not use blueprint-maven-plugin in of-switch-config-pusher

Inline the generated container and dist dependencies on annotations
and the plugin.

Change-Id: I574c2df5e46fa28e85f3d79b69d5d46f9e92ab29
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
2 years agoDo not use blueprint-maven-plugin in topology-manager 74/100074/6
Robert Varga [Fri, 11 Mar 2022 13:56:29 +0000 (14:56 +0100)]
Do not use blueprint-maven-plugin in topology-manager

Inline the generated container and dist dependencies on annotations
and the plugin.

Change-Id: Idb3905c005a37d2d46ccccc0243c6c77c91d6c86
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
2 years agoDo not use blueprint-maven-plugin in FRM 73/100073/5
Robert Varga [Fri, 11 Mar 2022 13:52:28 +0000 (14:52 +0100)]
Do not use blueprint-maven-plugin in FRM

Inline the generated container and dist dependencies on annotations
and the plugin.

Change-Id: I24478884865581c219e3048bf005c2ec3defb344
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
2 years agoDo not use blueprint-maven-plugin in device-ownership-service 72/100072/5
Robert Varga [Fri, 11 Mar 2022 13:50:20 +0000 (14:50 +0100)]
Do not use blueprint-maven-plugin in device-ownership-service

Inline the generated container and dist dependencies on annotations
and the plugin.

Change-Id: I67d67aac7327bea03892f1da996af74d2e5a7b7d
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
2 years agoDo not use blueprint-maven-plugin in reconciliation-framework 71/100071/5
Robert Varga [Fri, 11 Mar 2022 13:46:00 +0000 (14:46 +0100)]
Do not use blueprint-maven-plugin in reconciliation-framework

Inline the generated container and dist dependencies on annotations
and the plugin.

Change-Id: Id3cdfa2dd24faa0fb3b7aad6ba4447dc2176dae5
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
2 years agoDo not use blueprint-maven-plugin in topology-lldp-discovery 70/100070/5
Robert Varga [Fri, 11 Mar 2022 13:44:02 +0000 (14:44 +0100)]
Do not use blueprint-maven-plugin in topology-lldp-discovery

Inline the generated container and dist dependencies on annotations
and the plugin.

Change-Id: Ie021db12d1cb6fdc8a841e7cd81fa1e589e4e40a
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
2 years agoDo not use blueprint-maven-plugin in arb-reconcile-impl 69/100069/5
Robert Varga [Fri, 11 Mar 2022 13:40:02 +0000 (14:40 +0100)]
Do not use blueprint-maven-plugin in arb-reconcile-impl

Inline the generated container and dist dependencies on annotations
and the plugin.

Change-Id: I075960481774011ac56d80ae0ccd5537eef79247
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
2 years agoCorrect subject-alternate-names 79/100079/3
Robert Varga [Fri, 11 Mar 2022 14:17:15 +0000 (15:17 +0100)]
Correct subject-alternate-names

The ASN.1 definition is 'SEQUENCE', hence the order has significance.
Fix the definition.

Change-Id: I0a65cc16a48611415948478e7da752b757c3085a
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
2 years agoDo not use blueprint-maven-plugin in openflowplugin-impl 68/100068/5
Robert Varga [Fri, 11 Mar 2022 13:36:53 +0000 (14:36 +0100)]
Do not use blueprint-maven-plugin in openflowplugin-impl

Inline the generated container and dist dependencies on annotations
and the plugin.

Change-Id: Ib8267a746689928980949d04dd5dcb690015c4b7
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
2 years agoReplace deprecated initMocks() in openflow-protocol-impl 68/99968/3
Sangwook Ha [Fri, 4 Mar 2022 11:55:09 +0000 (03:55 -0800)]
Replace deprecated initMocks() in openflow-protocol-impl

initMocks has been deprecated. Use MockitoJUnitRunner instead.
Also, remove unnecessary stubbings and fix some typos in
openflow-protocol-impl.

JIRA: OPNFLWPLUG-1122
Change-Id: I9f30868c84b67a69b262044c047b43df1510ff93
Signed-off-by: Sangwook Ha <sangwook.ha@verizon.com>
2 years agoRemove unnecessary initMocks() in openflow-protocol-impl 67/99967/3
Sangwook Ha [Fri, 4 Mar 2022 08:24:57 +0000 (00:24 -0800)]
Remove unnecessary initMocks() in openflow-protocol-impl

Some of the initMocks() in openflow-protocol-impl are unnecessary.
Remove them.

JIRA: OPNFLWPLUG-1122
Change-Id: Iad89eccdd1a855b584ace9a79162f39785a3aba2
Signed-off-by: Sangwook Ha <sangwook.ha@verizon.com>
2 years agoReplace deprecated initMocks() in openflowplugin-impl 66/99966/2
Sangwook Ha [Fri, 4 Mar 2022 09:28:51 +0000 (01:28 -0800)]
Replace deprecated initMocks() in openflowplugin-impl

initMocks has been deprecated. Use MockitoJUnitRunner instead
and remove unnecessary stubbing in openflowplugin-impl.

JIRA: OPNFLWPLUG-1122
Change-Id: Iaf9843a0d310e85964c440f2e82310bc9ad95fd0
Signed-off-by: Sangwook Ha <sangwook.ha@verizon.com>
2 years agoRemove unnecessary initMocks() in openflow-protocol-it 65/99965/2
Sangwook Ha [Fri, 4 Mar 2022 09:14:34 +0000 (01:14 -0800)]
Remove unnecessary initMocks() in openflow-protocol-it

initMocks() used in openflow-protocol-impl is unnecessary. Remove it.

JIRA: OPNFLWPLUG-1122
Change-Id: Ifad9cb5793086d7f573c56fe118b5148eb474ecb
Signed-off-by: Sangwook Ha <sangwook.ha@verizon.com>
2 years agoReplace deprecated initMocks() in topology-manager 64/99964/2
Sangwook Ha [Fri, 4 Mar 2022 07:24:21 +0000 (23:24 -0800)]
Replace deprecated initMocks() in topology-manager

initMocks has been deprecated. Use MockitoJUnitRunner instead
and remove unnecessary stubbings in topology-manager.

JIRA: OPNFLWPLUG-1122
Change-Id: I2ebeb322a1feaa78c7f2afbffe2a6fab0d9add52
Signed-off-by: Sangwook Ha <sangwook.ha@verizon.com>
2 years agoReplace Empty.getInstance() with Empty.value() 54/99854/3
Sangwook Ha [Thu, 24 Feb 2022 09:00:10 +0000 (01:00 -0800)]
Replace Empty.getInstance() with Empty.value()

Empty.getInstance() is deprecated, use Empty.value() instead.

JIRA: OPNFLWPLUG-1123
Change-Id: I7aac7b757867879093b48d5f22788063b196ab18
Signed-off-by: Sangwook Ha <sangwook.ha@verizon.com>
2 years agoUpdate PTL info 74/99974/1
Sangwook Ha [Fri, 4 Mar 2022 21:50:29 +0000 (13:50 -0800)]
Update PTL info

Arunprakash stepped down as PTL:
https://lists.opendaylight.org/g/TSC/message/13998

Change-Id: I779eb9e08810f5f1cfafe42c87d2fa26d91ac4b3
Signed-off-by: Sangwook Ha <sangwook.ha@verizon.com>
2 years agoRemove node-errors.yang 34/98934/5
Sangwook Ha [Thu, 9 Dec 2021 07:16:53 +0000 (23:16 -0800)]
Remove node-errors.yang

node-errors.yang and its deprecated notifications are only used
in test-provider. Remove the data model and the implementation
in test-provider.

JIRA: OPNFLWPLUG-1119
Change-Id: I43a488d6e86c025837341a16d20e0617d0f4161f
Signed-off-by: Sangwook Ha <sangwook.ha@verizon.com>
2 years agoUpdate MRI upstreams 50/99750/1
Robert Varga [Mon, 14 Feb 2022 14:29:57 +0000 (15:29 +0100)]
Update MRI upstreams

Adopt:
- odlparent-9.0.13
- infrautils-2.0.13
- yangtools-7.0.14
- mdsal-8.0.11
- controller-4.0.10
- aaa-0.14.10
- netconf-2.0.14

Change-Id: Icbcbc6f03c6b2dadbe6e776a94730654746bcfb0
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
(cherry picked from commit f77032098a298fbbfe249328de31eb9b52d29359)

2 years agoMigrate to assertThrows() 62/99662/1
Robert Varga [Tue, 8 Feb 2022 17:52:38 +0000 (18:52 +0100)]
Migrate to assertThrows()

ExpectedException.none() is deprecated, use assertThrows() to narrow
down the code that is expected to throw instead.

Change-Id: Iaeeef4adb3309e1356eb03ff30fb1c6988d5491a
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
2 years agoDo not instantiate JsonParser 44/99644/1
Robert Varga [Tue, 8 Feb 2022 09:27:51 +0000 (10:27 +0100)]
Do not instantiate JsonParser

Use parseString() static method instead of using the deprecated instance
method.

Change-Id: Ica84e1d21bbb229b800a89fd11ce53d61f077883
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
2 years agoRemove deprecated notifications in sal-meter.yang 33/98933/4
Sangwook Ha [Thu, 9 Dec 2021 07:16:53 +0000 (23:16 -0800)]
Remove deprecated notifications in sal-meter.yang

Deprecated notifications in sal-meter.yang are only used by
test-provider. Remove the notifications from the data model
and the implementation in test-provider.

JIRA: OPNFLWPLUG-1119
Change-Id: I0093cc5fda57cc67237f350837f412e7377191df
Signed-off-by: Sangwook Ha <sangwook.ha@verizon.com>
2 years agoRemove deprecated & unused notifications 32/98932/3
Sangwook Ha [Thu, 9 Dec 2021 01:05:18 +0000 (17:05 -0800)]
Remove deprecated & unused notifications

Deprecated notifications in sal-group.yang & sal-port.yang
are not used any more. Remove the notifications from the data
models.

JIRA: OPNFLWPLUG-1119
Change-Id: Ic9428d5bbcae07225357adde1f72230991b5da1d
Signed-off-by: Sangwook Ha <sangwook.ha@verizon.com>
2 years agoRemove notification-supplier 31/98931/3
Sangwook Ha [Thu, 9 Dec 2021 01:05:18 +0000 (17:05 -0800)]
Remove notification-supplier

notification-supplier is a deprecated application. Remove it as
a first step to clean up deprecated & unused notifications.

JIRA: OPNFLWPLUG-1119
Change-Id: I0c04e9ef0c8d0c52540786afcd77dc457eebc17c
Signed-off-by: Sangwook Ha <sangwook.ha@verizon.com>
2 years agoBump netconf to 2.0.11 08/98708/1
Robert Varga [Thu, 25 Nov 2021 18:01:36 +0000 (19:01 +0100)]
Bump netconf to 2.0.11

Pick up a fix for regression.

Change-Id: Ic1e4da5790b7006bde3751ea52731b85c9923142
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
2 years agoBump netconf to 2.0.10 57/98557/1
Robert Varga [Tue, 23 Nov 2021 11:13:52 +0000 (12:13 +0100)]
Bump netconf to 2.0.10

Pick up a fix for regression.

Change-Id: I3346facecff377ebc158bc3bf1db5a675b65bdfb
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
2 years agoRefactor FRM unit tests 04/98604/5
Sangwook Ha [Wed, 17 Nov 2021 06:53:08 +0000 (22:53 -0800)]
Refactor FRM unit tests

Move common setup procedure to the parent class FRMTest to reduce
code duplication, and replace RpcProviderRegistryMock with
simple mocking.

Return a future, instead of null, to avoid null pointer exception
during the test, and remove the wrapper assertCommit.

Signed-off-by: Sangwook Ha <sangwook.ha@verizon.com>
Change-Id: Ic4f3f92d17c79c73bc6928820e206d07e6ec058b

2 years agoUpdate MRI upstreams 51/98551/1
Robert Varga [Mon, 15 Nov 2021 21:04:36 +0000 (22:04 +0100)]
Update MRI upstreams

Adopt:
- controller-4.0.7
- aaa-0.14.7
- netconf-2.0.9

Change-Id: Ia67b3a9ce3006aaa0ce6905358184c400a4ea103
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
2 years agoUpdate MRI upstreams 71/98071/1
Robert Varga [Mon, 8 Nov 2021 06:06:22 +0000 (07:06 +0100)]
Update MRI upstreams

Adopt:
- controller-4.0.6
- aaa-0.14.6
- netconf-2.0.8

Change-Id: I40d7da3d759f657eac637b843e976094c385363e
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
2 years agoUpdate MRI upstreams 73/98173/1
Robert Varga [Thu, 28 Oct 2021 10:03:49 +0000 (12:03 +0200)]
Update MRI upstreams

Adopt:
- odlparent-9.0.8
- infrautils-2.0.8
- yangtools-7.0.8
- mdsal-8.0.7
- controller-4.0.5
- aaa-0.14.5
- netconf-2.0.7

Change-Id: I94110596c5d8de7083002b6a8a1e98e3a7adb9d0
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
2 years agoAdd Sangwook to committers 79/97879/2
Robert Varga [Wed, 13 Oct 2021 11:26:21 +0000 (13:26 +0200)]
Add Sangwook to committers

The vote was passed here:
https://lists.opendaylight.org/g/app-dev/message/942,
make that decision effective.

Change-Id: Id1a157f738b77fa099d3851e19c6df3f75565bab
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
2 years agoUpdate Robert's details 78/97878/1
Robert Varga [Wed, 13 Oct 2021 11:23:44 +0000 (13:23 +0200)]
Update Robert's details

Affiliation and timezone are not correct, fix that.

Change-Id: Iec4b09273d839f701be88984db8c803c76dd35a8
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
2 years agoBump versions by x.(y+1).z 54/97554/1
jenkins-releng [Tue, 21 Sep 2021 00:25:43 +0000 (00:25 +0000)]
Bump versions by x.(y+1).z

Signed-off-by: jenkins-releng <jenkins-releng@opendaylight.org>
Change-Id: Iccfdc8d2b474aeed2fc31e17b30b0c2a74d04627

2 years agoBump upstream versions 25/97525/2
Robert Varga [Sun, 19 Sep 2021 20:20:17 +0000 (22:20 +0200)]
Bump upstream versions

Adopt netconf-2.0.5 et al.

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