openflowplugin.git
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>
2 years agoBump upstream versions 35/97335/1
Robert Varga [Thu, 26 Aug 2021 09:47:26 +0000 (11:47 +0200)]
Bump upstream versions

Adopt netconf-2.0.3 et al.

Change-Id: I033b29c9f46800070687dec2ab7e8719833a2292
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
2 years agoRemove utility class constructor exceptions 41/97241/1
Robert Varga [Tue, 17 Aug 2021 20:49:20 +0000 (22:49 +0200)]
Remove utility class constructor exceptions

There is no point in guarding private constructors, just use a simple
comment.

Change-Id: I19391f8cae07af5280998d294c6fa0a7347e5fac
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
2 years agoBump upstream versions 92/97092/1
Robert Varga [Fri, 6 Aug 2021 09:00:46 +0000 (11:00 +0200)]
Bump upstream versions

Adopt netconf-2.0.2 et al.

Change-Id: Ib498d6c024d856c19f9de9719e760af08d187769
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
2 years agoCleanup dependencies 45/96945/3
Robert Varga [Tue, 20 Jul 2021 12:20:31 +0000 (14:20 +0200)]
Cleanup dependencies

We have a number of unused declared dependencies. Clean them up, so that
we do not pull in unrelated things.

Change-Id: I89dd1b46caf31f088b36f3734ce6050a76b371ea
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
2 years agoBump netconf to 2.0.1 22/96922/1
Robert Varga [Mon, 19 Jul 2021 14:36:20 +0000 (16:36 +0200)]
Bump netconf to 2.0.1

Pick up latest upstream fixes.

Change-Id: Id44b831126d4da0fb5f928f8ea09392a55ea3344
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
2 years agoUpdate MRI upstreams for Phosphorus 99/96399/14
Robert Varga [Tue, 1 Jun 2021 11:19:07 +0000 (13:19 +0200)]
Update MRI upstreams for Phosphorus

Adopt latest versions, namely;
- odlparent-9.0.2
- infrautils-2.0.2
- mdsal-8.0.0
- controller-4.0.0
- aaa-0.14.0
- netconf-2.0.0

Also introduce model-{inventory,topology}, which were removed from
upstream.

Since these versions also force the Uint8/Uint32 vs. Short/Long
equivalence issue, we mass-migrate all APIs to use Uint constructs.
This in turn requires minor adjustments to mocks, as we no longer
get automatic smart zeroes.

Another thing that is cropping up here is that augment-identifier
is now reflected in package names properly, requiring a proper update
of imports and references.

Change-Id: If3fc2bf0bb29ed4c313ad4489ab90ecd383df7d0
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
2 years agoUse GuicedEE for javax.inject 00/96400/1
Robert Varga [Tue, 1 Jun 2021 11:25:21 +0000 (13:25 +0200)]
Use GuicedEE for javax.inject

javax.inject is an ancient artifact, which use the version published
by GuicedEE, as it is a proper bundle as well as a JPMS module.

Change-Id: Ifc6fa52925cad2b10e3fb2e7ff2146f6da39a0ba
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
2 years agoUse osgi.core from OSGi R7 98/96398/1
Robert Varga [Tue, 1 Jun 2021 11:23:08 +0000 (13:23 +0200)]
Use osgi.core from OSGi R7

Release 7 has changed the artifact name, use the new name instead
of the R6 name.

Change-Id: I612163a783faaa01fb2a8f09cad91e5c3d0dd60c
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
3 years agoBump MRI upstreams 49/95649/2
Robert Varga [Fri, 2 Apr 2021 05:38:11 +0000 (07:38 +0200)]
Bump MRI upstreams

Adopt following versions:
- odlparent-8.1.1
- infrautils-1.9.6
- yangtools-6.0.5
- mdsal-7.0.6
- controller-3.0.7
- aaa-0.13.2
- netconf-1.13.1

Change-Id: I2462f0e95ca72119c01d733de191dba84c6810fd
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
3 years agoBump versions by x.(y+1).z 91/95291/1
jenkins-releng [Mon, 22 Feb 2021 23:02:56 +0000 (23:02 +0000)]
Bump versions by x.(y+1).z

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

