From fcdeadb009271e23dacce872742bdf773be6b81a Mon Sep 17 00:00:00 2001 From: Robert Varga Date: Tue, 23 Jan 2024 15:56:00 +0100 Subject: [PATCH] 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 Change-Id: I16f7bd0d37919e83a6adade4d1a1952d3dfbeee2 Signed-off-by: Robert Varga (cherry picked from commit b28efa094154e39c090312205f864dbd7cf4fe37) --- commons/binding-parent/pom.xml | 6 +++--- commons/it/pom.xml | 4 ++-- commons/pom.xml | 2 +- .../hwvtepsouthbound-artifacts/pom.xml | 2 +- .../hwvtepsouthbound-features/features/pom.xml | 2 +- .../odl-ovsdb-hwvtepsouthbound-api/pom.xml | 4 ++-- .../odl-ovsdb-hwvtepsouthbound-rest/pom.xml | 4 ++-- .../odl-ovsdb-hwvtepsouthbound-test/pom.xml | 2 +- .../odl-ovsdb-hwvtepsouthbound-ui/pom.xml | 4 ++-- .../odl-ovsdb-hwvtepsouthbound/pom.xml | 2 +- .../hwvtepsouthbound-features/pom.xml | 2 +- hwvtepsouthbound/hwvtepsouthbound-impl/pom.xml | 2 -- .../ovsdb/hwvtepsouthbound/HwvtepDeviceInfo.java | 15 ++++++--------- .../HwvtepSouthboundProvider.java | 4 ++++ hwvtepsouthbound/hwvtepsouthbound-karaf/pom.xml | 2 +- hwvtepsouthbound/pom.xml | 2 +- library/artifacts/pom.xml | 2 +- library/features/features/pom.xml | 2 +- library/features/odl-ovsdb-library/pom.xml | 4 ++-- library/features/pom.xml | 2 +- library/karaf/pom.xml | 2 +- library/pom.xml | 2 +- pom.xml | 2 +- schemas/pom.xml | 2 +- southbound/pom.xml | 2 +- southbound/southbound-artifacts/pom.xml | 2 +- southbound/southbound-features/features/pom.xml | 2 +- .../odl-ovsdb-southbound-api/pom.xml | 4 ++-- .../odl-ovsdb-southbound-impl-rest/pom.xml | 4 ++-- .../odl-ovsdb-southbound-impl-ui/pom.xml | 4 ++-- .../odl-ovsdb-southbound-impl/pom.xml | 4 ++-- .../odl-ovsdb-southbound-test/pom.xml | 2 +- southbound/southbound-features/pom.xml | 2 +- .../southbound/InstanceIdentifierCodec.java | 4 +--- .../southbound/OvsdbConnectionInstance.java | 4 ++-- .../md/OvsdbOperationalCommandAggregator.java | 2 -- southbound/southbound-karaf/pom.xml | 2 +- utils/odl-ovsdb-utils/pom.xml | 4 ++-- utils/ovsdb-it-utils/pom.xml | 2 -- .../ovsdb/utils/ovsdb/it/utils/NodeInfo.java | 16 +++++++++------- utils/pom.xml | 2 +- 41 files changed, 67 insertions(+), 72 deletions(-) diff --git a/commons/binding-parent/pom.xml b/commons/binding-parent/pom.xml index efd998f37..b0159e575 100644 --- a/commons/binding-parent/pom.xml +++ b/commons/binding-parent/pom.xml @@ -11,7 +11,7 @@ org.opendaylight.mdsal binding-parent - 12.0.3 + 12.0.4 @@ -25,14 +25,14 @@ org.opendaylight.aaa aaa-artifacts - 0.18.3 + 0.18.4 pom import org.opendaylight.infrautils infrautils-artifacts - 6.0.4 + 6.0.5 pom import diff --git a/commons/it/pom.xml b/commons/it/pom.xml index 252eafa15..4533fdad4 100644 --- a/commons/it/pom.xml +++ b/commons/it/pom.xml @@ -12,7 +12,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html org.opendaylight.controller mdsal-it-parent - 8.0.3 + 8.0.4 @@ -70,7 +70,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html org.opendaylight.mdsal mdsal-artifacts - 12.0.3 + 12.0.4 pom import diff --git a/commons/pom.xml b/commons/pom.xml index 5d715c082..f794ebae6 100644 --- a/commons/pom.xml +++ b/commons/pom.xml @@ -12,7 +12,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html org.opendaylight.odlparent odlparent-lite - 13.0.7 + 13.0.10 diff --git a/hwvtepsouthbound/hwvtepsouthbound-artifacts/pom.xml b/hwvtepsouthbound/hwvtepsouthbound-artifacts/pom.xml index cfb689e5f..95466a997 100644 --- a/hwvtepsouthbound/hwvtepsouthbound-artifacts/pom.xml +++ b/hwvtepsouthbound/hwvtepsouthbound-artifacts/pom.xml @@ -13,7 +13,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html org.opendaylight.odlparent odlparent-lite - 13.0.7 + 13.0.10 diff --git a/hwvtepsouthbound/hwvtepsouthbound-features/features/pom.xml b/hwvtepsouthbound/hwvtepsouthbound-features/features/pom.xml index afcf6cc1c..c24a06b2e 100644 --- a/hwvtepsouthbound/hwvtepsouthbound-features/features/pom.xml +++ b/hwvtepsouthbound/hwvtepsouthbound-features/features/pom.xml @@ -12,7 +12,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html org.opendaylight.odlparent feature-repo-parent - 13.0.7 + 13.0.10 diff --git a/hwvtepsouthbound/hwvtepsouthbound-features/odl-ovsdb-hwvtepsouthbound-api/pom.xml b/hwvtepsouthbound/hwvtepsouthbound-features/odl-ovsdb-hwvtepsouthbound-api/pom.xml index a2739ccbb..4efedcf8a 100644 --- a/hwvtepsouthbound/hwvtepsouthbound-features/odl-ovsdb-hwvtepsouthbound-api/pom.xml +++ b/hwvtepsouthbound/hwvtepsouthbound-features/odl-ovsdb-hwvtepsouthbound-api/pom.xml @@ -5,7 +5,7 @@ org.opendaylight.odlparent single-feature-parent - 13.0.7 + 13.0.10 @@ -22,7 +22,7 @@ org.opendaylight.mdsal mdsal-artifacts - 12.0.3 + 12.0.4 pom import diff --git a/hwvtepsouthbound/hwvtepsouthbound-features/odl-ovsdb-hwvtepsouthbound-rest/pom.xml b/hwvtepsouthbound/hwvtepsouthbound-features/odl-ovsdb-hwvtepsouthbound-rest/pom.xml index 47a5af5f3..35846f007 100644 --- a/hwvtepsouthbound/hwvtepsouthbound-features/odl-ovsdb-hwvtepsouthbound-rest/pom.xml +++ b/hwvtepsouthbound/hwvtepsouthbound-features/odl-ovsdb-hwvtepsouthbound-rest/pom.xml @@ -12,7 +12,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html org.opendaylight.odlparent single-feature-parent - 13.0.7 + 13.0.10 @@ -30,7 +30,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html org.opendaylight.netconf netconf-artifacts - 6.0.5 + 6.0.6 import pom diff --git a/hwvtepsouthbound/hwvtepsouthbound-features/odl-ovsdb-hwvtepsouthbound-test/pom.xml b/hwvtepsouthbound/hwvtepsouthbound-features/odl-ovsdb-hwvtepsouthbound-test/pom.xml index e5132ef3f..281bda895 100644 --- a/hwvtepsouthbound/hwvtepsouthbound-features/odl-ovsdb-hwvtepsouthbound-test/pom.xml +++ b/hwvtepsouthbound/hwvtepsouthbound-features/odl-ovsdb-hwvtepsouthbound-test/pom.xml @@ -12,7 +12,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html org.opendaylight.odlparent single-feature-parent - 13.0.7 + 13.0.10 diff --git a/hwvtepsouthbound/hwvtepsouthbound-features/odl-ovsdb-hwvtepsouthbound-ui/pom.xml b/hwvtepsouthbound/hwvtepsouthbound-features/odl-ovsdb-hwvtepsouthbound-ui/pom.xml index 2a72990c4..7181bdd37 100644 --- a/hwvtepsouthbound/hwvtepsouthbound-features/odl-ovsdb-hwvtepsouthbound-ui/pom.xml +++ b/hwvtepsouthbound/hwvtepsouthbound-features/odl-ovsdb-hwvtepsouthbound-ui/pom.xml @@ -12,7 +12,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html org.opendaylight.odlparent single-feature-parent - 13.0.7 + 13.0.10 @@ -30,7 +30,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html org.opendaylight.netconf netconf-artifacts - 6.0.5 + 6.0.6 import pom diff --git a/hwvtepsouthbound/hwvtepsouthbound-features/odl-ovsdb-hwvtepsouthbound/pom.xml b/hwvtepsouthbound/hwvtepsouthbound-features/odl-ovsdb-hwvtepsouthbound/pom.xml index 5eb52ba1b..3e12f57df 100644 --- a/hwvtepsouthbound/hwvtepsouthbound-features/odl-ovsdb-hwvtepsouthbound/pom.xml +++ b/hwvtepsouthbound/hwvtepsouthbound-features/odl-ovsdb-hwvtepsouthbound/pom.xml @@ -12,7 +12,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html org.opendaylight.odlparent single-feature-parent - 13.0.7 + 13.0.10 diff --git a/hwvtepsouthbound/hwvtepsouthbound-features/pom.xml b/hwvtepsouthbound/hwvtepsouthbound-features/pom.xml index 14d0d96c4..da4dc4c9b 100644 --- a/hwvtepsouthbound/hwvtepsouthbound-features/pom.xml +++ b/hwvtepsouthbound/hwvtepsouthbound-features/pom.xml @@ -11,7 +11,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html INTERNAL org.opendaylight.odlparent odlparent-lite - 13.0.7 + 13.0.10 org.opendaylight.ovsdb diff --git a/hwvtepsouthbound/hwvtepsouthbound-impl/pom.xml b/hwvtepsouthbound/hwvtepsouthbound-impl/pom.xml index 94beb8bf3..f395d294b 100644 --- a/hwvtepsouthbound/hwvtepsouthbound-impl/pom.xml +++ b/hwvtepsouthbound/hwvtepsouthbound-impl/pom.xml @@ -17,9 +17,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html 4.0.0 - org.opendaylight.ovsdb hwvtepsouthbound-impl - 1.18.0-SNAPSHOT bundle diff --git a/hwvtepsouthbound/hwvtepsouthbound-impl/src/main/java/org/opendaylight/ovsdb/hwvtepsouthbound/HwvtepDeviceInfo.java b/hwvtepsouthbound/hwvtepsouthbound-impl/src/main/java/org/opendaylight/ovsdb/hwvtepsouthbound/HwvtepDeviceInfo.java index 078318996..b555be074 100644 --- a/hwvtepsouthbound/hwvtepsouthbound-impl/src/main/java/org/opendaylight/ovsdb/hwvtepsouthbound/HwvtepDeviceInfo.java +++ b/hwvtepsouthbound/hwvtepsouthbound-impl/src/main/java/org/opendaylight/ovsdb/hwvtepsouthbound/HwvtepDeviceInfo.java @@ -131,7 +131,6 @@ public class HwvtepDeviceInfo { } } - private static AtomicInteger ZERO = new AtomicInteger(0); private final Map, Set> tepIdReferences = new ConcurrentHashMap<>(); private final Map, Map, RemoteUcastMacs>> logicalSwitchVsUcasts = new ConcurrentHashMap<>(); @@ -139,19 +138,17 @@ public class HwvtepDeviceInfo { logicalSwitchVsMcasts = new ConcurrentHashMap<>(); private final Map physicalSwitches = new ConcurrentHashMap<>(); private final Map mapTunnelToPhysicalSwitch = new ConcurrentHashMap<>(); - + private final Map, Map> opKeyVsData = + new ConcurrentHashMap<>(); + private final Map, Map> uuidVsData = new ConcurrentHashMap<>(); private final HwvtepConnectionInstance connectionInstance; + private final DependencyQueue dependencyQueue; private Map iidInQueueCount = new ConcurrentHashMap<>(); private Map, Map> configKeyVsData = new ConcurrentHashMap<>(); - private final Map, Map> opKeyVsData = - new ConcurrentHashMap<>(); - private final Map, Map> uuidVsData = new ConcurrentHashMap<>(); - private final DependencyQueue dependencyQueue; - private TransactionHistory controllerTxHistory; - private TransactionHistory deviceUpdateHistory; - + private TransactionHistory controllerTxHistory = null; + private TransactionHistory deviceUpdateHistory = null; public HwvtepDeviceInfo(HwvtepConnectionInstance hwvtepConnectionInstance) { this.connectionInstance = hwvtepConnectionInstance; diff --git a/hwvtepsouthbound/hwvtepsouthbound-impl/src/main/java/org/opendaylight/ovsdb/hwvtepsouthbound/HwvtepSouthboundProvider.java b/hwvtepsouthbound/hwvtepsouthbound-impl/src/main/java/org/opendaylight/ovsdb/hwvtepsouthbound/HwvtepSouthboundProvider.java index 64d60a9f9..50b133b22 100644 --- a/hwvtepsouthbound/hwvtepsouthbound-impl/src/main/java/org/opendaylight/ovsdb/hwvtepsouthbound/HwvtepSouthboundProvider.java +++ b/hwvtepsouthbound/hwvtepsouthbound-impl/src/main/java/org/opendaylight/ovsdb/hwvtepsouthbound/HwvtepSouthboundProvider.java @@ -148,6 +148,10 @@ public class HwvtepSouthboundProvider hwvtepDTListener.close(); hwvtepDTListener = null; } + if (hwvtepReconciliationManager != null) { + hwvtepReconciliationManager.close(); + hwvtepReconciliationManager = null; + } if (operTopologyRegistration != null) { operTopologyRegistration.close(); operTopologyRegistration = null; diff --git a/hwvtepsouthbound/hwvtepsouthbound-karaf/pom.xml b/hwvtepsouthbound/hwvtepsouthbound-karaf/pom.xml index ffc0e7fc8..29b172977 100644 --- a/hwvtepsouthbound/hwvtepsouthbound-karaf/pom.xml +++ b/hwvtepsouthbound/hwvtepsouthbound-karaf/pom.xml @@ -9,7 +9,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html INTERNAL org.opendaylight.odlparent karaf4-parent - 13.0.7 + 13.0.10 4.0.0 diff --git a/hwvtepsouthbound/pom.xml b/hwvtepsouthbound/pom.xml index e5d134770..0ec172c6b 100644 --- a/hwvtepsouthbound/pom.xml +++ b/hwvtepsouthbound/pom.xml @@ -11,7 +11,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html INTERNAL org.opendaylight.odlparent odlparent-lite - 13.0.7 + 13.0.10 diff --git a/library/artifacts/pom.xml b/library/artifacts/pom.xml index 1edb89ceb..eab637483 100644 --- a/library/artifacts/pom.xml +++ b/library/artifacts/pom.xml @@ -13,7 +13,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html org.opendaylight.odlparent odlparent-lite - 13.0.7 + 13.0.10 diff --git a/library/features/features/pom.xml b/library/features/features/pom.xml index 5d184a1ba..889a1b0b0 100644 --- a/library/features/features/pom.xml +++ b/library/features/features/pom.xml @@ -12,7 +12,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html org.opendaylight.odlparent feature-repo-parent - 13.0.7 + 13.0.10 diff --git a/library/features/odl-ovsdb-library/pom.xml b/library/features/odl-ovsdb-library/pom.xml index 1d88495a3..f0c9f6d20 100644 --- a/library/features/odl-ovsdb-library/pom.xml +++ b/library/features/odl-ovsdb-library/pom.xml @@ -12,7 +12,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html org.opendaylight.odlparent single-feature-parent - 13.0.7 + 13.0.10 @@ -41,7 +41,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html org.opendaylight.aaa odl-aaa-cert - 0.18.3 + 0.18.4 xml features diff --git a/library/features/pom.xml b/library/features/pom.xml index da9d96ce9..40c99d48f 100644 --- a/library/features/pom.xml +++ b/library/features/pom.xml @@ -11,7 +11,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html INTERNAL org.opendaylight.odlparent odlparent-lite - 13.0.7 + 13.0.10 org.opendaylight.ovsdb diff --git a/library/karaf/pom.xml b/library/karaf/pom.xml index 2cc2e2c4a..aea655ba7 100644 --- a/library/karaf/pom.xml +++ b/library/karaf/pom.xml @@ -9,7 +9,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html INTERNAL org.opendaylight.odlparent karaf4-parent - 13.0.7 + 13.0.10 4.0.0 diff --git a/library/pom.xml b/library/pom.xml index cda1f803d..5275e09b3 100644 --- a/library/pom.xml +++ b/library/pom.xml @@ -11,7 +11,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html org.opendaylight.odlparent odlparent-lite - 13.0.7 + 13.0.10 diff --git a/pom.xml b/pom.xml index 2bd26ebe1..3f2f8e7c2 100644 --- a/pom.xml +++ b/pom.xml @@ -12,7 +12,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html org.opendaylight.odlparent odlparent-lite - 13.0.7 + 13.0.10 diff --git a/schemas/pom.xml b/schemas/pom.xml index dc594c198..3e48b1889 100644 --- a/schemas/pom.xml +++ b/schemas/pom.xml @@ -12,7 +12,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html org.opendaylight.odlparent odlparent-lite - 13.0.7 + 13.0.10 diff --git a/southbound/pom.xml b/southbound/pom.xml index 18e3dea3c..81e7dcd95 100644 --- a/southbound/pom.xml +++ b/southbound/pom.xml @@ -10,7 +10,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html INTERNAL org.opendaylight.odlparent odlparent-lite - 13.0.7 + 13.0.10 diff --git a/southbound/southbound-artifacts/pom.xml b/southbound/southbound-artifacts/pom.xml index bb943aab7..fde2eed34 100644 --- a/southbound/southbound-artifacts/pom.xml +++ b/southbound/southbound-artifacts/pom.xml @@ -13,7 +13,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html org.opendaylight.odlparent odlparent-lite - 13.0.7 + 13.0.10 diff --git a/southbound/southbound-features/features/pom.xml b/southbound/southbound-features/features/pom.xml index 3969e0d62..b185d9e82 100644 --- a/southbound/southbound-features/features/pom.xml +++ b/southbound/southbound-features/features/pom.xml @@ -12,7 +12,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html org.opendaylight.odlparent feature-repo-parent - 13.0.7 + 13.0.10 diff --git a/southbound/southbound-features/odl-ovsdb-southbound-api/pom.xml b/southbound/southbound-features/odl-ovsdb-southbound-api/pom.xml index 36eba43aa..d09d15831 100644 --- a/southbound/southbound-features/odl-ovsdb-southbound-api/pom.xml +++ b/southbound/southbound-features/odl-ovsdb-southbound-api/pom.xml @@ -12,7 +12,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html org.opendaylight.odlparent single-feature-parent - 13.0.7 + 13.0.10 @@ -29,7 +29,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html org.opendaylight.mdsal mdsal-artifacts - 12.0.3 + 12.0.4 pom import diff --git a/southbound/southbound-features/odl-ovsdb-southbound-impl-rest/pom.xml b/southbound/southbound-features/odl-ovsdb-southbound-impl-rest/pom.xml index ad72d15bf..d9b7445cd 100644 --- a/southbound/southbound-features/odl-ovsdb-southbound-impl-rest/pom.xml +++ b/southbound/southbound-features/odl-ovsdb-southbound-impl-rest/pom.xml @@ -12,7 +12,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html org.opendaylight.odlparent single-feature-parent - 13.0.7 + 13.0.10 @@ -30,7 +30,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html org.opendaylight.netconf netconf-artifacts - 6.0.5 + 6.0.6 import pom diff --git a/southbound/southbound-features/odl-ovsdb-southbound-impl-ui/pom.xml b/southbound/southbound-features/odl-ovsdb-southbound-impl-ui/pom.xml index 4347bb054..9e5785b73 100644 --- a/southbound/southbound-features/odl-ovsdb-southbound-impl-ui/pom.xml +++ b/southbound/southbound-features/odl-ovsdb-southbound-impl-ui/pom.xml @@ -12,7 +12,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html org.opendaylight.odlparent single-feature-parent - 13.0.7 + 13.0.10 @@ -30,7 +30,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html org.opendaylight.netconf netconf-artifacts - 6.0.5 + 6.0.6 import pom diff --git a/southbound/southbound-features/odl-ovsdb-southbound-impl/pom.xml b/southbound/southbound-features/odl-ovsdb-southbound-impl/pom.xml index 4b58fc353..f2b113e67 100644 --- a/southbound/southbound-features/odl-ovsdb-southbound-impl/pom.xml +++ b/southbound/southbound-features/odl-ovsdb-southbound-impl/pom.xml @@ -12,7 +12,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html org.opendaylight.odlparent single-feature-parent - 13.0.7 + 13.0.10 @@ -30,7 +30,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html org.opendaylight.infrautils infrautils-artifacts - 6.0.4 + 6.0.5 pom import diff --git a/southbound/southbound-features/odl-ovsdb-southbound-test/pom.xml b/southbound/southbound-features/odl-ovsdb-southbound-test/pom.xml index c41e9f9fa..e19b8e57e 100644 --- a/southbound/southbound-features/odl-ovsdb-southbound-test/pom.xml +++ b/southbound/southbound-features/odl-ovsdb-southbound-test/pom.xml @@ -12,7 +12,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html org.opendaylight.odlparent single-feature-parent - 13.0.7 + 13.0.10 diff --git a/southbound/southbound-features/pom.xml b/southbound/southbound-features/pom.xml index c1dadcd7e..d2e06abc3 100644 --- a/southbound/southbound-features/pom.xml +++ b/southbound/southbound-features/pom.xml @@ -12,7 +12,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html org.opendaylight.odlparent odlparent-lite - 13.0.7 + 13.0.10 diff --git a/southbound/southbound-impl/src/main/java/org/opendaylight/ovsdb/southbound/InstanceIdentifierCodec.java b/southbound/southbound-impl/src/main/java/org/opendaylight/ovsdb/southbound/InstanceIdentifierCodec.java index 24c808bc9..b6c395686 100644 --- a/southbound/southbound-impl/src/main/java/org/opendaylight/ovsdb/southbound/InstanceIdentifierCodec.java +++ b/southbound/southbound-impl/src/main/java/org/opendaylight/ovsdb/southbound/InstanceIdentifierCodec.java @@ -19,19 +19,17 @@ import org.opendaylight.yangtools.yang.data.util.DataSchemaContextTree; import org.opendaylight.yangtools.yang.model.api.EffectiveModelContext; import org.opendaylight.yangtools.yang.model.api.EffectiveModelContextListener; import org.opendaylight.yangtools.yang.model.api.Module; -import org.opendaylight.yangtools.yang.model.api.SchemaContext; import org.slf4j.Logger; import org.slf4j.LoggerFactory; public class InstanceIdentifierCodec extends AbstractModuleStringInstanceIdentifierCodec implements EffectiveModelContextListener { - private static final Logger LOG = LoggerFactory.getLogger(InstanceIdentifierCodec.class); private final BindingNormalizedNodeSerializer bindingNormalizedNodeSerializer; private DataSchemaContextTree dataSchemaContextTree; - private SchemaContext context; + private EffectiveModelContext context = null; @SuppressFBWarnings(value = "MC_OVERRIDABLE_METHOD_CALL_IN_CONSTRUCTOR", justification = "Non-final for mocking") public InstanceIdentifierCodec(final DOMSchemaService schemaService, diff --git a/southbound/southbound-impl/src/main/java/org/opendaylight/ovsdb/southbound/OvsdbConnectionInstance.java b/southbound/southbound-impl/src/main/java/org/opendaylight/ovsdb/southbound/OvsdbConnectionInstance.java index 64604adc1..fa4cceafb 100644 --- a/southbound/southbound-impl/src/main/java/org/opendaylight/ovsdb/southbound/OvsdbConnectionInstance.java +++ b/southbound/southbound-impl/src/main/java/org/opendaylight/ovsdb/southbound/OvsdbConnectionInstance.java @@ -84,8 +84,8 @@ public class OvsdbConnectionInstance { private final OvsdbClient client; private ConnectionInfo connectionInfo; private final TransactionInvoker txInvoker; - private Map transactInvokers; - private MonitorCallBack callback; + private Map transactInvokers = null; + private MonitorCallBack callback = null; private InstanceIdentifier instanceIdentifier; private volatile boolean hasDeviceOwnership = false; private Entity connectedEntity; diff --git a/southbound/southbound-impl/src/main/java/org/opendaylight/ovsdb/southbound/transactions/md/OvsdbOperationalCommandAggregator.java b/southbound/southbound-impl/src/main/java/org/opendaylight/ovsdb/southbound/transactions/md/OvsdbOperationalCommandAggregator.java index 96f4d8055..f564975fb 100644 --- a/southbound/southbound-impl/src/main/java/org/opendaylight/ovsdb/southbound/transactions/md/OvsdbOperationalCommandAggregator.java +++ b/southbound/southbound-impl/src/main/java/org/opendaylight/ovsdb/southbound/transactions/md/OvsdbOperationalCommandAggregator.java @@ -31,11 +31,9 @@ public class OvsdbOperationalCommandAggregator implements TransactionCommand { private static final Logger LOG = LoggerFactory.getLogger(OvsdbOperationalCommandAggregator.class); private final List commands = new ArrayList<>(); private final Map updatedBridgeNodes = new HashMap<>(); - private boolean initialUpdate; public OvsdbOperationalCommandAggregator(InstanceIdentifierCodec instanceIdentifierCodec, OvsdbConnectionInstance key, TableUpdates updates, DatabaseSchema dbSchema, boolean initialUpdate) { - this.initialUpdate = initialUpdate; commands.add(new OpenVSwitchUpdateCommand(instanceIdentifierCodec, key, updates, dbSchema)); commands.add(new OvsdbManagersUpdateCommand(key, updates, dbSchema)); commands.add(new OvsdbManagersRemovedCommand(key, updates, dbSchema)); diff --git a/southbound/southbound-karaf/pom.xml b/southbound/southbound-karaf/pom.xml index 52a7734e7..53286ba25 100644 --- a/southbound/southbound-karaf/pom.xml +++ b/southbound/southbound-karaf/pom.xml @@ -9,7 +9,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html INTERNAL org.opendaylight.odlparent karaf4-parent - 13.0.7 + 13.0.10 4.0.0 diff --git a/utils/odl-ovsdb-utils/pom.xml b/utils/odl-ovsdb-utils/pom.xml index 9e870cec4..09a9c3a3c 100644 --- a/utils/odl-ovsdb-utils/pom.xml +++ b/utils/odl-ovsdb-utils/pom.xml @@ -12,7 +12,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html org.opendaylight.odlparent single-feature-parent - 13.0.7 + 13.0.10 @@ -29,7 +29,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html org.opendaylight.controller controller-artifacts - 8.0.3 + 8.0.4 pom import diff --git a/utils/ovsdb-it-utils/pom.xml b/utils/ovsdb-it-utils/pom.xml index 93233024a..f84b05e06 100644 --- a/utils/ovsdb-it-utils/pom.xml +++ b/utils/ovsdb-it-utils/pom.xml @@ -16,9 +16,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html 4.0.0 - org.opendaylight.ovsdb utils.ovsdb-it-utils - 1.18.0-SNAPSHOT bundle diff --git a/utils/ovsdb-it-utils/src/main/java/org/opendaylight/ovsdb/utils/ovsdb/it/utils/NodeInfo.java b/utils/ovsdb-it-utils/src/main/java/org/opendaylight/ovsdb/utils/ovsdb/it/utils/NodeInfo.java index 37a7b038c..49aa9b384 100644 --- a/utils/ovsdb-it-utils/src/main/java/org/opendaylight/ovsdb/utils/ovsdb/it/utils/NodeInfo.java +++ b/utils/ovsdb-it-utils/src/main/java/org/opendaylight/ovsdb/utils/ovsdb/it/utils/NodeInfo.java @@ -34,22 +34,24 @@ public class NodeInfo { private final ConnectionInfo connectionInfo; private final InstanceIdentifier ovsdbIid; private final InstanceIdentifier bridgeIid; - public long datapathId; - public Node ovsdbNode; - public Node bridgeNode; - private NotifyingDataChangeListener ovsdbWaiter; - private NotifyingDataChangeListener bridgeWaiter; private final List waitList; private final OvsdbItUtils itUtils; + private long datapathId; + private Node ovsdbNode; + private Node bridgeNode; + private NotifyingDataChangeListener ovsdbWaiter; + private NotifyingDataChangeListener bridgeWaiter; + + /** * Create a new NodeInfo object. * @param connectionInfo of the OVSDB node * @param itUtils OvsdbItUtils instance * @param waitList for tracking outstanding md-sal events */ - NodeInfo(ConnectionInfo connectionInfo, OvsdbItUtils itUtils, - List waitList) { + NodeInfo(final ConnectionInfo connectionInfo, final OvsdbItUtils itUtils, + final List waitList) { this.connectionInfo = connectionInfo; this.itUtils = itUtils; this.waitList = waitList; diff --git a/utils/pom.xml b/utils/pom.xml index e78d35687..9615d99df 100644 --- a/utils/pom.xml +++ b/utils/pom.xml @@ -12,7 +12,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html org.opendaylight.odlparent odlparent-lite - 13.0.7 + 13.0.10 -- 2.36.6