3 years agoBump netconf to 1.13.0 47/95247/2
Robert Varga [Sun, 21 Feb 2021 17:53:27 +0000 (18:53 +0100)]
Bump netconf to 1.13.0

Adjust version for MRI-integrated NETCONF.

Change-Id: I6334e2d52e4040561fe21a0a8cb2ab0d11dbb2e9
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
3 years agoAdopt akka-2.6.x 80/94980/3
Oleksii Mozghovyi [Tue, 2 Feb 2021 21:47:19 +0000 (23:47 +0200)]
Adopt akka-2.6.x

Bump upstream to controller-3.0.6 to adopt akka-2.6.x.

Change-Id: I16a6477ce8f0fb40f72e8eccb1f4b822159982a7
Signed-off-by: Oleksii Mozghovyi <oleksii.mozghovyi@pantheon.tech>
3 years agoCorrect odl-infrautils-diagstatus dependency 48/94948/1
Robert Varga [Mon, 1 Feb 2021 16:01:44 +0000 (17:01 +0100)]
Correct odl-infrautils-diagstatus dependency

infrautils is an MRI project, the dependency should use a range.

Change-Id: I520f19fce82e9b2710778400e2674e9cc7b0466e
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
3 years agoBump upstream versions 15/94715/4
Robert Varga [Thu, 21 Jan 2021 18:20:04 +0000 (19:20 +0100)]
Bump upstream versions

Adopt following upstreams:
- odlparent-8.1.0
- infrautils-1.9.5
- yangtools-6.0.4
- mdsal-7.0.5
- controller-3.0.5

Change-Id: Ia6032355584427bda82e8993190b979c9776e340
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
3 years agoContextChainHolderImpl maps are Concurrent 33/94733/1
Robert Varga [Fri, 22 Jan 2021 12:23:20 +0000 (13:23 +0100)]
ContextChainHolderImpl maps are Concurrent

Document the intended contract, allowing future improvements around
executed operations.

Change-Id: I778c4ecb82ec1e3be129bdcdce9e5fd925dc88a3
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
3 years agoFix OPNFLWPLUG-1107 null pointer exception 89/94689/2
Sangwook Ha [Thu, 21 Jan 2021 02:19:23 +0000 (18:19 -0800)]
Fix OPNFLWPLUG-1107 null pointer exception

Check if deviceInfo is null before continue - OpenFlow channel may get
dropped before deviceInfo is available.

Change-Id: I71a2928ac52df425692dd98b455923dcddfa1d28
Signed-off-by: Sangwook Ha <sangwook.ha@verizon.com>
3 years agoEliminate blueprint from openflow-protocol-impl 79/94679/1
Robert Varga [Wed, 20 Jan 2021 21:33:06 +0000 (22:33 +0100)]
Eliminate blueprint from openflow-protocol-impl

We have simple services here, to the point of one being ServiceLoader
kind. Use OSGi DS instead of blueprint, unblocking dependencies and
making things neater.

Change-Id: Ifab9ba92e1ac6d73854093b5dce4768bd722984e
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
3 years agoMigrate TableFeaturesConvertorTest 13/94613/2
Robert Varga [Tue, 12 Jan 2021 10:26:57 +0000 (11:26 +0100)]
Migrate TableFeaturesConvertorTest

Use BindingMap to stop using List of items which are actually a Map.

Change-Id: Ia0756b6a0cb9397286feb32eced7181c3094ec17
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
3 years agoMigrate more setFoo(List) setters 07/94607/2
Robert Varga [Tue, 12 Jan 2021 01:10:26 +0000 (02:10 +0100)]
Migrate more setFoo(List) setters

Clean up more call sites, using BindingMap.ordered(). Also fixes
a few performance regressions introduced during original migration.

Change-Id: I8491695cb482c2b8e6fe7d53d41a5bede61b068f
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
3 years agoFix next round of OFP test warnings 06/94606/1
Robert Varga [Tue, 12 Jan 2021 01:04:16 +0000 (02:04 +0100)]
Fix next round of OFP test warnings

We are on home stretch now, update a few more tests.

Change-Id: Ibdf7ccac8d8d5b212ab9c7c2903f69098df2768b
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
3 years agoMore OFP production code migration 05/94605/2
Robert Varga [Mon, 11 Jan 2021 21:45:16 +0000 (22:45 +0100)]
More OFP production code migration

Use BindingMap and similar construcs to switch from Lists to Maps.

Change-Id: I35c8e71ac03dbec10c32074e8caad1fd3c95d374
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
3 years agoMore OFP test conversions 04/94604/1
Robert Varga [Mon, 11 Jan 2021 21:44:34 +0000 (22:44 +0100)]
More OFP test conversions

Use various tricks to get rid of warnings, mostly BindingMap.

Change-Id: I6e3273567bc207ab0d265d68afbbdbed6a36987e
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
3 years agoCleanup warnings in openflowplugin-extension-eric 03/94603/1
Robert Varga [Mon, 11 Jan 2021 21:05:31 +0000 (22:05 +0100)]
Cleanup warnings in openflowplugin-extension-eric

Use BindingMap.of() instead of Collections.singletonList() and
move on.

Change-Id: Idd869836bac003fe3fda3c682837eb775c6745f4
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
3 years agoAnother round of ofp-impl warning fixes 01/94601/3
Robert Varga [Mon, 11 Jan 2021 18:00:02 +0000 (19:00 +0100)]
Another round of ofp-impl warning fixes

Use ByteBufUtils.readUint{8,16,32,64} and BindingMap's facilities
to migrate away from legacy components.

Change-Id: I21aafa5d09c0c9f6c46eba543c61755fd7f18723
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
3 years agoDrop locking from FlowGroupInfoHistoryImpl 02/94602/2
Robert Varga [Mon, 11 Jan 2021 19:17:31 +0000 (20:17 +0100)]
Drop locking from FlowGroupInfoHistoryImpl

Updates here are in the fast path and we are taking locks for
something that is used ... almost never.

Remove locking and perform time-bound retries to acquire entries
instead, explaining the situation in comments.

If this is not sufficient, a TODO is also added as to what needs
to happen to make the entry acquisition reliable.

Change-Id: I21d05e074bb5033942ef4f7d0bc210a2e9bbf359
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
3 years agoRemove FlowGroupCacheManager crud 91/94591/10
Robert Varga [Sun, 10 Jan 2021 22:07:22 +0000 (23:07 +0100)]
Remove FlowGroupCacheManager crud

Split out history tracking into Device{Flow,Group}Registry, so that
we do not perform NodeId-based lookups.

Integrate this history with Device{Context,Manager} and their
respective services instead, removing the need for most of the crud
introduced in f636f76930e43e34c2c2decd210ccd33e6e2c1fa.

Change-Id: Ic9bb8829a253dbe49b9bd285df2eb47788c1fbb0
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
3 years agoFurther test migration 00/94600/1
Robert Varga [Mon, 11 Jan 2021 17:57:55 +0000 (18:57 +0100)]
Further test migration

Use BindingMap instead of lists for easy migration.

Change-Id: Ifb721a363009475717222b71ec4982e10a777618
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
3 years agoMigrate MultipartReplyPortStatsDeserializer 98/94598/1
Robert Varga [Mon, 11 Jan 2021 14:24:05 +0000 (15:24 +0100)]
Migrate MultipartReplyPortStatsDeserializer

Use readUint{32,64} and BindingMap to eliminate warnings, and improve
both readability and performance.

Change-Id: Ib30396a7cc8deee9ad254e27730ed1361ef718d7
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
3 years agoMigrate more List-based map setters 90/94590/2
Robert Varga [Sun, 10 Jan 2021 20:05:26 +0000 (21:05 +0100)]
Migrate more List-based map setters

There are a number of cases where we can use BindingMap and its
Builder to create a ready-made map.

Change-Id: I5205681583849bb95c81c8dc95728436aa0701c5
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
3 years agoUse BindingMap to migrate tests 89/94589/2
Robert Varga [Sun, 10 Jan 2021 20:04:50 +0000 (21:04 +0100)]
Use BindingMap to migrate tests

A number of tests are using Lists, where BindingMap can provide a
nice bridge.

Change-Id: Ib26a3b3a7587afb58f8abb02706dc693d566b920
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
3 years agoProperly check for FlowRef before touching caches 86/94586/6
Robert Varga [Sun, 10 Jan 2021 12:26:34 +0000 (13:26 +0100)]
Properly check for FlowRef before touching caches

FlowRef is not necessarily present, hence we need to properly
isolate code that requires it.

This ends up being a larger-scale refactor, as there was a ton
of duplicate code. At the end of the day, this debugging facility's
footprint is reasonably reduced.

JIRA: OPNFLWPLUG-1106
Change-Id: I402cc302ab09e22bda7f731f7da4431f576c8bbb
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
3 years agoCorrect OF10EnqueueActionDeserializer 16/94416/3
Robert Varga [Tue, 5 Jan 2021 17:04:12 +0000 (18:04 +0100)]
Correct OF10EnqueueActionDeserializer

We seem to have a mismatch in header deserialization, fix it up.

Change-Id: I1807b24e9fe2cd6ef9852009131ae251b46aea7d
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
3 years agoRemove EricMatchCodecs 20/94420/3
Robert Varga [Tue, 5 Jan 2021 22:43:07 +0000 (23:43 +0100)]
Remove EricMatchCodecs

This class hosts only two constants, move them to their respective
classes as singleton constants.

Change-Id: Iddac2dc01a7854f3461d5581d18b8530947179f8
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
3 years agoOFSerializer.serialize() takes NonNull arguments 19/94419/2
Robert Varga [Tue, 5 Jan 2021 22:35:31 +0000 (23:35 +0100)]
OFSerializer.serialize() takes NonNull arguments

Users can rely on these never being null, document that.

Change-Id: I7bc7a5775a87629c3d6c28aa5ed889508ddc72c4
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
3 years agoBump MRI upstreams 18/94518/2
Robert Varga [Fri, 8 Jan 2021 20:50:00 +0000 (21:50 +0100)]
Bump MRI upstreams

Adopt following versions:
- odlparent-8.0.3
- infrautils-1.9.4
- yangtools-6.0.3
- mdsal-7.0.4
- controller-3.0.4

Change-Id: Ie85de0e127d1c0ea57c9758efdbc2c6a21ae521d
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
3 years agoFix checkstyle 42/94542/1
Robert Varga [Sat, 9 Jan 2021 09:32:39 +0000 (10:32 +0100)]
Fix checkstyle

Upgraded checkstyle finds a number of formatting issues which were
previously undetected. Fix them up.

Change-Id: I63640aee38927bde9f22e73e21640b81cfb07d85
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
3 years agoEnable modernizer in openflow-protocol-impl 15/94415/1
Robert Varga [Tue, 5 Jan 2021 17:09:18 +0000 (18:09 +0100)]
Enable modernizer in openflow-protocol-impl

Modernizer is only flagging a misuse of MoreObjects.firstNonNull(),
replace the call sites with Objects.requireNonNull() and flip
enforcement on.

Change-Id: I825538398ebff463e606a337353a5cc6565506ee
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
3 years agoAdd AbstractActionCaseDeserializer 11/94411/6
Robert Varga [Tue, 5 Jan 2021 13:01:37 +0000 (14:01 +0100)]
Add AbstractActionCaseDeserializer

Most implementations of AbstractActionDeserializer result in an
Action, which we can pull down into the abstract class, reducing
the amount of duplicate code.

This makes the dispatch a bit more friendly, as the there are
fewer implementations of the actual entry point.

Change-Id: I610a8412dedc15ee9a22e4d1d26c498c2d9f3ba3
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
3 years agoClean up a few factories 14/94414/2
Robert Varga [Tue, 5 Jan 2021 16:46:40 +0000 (17:46 +0100)]
Clean up a few factories

Remove unneeded @SuppressFBWarnings and use builders fluently,
cutting down bytecode.

Change-Id: I28aaa83701bb401e057c45671de7968ac03d458c
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
3 years agoOptimize ByteBufUtils.readIetfIpv4Address() 13/94413/3
Robert Varga [Tue, 5 Jan 2021 14:37:59 +0000 (15:37 +0100)]
Optimize ByteBufUtils.readIetfIpv4Address()

Use a simple readInt() and pass that down do IetInetUtil, so we
have a more efficient decode.

Change-Id: I9ee229ced8dccf59509c050b0559713d7fcbabde
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
3 years agoCleanup a few protocol deserializers 10/94410/1
Robert Varga [Tue, 5 Jan 2021 12:54:44 +0000 (13:54 +0100)]
Cleanup a few protocol deserializers

We can use a simple list and reorganize our builders for clarity.

Change-Id: I3660eab1e0ace31e900d6e31e0ada276624b8edc
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
3 years agoCleanup MeterConvertorTest 08/94408/3
Robert Varga [Tue, 5 Jan 2021 11:26:15 +0000 (12:26 +0100)]
Cleanup MeterConvertorTest

Use BindingMap.ordered() and clean up some builder usage.

Change-Id: Ia56af4bade4fe7b958dcb35a6273c08a0a91c4ce
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
3 years agoClean up GroupConvertorTest 09/94409/2
Robert Varga [Tue, 5 Jan 2021 11:51:54 +0000 (12:51 +0100)]
Clean up GroupConvertorTest

Use BindingMap.ordered() instead of the various lists, fixing
related warnings.

Change-Id: Id59d83a345d7eb3dd378a9bf03868bb8982d1c63
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
3 years agoCleanup PacketOutConvertorTest 07/94407/1
Robert Varga [Tue, 5 Jan 2021 10:36:53 +0000 (11:36 +0100)]
Cleanup PacketOutConvertorTest

Use BindingMap.of() to migrate the single use of list remaining,
also cleaning up builder usage a bit.

Change-Id: I52e675943c6375631601a95b5ee261968216d22e
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
3 years agoCleanup FlowConvertorTest 06/94406/1
Robert Varga [Tue, 5 Jan 2021 10:18:59 +0000 (11:18 +0100)]
Cleanup FlowConvertorTest

Use BindingMap.of() instead of lists to get rid of related
warnings. Also clean up builder use.

Change-Id: Icda5eb7e1460f1e6212085dc9d768f4b241af6bb
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
3 years agoCleanup liblldp 04/94404/1
Robert Varga [Tue, 5 Jan 2021 08:44:58 +0000 (09:44 +0100)]
Cleanup liblldp

Remove use of Class.newInstance() in favor of Supplier<Packet>,
which takes reflection out of the picture.

Also cleanup various other warnings, improving efficiency in the
process.

Change-Id: Iaed142fd2ab4ce0fa4a765d8b3f4006fd8076b1f
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
3 years agoCleanup ofp nicira extension 89/94389/16
Robert Varga [Mon, 4 Jan 2021 00:40:14 +0000 (01:40 +0100)]
Cleanup ofp nicira extension

Fix warnings coming from uint type widening and clean up builder
usage.

Also optimize MatchUtil.ipv4ToLong() by using IetfInetUtil, since
which is the most efficient way of during that conversion. This
leads to a cleanup of MatchUtil, which is taught to operate on Uint32
instead.

Change-Id: I6219f47d4dc06b046b1fce5c7acd699edd96d3ad
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
3 years agoMerge "Cleanup MeterMessageSerializer"
Robert Varga [Tue, 5 Jan 2021 08:32:28 +0000 (08:32 +0000)]
Merge "Cleanup MeterMessageSerializer"

3 years agoFix warnings in test-provider 99/94399/10
Robert Varga [Mon, 4 Jan 2021 10:39:59 +0000 (11:39 +0100)]
Fix warnings in test-provider

Fix deprecation warnings by converting to use uint types/BindingMap
and apply @Deprecated as appropriate. There will be more rounds to
deal with the rest of the warnings.

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