From 1cd50815d1f776e3c478f50a821c5b6d1c9c2dfd Mon Sep 17 00:00:00 2001 From: Robert Varga Date: Thu, 1 Oct 2026 12:40:39 +0200 Subject: [PATCH 1/5] Ditch use of checker-qual We are only using @GuardedBy: pick the ErrorProne equivalent instead. Change-Id: I8a94f9095f32c46f796c789e6a3979894cab7fbb Signed-off-by: Robert Varga --- hwvtepsouthbound/hwvtepsouthbound-impl/pom.xml | 10 ++++------ .../transactions/md/TransactionInvokerImpl.java | 2 +- southbound/southbound-impl/pom.xml | 10 ++++------ .../transactions/md/TransactionInvokerImpl.java | 5 ++--- 4 files changed, 11 insertions(+), 16 deletions(-) diff --git a/hwvtepsouthbound/hwvtepsouthbound-impl/pom.xml b/hwvtepsouthbound/hwvtepsouthbound-impl/pom.xml index 1f418b170..88de06a51 100644 --- a/hwvtepsouthbound/hwvtepsouthbound-impl/pom.xml +++ b/hwvtepsouthbound/hwvtepsouthbound-impl/pom.xml @@ -29,6 +29,10 @@ and is available at http://www.eclipse.org/legal/epl-v10.html spotbugs-annotations true + + com.google.errorprone + error_prone_annotations + com.guicedee.services javax.inject @@ -44,12 +48,6 @@ and is available at http://www.eclipse.org/legal/epl-v10.html org.apache.karaf.shell.core provided - - org.checkerframework - checker-qual - provided - true - org.opendaylight.mdsal mdsal-dom-api diff --git a/hwvtepsouthbound/hwvtepsouthbound-impl/src/main/java/org/opendaylight/ovsdb/hwvtepsouthbound/transactions/md/TransactionInvokerImpl.java b/hwvtepsouthbound/hwvtepsouthbound-impl/src/main/java/org/opendaylight/ovsdb/hwvtepsouthbound/transactions/md/TransactionInvokerImpl.java index 21d0df5de..0d9809047 100644 --- a/hwvtepsouthbound/hwvtepsouthbound-impl/src/main/java/org/opendaylight/ovsdb/hwvtepsouthbound/transactions/md/TransactionInvokerImpl.java +++ b/hwvtepsouthbound/hwvtepsouthbound-impl/src/main/java/org/opendaylight/ovsdb/hwvtepsouthbound/transactions/md/TransactionInvokerImpl.java @@ -11,6 +11,7 @@ import com.google.common.util.concurrent.FluentFuture; import com.google.common.util.concurrent.FutureCallback; import com.google.common.util.concurrent.MoreExecutors; import com.google.common.util.concurrent.ThreadFactoryBuilder; +import com.google.errorprone.annotations.concurrent.GuardedBy; import java.lang.Thread.UncaughtExceptionHandler; import java.util.ArrayList; import java.util.HashMap; @@ -25,7 +26,6 @@ import java.util.concurrent.ThreadFactory; import javax.annotation.PreDestroy; import javax.inject.Inject; import javax.inject.Singleton; -import org.checkerframework.checker.lock.qual.GuardedBy; import org.opendaylight.mdsal.binding.api.DataBroker; import org.opendaylight.mdsal.binding.api.ReadWriteTransaction; import org.opendaylight.mdsal.binding.api.Transaction; diff --git a/southbound/southbound-impl/pom.xml b/southbound/southbound-impl/pom.xml index 73ffed41d..f4429dcd2 100644 --- a/southbound/southbound-impl/pom.xml +++ b/southbound/southbound-impl/pom.xml @@ -29,6 +29,10 @@ and is available at http://www.eclipse.org/legal/epl-v10.html + + com.google.errorprone + error_prone_annotations + com.google.guava guava @@ -48,12 +52,6 @@ and is available at http://www.eclipse.org/legal/epl-v10.html jakarta.annotation-api true - - org.checkerframework - checker-qual - provided - true - org.opendaylight.infrautils diagstatus-api diff --git a/southbound/southbound-impl/src/main/java/org/opendaylight/ovsdb/southbound/transactions/md/TransactionInvokerImpl.java b/southbound/southbound-impl/src/main/java/org/opendaylight/ovsdb/southbound/transactions/md/TransactionInvokerImpl.java index 10d9d0f3e..6ce447d0d 100644 --- a/southbound/southbound-impl/src/main/java/org/opendaylight/ovsdb/southbound/transactions/md/TransactionInvokerImpl.java +++ b/southbound/southbound-impl/src/main/java/org/opendaylight/ovsdb/southbound/transactions/md/TransactionInvokerImpl.java @@ -12,6 +12,7 @@ import com.google.common.util.concurrent.FutureCallback; import com.google.common.util.concurrent.Futures; import com.google.common.util.concurrent.MoreExecutors; import com.google.common.util.concurrent.ThreadFactoryBuilder; +import com.google.errorprone.annotations.concurrent.GuardedBy; import java.util.AbstractMap.SimpleImmutableEntry; import java.util.ArrayDeque; import java.util.ArrayList; @@ -19,7 +20,6 @@ import java.util.Collections; import java.util.Iterator; import java.util.List; import java.util.Map.Entry; -import java.util.Queue; import java.util.concurrent.BlockingQueue; import java.util.concurrent.ExecutorService; import java.util.concurrent.Executors; @@ -27,7 +27,6 @@ import java.util.concurrent.LinkedBlockingQueue; import java.util.concurrent.ThreadFactory; import java.util.concurrent.TimeUnit; import java.util.concurrent.atomic.AtomicBoolean; -import org.checkerframework.checker.lock.qual.GuardedBy; import org.opendaylight.mdsal.binding.api.DataBroker; import org.opendaylight.mdsal.binding.api.ReadWriteTransaction; import org.opendaylight.mdsal.binding.api.Transaction; @@ -47,7 +46,7 @@ public final class TransactionInvokerImpl implements TransactionInvoker, Runnabl private final AtomicBoolean runTask = new AtomicBoolean(true); @GuardedBy("this") - private final Queue> pendingTransactions = new ArrayDeque<>(); + private final ArrayDeque> pendingTransactions = new ArrayDeque<>(); @GuardedBy("this") private TransactionChain chain; -- 2.34.1 From 4482e95dc88e56c42e38d0b1c66f35c9aa5c2792 Mon Sep 17 00:00:00 2001 From: Robert Varga Date: Thu, 1 Oct 2026 12:42:24 +0200 Subject: [PATCH 2/5] Fix parameter block separation Upgraded checkstyle is catching a number of violations: fix them up. Change-Id: I77bceaba58b3f86c01877303b8c44d6740aebb11 Signed-off-by: Robert Varga --- .../reconciliation/ReconciliationTask.java | 2 ++ .../ovsdb/lib/LockAquisitionCallback.java | 10 +++---- .../ovsdb/lib/LockStolenCallback.java | 10 +++---- .../opendaylight/ovsdb/lib/OvsdbClient.java | 21 ++++++++++----- .../ovsdb/lib/OvsdbConnection.java | 5 +++- .../ovsdb/lib/OvsdbConnectionListener.java | 3 ++- .../ovsdb/lib/impl/OvsdbClientImpl.java | 1 + .../impl/StalePassiveConnectionService.java | 1 + .../ovsdb/lib/notation/Version.java | 2 ++ .../ovsdb/lib/schema/ColumnSchema.java | 1 + .../ovsdb/lib/schema/ColumnType.java | 26 +++++++++---------- .../reconciliation/ReconciliationTask.java | 2 ++ .../md/OvsdbManagersUpdateCommand.java | 1 - .../ovsdb/utils/ovsdb/it/utils/DockerOvs.java | 13 ++++++++++ .../ovsdb/utils/ovsdb/it/utils/NodeInfo.java | 4 ++- .../utils/ovsdb/it/utils/OvsdbItUtils.java | 3 +++ .../ovsdb/utils/ovsdb/it/utils/ProcUtils.java | 7 ++++- .../southbound/utils/SouthboundUtils.java | 2 ++ 18 files changed, 78 insertions(+), 36 deletions(-) diff --git a/hwvtepsouthbound/hwvtepsouthbound-impl/src/main/java/org/opendaylight/ovsdb/hwvtepsouthbound/reconciliation/ReconciliationTask.java b/hwvtepsouthbound/hwvtepsouthbound-impl/src/main/java/org/opendaylight/ovsdb/hwvtepsouthbound/reconciliation/ReconciliationTask.java index b5530e7d9..9fc3757dc 100644 --- a/hwvtepsouthbound/hwvtepsouthbound-impl/src/main/java/org/opendaylight/ovsdb/hwvtepsouthbound/reconciliation/ReconciliationTask.java +++ b/hwvtepsouthbound/hwvtepsouthbound-impl/src/main/java/org/opendaylight/ovsdb/hwvtepsouthbound/reconciliation/ReconciliationTask.java @@ -41,6 +41,7 @@ public abstract class ReconciliationTask implements Runnable { * Method contains task reconciliation logic. Please refer to * {@link ConnectionReconciliationTask#reconcileConfiguration(HwvtepConnectionManager)} * for example. + * * @param connectionManager Connection manager to get connection instance of the device * @return True if reconciliation was successful, else false */ @@ -79,6 +80,7 @@ public abstract class ReconciliationTask implements Runnable { /** * Method returns the time interval for retrying the failed task. * {@link ReconciliationTask#doRetry(boolean)} + * * @return time */ public abstract long retryDelayInMills(); diff --git a/library/impl/src/main/java/org/opendaylight/ovsdb/lib/LockAquisitionCallback.java b/library/impl/src/main/java/org/opendaylight/ovsdb/lib/LockAquisitionCallback.java index 104bb99d3..1f2511974 100644 --- a/library/impl/src/main/java/org/opendaylight/ovsdb/lib/LockAquisitionCallback.java +++ b/library/impl/src/main/java/org/opendaylight/ovsdb/lib/LockAquisitionCallback.java @@ -5,17 +5,15 @@ * terms of the Eclipse Public License v1.0 which accompanies this distribution, * and is available at http://www.eclipse.org/legal/epl-v10.html */ - package org.opendaylight.ovsdb.lib; /** - * Callback that can be registered with {@link OvsdbClient} to - * get notified of a lock stolen. - * @see ovsdb spec - * @see OvsdbClient + * Callback that can be registered with {@link OvsdbClient} to get notified of a lock stolen. + * + * @see ovsdb spec + * @see OvsdbClient */ public interface LockAquisitionCallback { void lockAcquired(); - } diff --git a/library/impl/src/main/java/org/opendaylight/ovsdb/lib/LockStolenCallback.java b/library/impl/src/main/java/org/opendaylight/ovsdb/lib/LockStolenCallback.java index d2bcd2bc4..70d0bf1cc 100644 --- a/library/impl/src/main/java/org/opendaylight/ovsdb/lib/LockStolenCallback.java +++ b/library/impl/src/main/java/org/opendaylight/ovsdb/lib/LockStolenCallback.java @@ -5,18 +5,16 @@ * terms of the Eclipse Public License v1.0 which accompanies this distribution, * and is available at http://www.eclipse.org/legal/epl-v10.html */ - package org.opendaylight.ovsdb.lib; /** - * Callback that can be registered with {@link org.opendaylight.ovsdb.lib.OvsdbClient} to - * get notified of a lock stolen. - * @see ovsdb spec + * Callback that can be registered with {@link org.opendaylight.ovsdb.lib.OvsdbClient} to + * get notified of a lock stolen. * - * @see org.opendaylight.ovsdb.lib.OvsdbClient#lock(String, LockAquisitionCallback, LockStolenCallback) + * @see ovsdb spec + * @see org.opendaylight.ovsdb.lib.OvsdbClient#lock(String, LockAquisitionCallback, LockStolenCallback) */ public interface LockStolenCallback { void lockStolen(); - } diff --git a/library/impl/src/main/java/org/opendaylight/ovsdb/lib/OvsdbClient.java b/library/impl/src/main/java/org/opendaylight/ovsdb/lib/OvsdbClient.java index 9e9545ed4..7f184cdff 100644 --- a/library/impl/src/main/java/org/opendaylight/ovsdb/lib/OvsdbClient.java +++ b/library/impl/src/main/java/org/opendaylight/ovsdb/lib/OvsdbClient.java @@ -26,15 +26,16 @@ import org.opendaylight.ovsdb.lib.schema.typed.TypedDatabaseSchema; * operations return a Future object representing the eventual response data from the remote. */ public interface OvsdbClient { - /** * Gets the list of database names exposed by this ovsdb capable device. + * * @return list of database names */ ListenableFuture> getDatabases(); /** * Asynchronously returns the schema object for a specific database. + * * @param database name of the database schema * @return DatabaseSchema future */ @@ -42,12 +43,14 @@ public interface OvsdbClient { /** * Allows for a mini DSL way of collecting the transactions to be executed against the ovsdb instance. + * * @return TransactionBuilder */ TransactionBuilder transactBuilder(DatabaseSchema dbSchema); /** - * Execute the list of operations in a single Transactions. Similar to the transactBuilder() method + * Execute the list of operations in a single Transactions. Similar to the transactBuilder() method. + * * @param operations List of operations that needs to be part of a transact call * @return Future object representing the result of the transaction. Calling * cancel on the Future would cause OVSDB cancel operation to be fired against @@ -57,6 +60,7 @@ public interface OvsdbClient { /** * ovsdb monitor operation. + * * @param monitorRequests represents what needs to be monitored including a client specified monitor handle. This * handle is used to later cancel ({@link #cancelMonitor(MonitorHandle)}) the monitor. * @param callback receives the monitor response @@ -67,6 +71,7 @@ public interface OvsdbClient { /** * ovsdb monitor operation. + * * @param monitorRequests represents what needs to be monitored including a client specified monitor handle. This * handle is used to later cancel ({@link #cancelMonitor(MonitorHandle)}) the monitor. * @param callback receives the monitor response @@ -79,6 +84,7 @@ public interface OvsdbClient { /** * ovsdb monitor operation. + * * @param monitorRequests represents what needs to be monitored * @param monitorHandle A client specified monitor handle. This handle is used to later cancel * ({@link #cancelMonitor(MonitorHandle)}) the monitor. @@ -91,6 +97,7 @@ public interface OvsdbClient { /** * ovsdb monitor operation. + * * @param monitorRequests represents what needs to be monitored * @param monitorHandle A client specified monitor handle. This handle is used to later cancel * ({@link #cancelMonitor(MonitorHandle)}) the monitor. @@ -105,6 +112,7 @@ public interface OvsdbClient { /** * Cancels an existing monitor method. + * * @param handler Handle identifying a specific monitor request that is being cancelled. * @throws java.lang.IllegalStateException if there is no outstanding monitor request for this handle */ @@ -112,6 +120,7 @@ public interface OvsdbClient { /** * Cancels an existing monitor method. + * * @param handler Handle identifying a specific monitor request that is being cancelled. * @param timeout time in seconds for monitor transaction timeout * @throws java.lang.IllegalStateException if there is no outstanding monitor request for this handle @@ -120,6 +129,7 @@ public interface OvsdbClient { /** * ovsdb lock operation. + * * @param lockId a client specified id for the lock; this can be used for unlocking ({@link #unLock(String)}) * @param lockedCallBack Callback to nofify when the lock is acquired * @param stolenCallback Callback to notify when an acquired lock is stolen by another client @@ -127,14 +137,12 @@ public interface OvsdbClient { void lock(String lockId, LockAquisitionCallback lockedCallBack, LockStolenCallback stolenCallback); /** - * ovsdb steal operation. - * See {@link #lock(String, LockAquisitionCallback, LockStolenCallback)} + * ovsdb steal operation. See {@link #lock(String, LockAquisitionCallback, LockStolenCallback)}. */ ListenableFuture steal(String lockId); /** - * ovsdb unlock operation. - * See {@link #unLock(String)} + * ovsdb unlock operation. See {@link #unLock(String)}. */ ListenableFuture unLock(String lockId); @@ -146,6 +154,7 @@ public interface OvsdbClient { /** * Starts the echo service. The {@code callbackFilters} can be used to get notified on the absence of echo * notifications from the remote device and control the frequency of such notifications. + * * @param callbackFilters callbacks for notifying the client of missing echo calls from remote. */ void startEchoService(EchoServiceCallbackFilters callbackFilters); diff --git a/library/impl/src/main/java/org/opendaylight/ovsdb/lib/OvsdbConnection.java b/library/impl/src/main/java/org/opendaylight/ovsdb/lib/OvsdbConnection.java index b323a0140..a249d6041 100644 --- a/library/impl/src/main/java/org/opendaylight/ovsdb/lib/OvsdbConnection.java +++ b/library/impl/src/main/java/org/opendaylight/ovsdb/lib/OvsdbConnection.java @@ -25,10 +25,10 @@ import org.opendaylight.aaa.cert.api.ICertificateManager; * listener API. */ public interface OvsdbConnection { - /** * connect API can be used by the applications to initiate Active connection from * the controller towards ovsdb-server. + * * @param address IP Address of the remote server that hosts the ovsdb server. * @param port Layer 4 port on which the remote ovsdb server is listening on. * @return OvsDBClient The primary Client interface for the ovsdb connection. @@ -38,6 +38,7 @@ public interface OvsdbConnection { /** * connect API can be used by the applications to initiate Active ssl * connection from the controller towards ovsdb-server. + * * @param address IP Address of the remote server that hosts the ovsdb server. * @param port Layer 4 port on which the remote ovsdb server is listening on. * @param certificateManagerSrv Certificate manager for SSL/TLS @@ -47,6 +48,7 @@ public interface OvsdbConnection { /** * Method to disconnect an existing connection. + * * @param client that represents the ovsdb connection. */ void disconnect(OvsdbClient client); @@ -76,6 +78,7 @@ public interface OvsdbConnection { /** * Method to register a Passive Connection Listener with the ConnectionService. + * * @param listener Passive Connection listener interested in Passive OVSDB connection requests. */ void registerConnectionListener(OvsdbConnectionListener listener); diff --git a/library/impl/src/main/java/org/opendaylight/ovsdb/lib/OvsdbConnectionListener.java b/library/impl/src/main/java/org/opendaylight/ovsdb/lib/OvsdbConnectionListener.java index 63aa7c1bb..efbbed355 100644 --- a/library/impl/src/main/java/org/opendaylight/ovsdb/lib/OvsdbConnectionListener.java +++ b/library/impl/src/main/java/org/opendaylight/ovsdb/lib/OvsdbConnectionListener.java @@ -5,7 +5,6 @@ * terms of the Eclipse Public License v1.0 which accompanies this distribution, * and is available at http://www.eclipse.org/legal/epl-v10.html */ - package org.opendaylight.ovsdb.lib; import org.eclipse.jdt.annotation.NonNull; @@ -16,12 +15,14 @@ import org.eclipse.jdt.annotation.NonNull; public interface OvsdbConnectionListener { /** * Event thrown to the connection listener when a new Passive connection is established. + * * @param client OvsdbClient that represents the connection. */ void connected(@NonNull OvsdbClient client); /** * Event thrown to the connection listener when an existing connection is terminated. + * * @param client OvsdbClient that represents the connection. */ void disconnected(OvsdbClient client); diff --git a/library/impl/src/main/java/org/opendaylight/ovsdb/lib/impl/OvsdbClientImpl.java b/library/impl/src/main/java/org/opendaylight/ovsdb/lib/impl/OvsdbClientImpl.java index d7d8b4ce9..ede6d4a2d 100644 --- a/library/impl/src/main/java/org/opendaylight/ovsdb/lib/impl/OvsdbClientImpl.java +++ b/library/impl/src/main/java/org/opendaylight/ovsdb/lib/impl/OvsdbClientImpl.java @@ -89,6 +89,7 @@ public class OvsdbClientImpl implements OvsdbClient { /** * Generate the threadFactory based on ACTIVE, PASSIVE (SSL/NON-SSL) connection type. + * * @param type ACTIVE or PASSIVE {@link ConnectionType} * @param socketConnType SSL or NON-SSL {@link SocketConnectionType} * @param executorNameArgs Additional args to append to thread name format diff --git a/library/impl/src/main/java/org/opendaylight/ovsdb/lib/impl/StalePassiveConnectionService.java b/library/impl/src/main/java/org/opendaylight/ovsdb/lib/impl/StalePassiveConnectionService.java index 004f54634..08379e87b 100644 --- a/library/impl/src/main/java/org/opendaylight/ovsdb/lib/impl/StalePassiveConnectionService.java +++ b/library/impl/src/main/java/org/opendaylight/ovsdb/lib/impl/StalePassiveConnectionService.java @@ -90,6 +90,7 @@ public class StalePassiveConnectionService implements AutoCloseable { /** * Notify the service that the given client has disconnected. + * * @param disconnectedClient the client just disconnected */ public synchronized void clientDisconnected(OvsdbClient disconnectedClient) { diff --git a/library/impl/src/main/java/org/opendaylight/ovsdb/lib/notation/Version.java b/library/impl/src/main/java/org/opendaylight/ovsdb/lib/notation/Version.java index d81ec692d..563c4a44d 100644 --- a/library/impl/src/main/java/org/opendaylight/ovsdb/lib/notation/Version.java +++ b/library/impl/src/main/java/org/opendaylight/ovsdb/lib/notation/Version.java @@ -14,6 +14,7 @@ import com.google.errorprone.annotations.Var; /** * This class represents a version according to RFC 7047. * The default implementation assumes the left-most digit is most significant when performing comparisons. + * * @see RFC7047 Section 3.1 */ public class Version implements Comparable { @@ -50,6 +51,7 @@ public class Version implements Comparable { * just to avoid allocating three intermediate String objects in {@link #fromString(String)}, * as objection allocation data in Java Mission Control from ODL running in a scale lab * has identified this as the top #3 (!) memory allocator overall - 1 GB avoidable String. + * * @author Michael Vorburger.ch */ private static int parse(final String string, final int start, final int end) { diff --git a/library/impl/src/main/java/org/opendaylight/ovsdb/lib/schema/ColumnSchema.java b/library/impl/src/main/java/org/opendaylight/ovsdb/lib/schema/ColumnSchema.java index 9dc03a2c3..d3c4b9adb 100644 --- a/library/impl/src/main/java/org/opendaylight/ovsdb/lib/schema/ColumnSchema.java +++ b/library/impl/src/main/java/org/opendaylight/ovsdb/lib/schema/ColumnSchema.java @@ -114,6 +114,7 @@ public class ColumnSchema, D> { /** * Verifies if this Column if of the specified type. + * * @param typeClass the type to check for */ public void validateType(final Class typeClass) { diff --git a/library/impl/src/main/java/org/opendaylight/ovsdb/lib/schema/ColumnType.java b/library/impl/src/main/java/org/opendaylight/ovsdb/lib/schema/ColumnType.java index bf585b486..a379a1740 100644 --- a/library/impl/src/main/java/org/opendaylight/ovsdb/lib/schema/ColumnType.java +++ b/library/impl/src/main/java/org/opendaylight/ovsdb/lib/schema/ColumnType.java @@ -30,19 +30,19 @@ public abstract class ColumnType { /** * JSON. * 
-            "type": {
-                "key": {
-                     "maxInteger": 4294967295,
-                     "minInteger": 0,
-                     "type": "integer"
-                },
-                "min": 0,
-                "value": {
-                    "type": "uuid",
-                    "refTable": "Queue"
-                 },
-                 "max": "unlimited"
-            }
+ * "type": { + * "key": { + * "maxInteger": 4294967295, + * "minInteger": 0, + * "type": "integer" + * }, + * "min": 0, + * "value": { + * "type": "uuid", + * "refTable": "Queue" + * }, + * "max": "unlimited" + * } */ public static ColumnType fromJson(final JsonNode json) { for (Function factory : FACTORIES) { diff --git a/southbound/southbound-impl/src/main/java/org/opendaylight/ovsdb/southbound/reconciliation/ReconciliationTask.java b/southbound/southbound-impl/src/main/java/org/opendaylight/ovsdb/southbound/reconciliation/ReconciliationTask.java index 9ca048817..da097efcb 100644 --- a/southbound/southbound-impl/src/main/java/org/opendaylight/ovsdb/southbound/reconciliation/ReconciliationTask.java +++ b/southbound/southbound-impl/src/main/java/org/opendaylight/ovsdb/southbound/reconciliation/ReconciliationTask.java @@ -38,6 +38,7 @@ public abstract class ReconciliationTask implements Runnable { * Method contains task reconciliation logic. Please refer to * {@link ConnectionReconciliationTask#reconcileConfiguration(OvsdbConnectionManager)} * for example. + * * @param connectionManagerOfDevice Connection manager to get connection instance of the device * @return True if reconciliation was successful, else false */ @@ -76,6 +77,7 @@ public abstract class ReconciliationTask implements Runnable { /** * Method returns the time interval for retrying the failed task. * {@link ReconciliationTask#doRetry(boolean)} + * * @return time */ public abstract long retryDelayInMills(); diff --git a/southbound/southbound-impl/src/main/java/org/opendaylight/ovsdb/southbound/transactions/md/OvsdbManagersUpdateCommand.java b/southbound/southbound-impl/src/main/java/org/opendaylight/ovsdb/southbound/transactions/md/OvsdbManagersUpdateCommand.java index 742a668ab..7cc810ad6 100644 --- a/southbound/southbound-impl/src/main/java/org/opendaylight/ovsdb/southbound/transactions/md/OvsdbManagersUpdateCommand.java +++ b/southbound/southbound-impl/src/main/java/org/opendaylight/ovsdb/southbound/transactions/md/OvsdbManagersUpdateCommand.java @@ -103,7 +103,6 @@ public class OvsdbManagersUpdateCommand extends AbstractTransactionCommand { * * @param transaction the {@link ReadWriteTransaction} * @param newUpdatedManagerRows updated {@link Manager} rows - */ private void updateManagers(ReadWriteTransaction transaction, Map newUpdatedManagerRows) { diff --git a/utils/ovsdb-it-utils/src/main/java/org/opendaylight/ovsdb/utils/ovsdb/it/utils/DockerOvs.java b/utils/ovsdb-it-utils/src/main/java/org/opendaylight/ovsdb/utils/ovsdb/it/utils/DockerOvs.java index 3a01d9e3c..6dbcd694a 100644 --- a/utils/ovsdb-it-utils/src/main/java/org/opendaylight/ovsdb/utils/ovsdb/it/utils/DockerOvs.java +++ b/utils/ovsdb-it-utils/src/main/java/org/opendaylight/ovsdb/utils/ovsdb/it/utils/DockerOvs.java @@ -145,6 +145,7 @@ public final class DockerOvs implements AutoCloseable { /** * Get the array of system properties as pax exam Option objects for use in pax exam * unit tests with Configuration annotation. + * * @return List of Option objects */ public static Option[] getSysPropOptions() { @@ -163,6 +164,7 @@ public final class DockerOvs implements AutoCloseable { /** * Bring up all docker images in the default docker-compose file. + * * @throws IOException if something goes wrong on the IO end * @throws InterruptedException If this thread is interrupted */ @@ -172,6 +174,7 @@ public final class DockerOvs implements AutoCloseable { /** * Bring up all docker images in the provided docker-compose file under "META-INF/docker-compose-files/". + * * @param yamlFileName Just the file name * @throws IOException if something goes wrong on the IO end * @throws InterruptedException If this thread is interrupted @@ -259,6 +262,7 @@ public final class DockerOvs implements AutoCloseable { * Verify and build the docker and docker-compose commands we will be running. This function adds the docker-compose * file to the command lines and also checks (and adjusts the command line) as to whether sudo is required. This is * done by attempting to run commands without and then with sudo + * * @throws IOException if something goes wrong on the IO end * @throws InterruptedException If this thread is interrupted */ @@ -318,6 +322,7 @@ public final class DockerOvs implements AutoCloseable { /** * Get the IP address of the n'th OVS. + * * @param ovsNumber which OVS? * @return IP string */ @@ -330,6 +335,7 @@ public final class DockerOvs implements AutoCloseable { /** * Get the port of the n'th OVS. + * * @param ovsNumber which OVS? * @return Port as a string */ @@ -349,6 +355,7 @@ public final class DockerOvs implements AutoCloseable { /** * How many OVS nodes are there. + * * @return number of running OVS nodes */ public int getNumOvsNodes() { @@ -407,6 +414,7 @@ public final class DockerOvs implements AutoCloseable { /** * Parse the docker-compose yaml file to extract the port mappings. + * * @return a list of the external ports */ private List parseDockerComposeYaml() { @@ -488,6 +496,7 @@ public final class DockerOvs implements AutoCloseable { /** * Construct a new OvsdbPing object. + * * @param ovsNumber which OVS is this? * @param result an AtomicInteger that is incremented upon a successful "ping" */ @@ -514,6 +523,7 @@ public final class DockerOvs implements AutoCloseable { /** * Attempt a "ping" of the OVSDB connection. + * * @return true if the ping was successful OR IF THIS THREAD WAS INTERRUPTED */ private boolean doPing() { @@ -544,6 +554,7 @@ public final class DockerOvs implements AutoCloseable { /** * Wait for all Ovs's to accept and respond to OVSDB requests. + * * @param waitFor How long to wait * @throws IOException if something goes wrong on the IO end * @throws InterruptedException If this thread is interrupted @@ -586,6 +597,7 @@ public final class DockerOvs implements AutoCloseable { /** * Since the docker-compose file is a resource in the bundle and docker-compose needs it. * in the file system, we copy it over - ugly but necessary. + * * @param yamlFileName File name * @return A File object for the newly created temporary yaml file. */ @@ -617,6 +629,7 @@ public final class DockerOvs implements AutoCloseable { /** * Useful for debugging. Dump some interesting config + * * @throws IOException If something goes wrong with reading the process output * @throws InterruptedException because there's some sleeping in here */ 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 49aa9b384..0a522ee56 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 @@ -43,9 +43,9 @@ public class NodeInfo { 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 @@ -76,6 +76,7 @@ public class NodeInfo { /** * Connect to the OVSDB node, wait for the connection to be established and for the integration bridge * to be successfully created. Contains assertions for unexpected states + * * @throws InterruptedException if interrupted while waiting for connection */ public void connect() throws Exception { @@ -101,6 +102,7 @@ public class NodeInfo { /** * Remove integration bridge and teardown connection. Contains assertions for unexpected states. + * * @throws InterruptedException if interrupted while waiting for disconnect to complete */ public void disconnect() throws Exception { diff --git a/utils/ovsdb-it-utils/src/main/java/org/opendaylight/ovsdb/utils/ovsdb/it/utils/OvsdbItUtils.java b/utils/ovsdb-it-utils/src/main/java/org/opendaylight/ovsdb/utils/ovsdb/it/utils/OvsdbItUtils.java index f8d0198e9..3d5837a0a 100644 --- a/utils/ovsdb-it-utils/src/main/java/org/opendaylight/ovsdb/utils/ovsdb/it/utils/OvsdbItUtils.java +++ b/utils/ovsdb-it-utils/src/main/java/org/opendaylight/ovsdb/utils/ovsdb/it/utils/OvsdbItUtils.java @@ -34,6 +34,7 @@ public class OvsdbItUtils { /** * Create a new OvsdbItUtils instance. + * * @param dataBroker md-sal data broker */ public OvsdbItUtils(DataBroker dataBroker) { @@ -44,6 +45,7 @@ public class OvsdbItUtils { /** * Get a NodeInfo instance initialized with this ItUtil's DataBroker. + * * @param connectionInfo ConnectionInfo for the OVSDB server * @param waitList For tracking outstanding md-sal events notifications * @return a new NodeInfo object @@ -56,6 +58,7 @@ public class OvsdbItUtils { /** * Checks whether the OVSDB controller is connected. This method will retry 10 times and will through an * AssertionError for any number of unexpected states. + * * @param connectionInfo where to connect to * @return true if connected * @throws InterruptedException if interrupted while waiting for connection to appear diff --git a/utils/ovsdb-it-utils/src/main/java/org/opendaylight/ovsdb/utils/ovsdb/it/utils/ProcUtils.java b/utils/ovsdb-it-utils/src/main/java/org/opendaylight/ovsdb/utils/ovsdb/it/utils/ProcUtils.java index b406146f7..368a91778 100644 --- a/utils/ovsdb-it-utils/src/main/java/org/opendaylight/ovsdb/utils/ovsdb/it/utils/ProcUtils.java +++ b/utils/ovsdb-it-utils/src/main/java/org/opendaylight/ovsdb/utils/ovsdb/it/utils/ProcUtils.java @@ -26,8 +26,9 @@ public final class ProcUtils { // Hidden on purpose } - /** + /** * Run a process and assert the exit code is 0. + * * @param waitFor How long to wait for the command to execute * @param words The words of the command to run * @throws IOException if something goes wrong on the IO end @@ -39,6 +40,7 @@ public final class ProcUtils { /** * Run a process, collect the stdout, and assert the exit code is 0. + * * @param waitFor How long to wait for the command to execute * @param capturedStdout Whatever the process wrote to standard out * @param words The words of the command to run @@ -60,6 +62,7 @@ public final class ProcUtils { /** * Run a process. + * * @param waitFor How long to wait for the command to execute * @param words The words of the command to run * @return The process's exit code @@ -73,6 +76,7 @@ public final class ProcUtils { /** * Run a process, collect the stdout. + * * @param waitFor How long to wait (milliseconds) for the command to execute * @param capturedStdout Whatever the process wrote to standard out * @param words The words of the command to run @@ -116,6 +120,7 @@ public final class ProcUtils { /** * Wait for a process to end. + * * @param waitFor how long to wait in milliseconds * @param proc Process object * @return the process's exit value or -1 if the process did not complete within waitFor milliseconds diff --git a/utils/southbound-utils/src/main/java/org/opendaylight/ovsdb/utils/southbound/utils/SouthboundUtils.java b/utils/southbound-utils/src/main/java/org/opendaylight/ovsdb/utils/southbound/utils/SouthboundUtils.java index aeaa2ebf0..823795836 100644 --- a/utils/southbound-utils/src/main/java/org/opendaylight/ovsdb/utils/southbound/utils/SouthboundUtils.java +++ b/utils/southbound-utils/src/main/java/org/opendaylight/ovsdb/utils/southbound/utils/SouthboundUtils.java @@ -1171,6 +1171,7 @@ public class SouthboundUtils { /** * Get all OVSDB nodes from topology. + * * @return a list of nodes or null if the topology could not found */ public Map getOvsdbNodes() { @@ -1182,6 +1183,7 @@ public class SouthboundUtils { /** * Get OpenvSwitch other-config by key. + * * @param node OVSDB node * @param key key to extract from other-config * @return the value for key or null if key not found -- 2.34.1 From b1ee30f12c021d4181238fd34dc17fd83beca5d4 Mon Sep 17 00:00:00 2001 From: Robert Varga Date: Thu, 1 Oct 2026 12:58:06 +0200 Subject: [PATCH 3/5] Remove use of HTML entities Use {@code} blocks instead. Change-Id: I6f793a21aa2892c0d98abe1d612fe4ccd462e534 Signed-off-by: Robert Varga --- .../lib/schema/typed/TypedDatabaseSchema.java | 24 +++++++------------ .../schema/typed/TypedDatabaseSchemaImpl.java | 13 +++++----- .../ovsdb/lib/schema/typed/TyperUtils.java | 24 +++++++------------ .../lib/it/LibraryIntegrationTestBase.java | 2 +- 4 files changed, 25 insertions(+), 38 deletions(-) diff --git a/library/impl/src/main/java/org/opendaylight/ovsdb/lib/schema/typed/TypedDatabaseSchema.java b/library/impl/src/main/java/org/opendaylight/ovsdb/lib/schema/typed/TypedDatabaseSchema.java index 27e020f37..5479b7ae5 100644 --- a/library/impl/src/main/java/org/opendaylight/ovsdb/lib/schema/typed/TypedDatabaseSchema.java +++ b/library/impl/src/main/java/org/opendaylight/ovsdb/lib/schema/typed/TypedDatabaseSchema.java @@ -74,44 +74,38 @@ public interface TypedDatabaseSchema extends DatabaseSchema { > T getTypedRowWrapper(Class klazz, Row row); /** - * This method extracts all row updates of Class<T> klazz from a TableUpdates + * This method extracts all row updates of {@code Class} klazz from a TableUpdates * that correspond to old version of rows of type klazz that have been updated. * Example: - * - * Map<UUID,Bridge> oldBridges = extractRowsOld(Bridge.class,updates,dbSchema) - * + * {@code Map oldBridges = extractRowsOld(Bridge.class,updates,dbSchema)} * * @param klazz Class for row type to be extracted * @param updates TableUpdates from which to extract rowUpdates - * @return Map<UUID,T> for the type of things being sought + * @return {@code Map} for the type of things being sought */ > Map extractRowsOld(Class klazz, TableUpdates updates); /** - * This method extracts all row updates of Class<T> klazz from a TableUpdates + * This method extracts all row updates of {@code Class} klazz from a TableUpdates * that correspond to removal of rows of type klazz. * Example: - * - * Map<UUID,Bridge> updatedBridges = extractRowsRemoved(Bridge.class,updates,dbSchema) - * + * {@code Map updatedBridges = extractRowsRemoved(Bridge.class,updates,dbSchema)} * * @param klazz Class for row type to be extracted * @param updates TableUpdates from which to extract rowUpdates - * @return Map<UUID,T> for the type of things being sought + * @return {@code Map} for the type of things being sought */ > Map extractRowsRemoved(Class klazz, TableUpdates updates); /** - * This method extracts all row updates of Class<T> klazz from a TableUpdates + * This method extracts all row updates of {@code Class} klazz from a TableUpdates * that correspond to insertion or updates of rows of type klazz. * Example: - * - * Map<UUID,Bridge> updatedBridges = extractRowsUpdated(Bridge.class,updates,dbSchema) - * + * {@code Map updatedBridges = extractRowsUpdated(Bridge.class,updates,dbSchema)} * * @param klazz Class for row type to be extracted * @param updates TableUpdates from which to extract rowUpdates - * @return Map<UUID,T> for the type of things being sought + * @return {@code Map} for the type of things being sought */ > Map extractRowsUpdated(Class klazz, TableUpdates updates); } diff --git a/library/impl/src/main/java/org/opendaylight/ovsdb/lib/schema/typed/TypedDatabaseSchemaImpl.java b/library/impl/src/main/java/org/opendaylight/ovsdb/lib/schema/typed/TypedDatabaseSchemaImpl.java index 3e2ceddfb..0acbf65b2 100644 --- a/library/impl/src/main/java/org/opendaylight/ovsdb/lib/schema/typed/TypedDatabaseSchemaImpl.java +++ b/library/impl/src/main/java/org/opendaylight/ovsdb/lib/schema/typed/TypedDatabaseSchemaImpl.java @@ -115,17 +115,16 @@ final class TypedDatabaseSchemaImpl extends ForwardingDatabaseSchema implements } /** - * This method extracts all RowUpdates of Class<T> klazz from a TableUpdates that correspond to rows of type + * This method extracts all RowUpdates of {@code Class} klazz from a TableUpdates that correspond to rows of type * klazz. Example: - * - * Map<UUID,TableUpdate<GenericTableSchema>.RowUpdate<GenericTableSchema>> updatedBridges = - * extractRowsUpdates(Bridge.class,updates,dbSchema) - * + * {@code + * Map.RowUpdate> updatedBridges = + * extractRowsUpdates(Bridge.class,updates,dbSchema)} * * @param klazz Class for row type to be extracted * @param updates TableUpdates from which to extract rowUpdates - * @return Map<UUID,TableUpdate<GenericTableSchema>.RowUpdate<GenericTableSchema>> - * for the type of things being sought + * @return {@code Map.RowUpdate> + * for the type of things being sought} */ private Map> extractRowUpdates(final Class klazz, final TableUpdates updates) { diff --git a/library/impl/src/main/java/org/opendaylight/ovsdb/lib/schema/typed/TyperUtils.java b/library/impl/src/main/java/org/opendaylight/ovsdb/lib/schema/typed/TyperUtils.java index a38e59a93..320a11a5e 100644 --- a/library/impl/src/main/java/org/opendaylight/ovsdb/lib/schema/typed/TyperUtils.java +++ b/library/impl/src/main/java/org/opendaylight/ovsdb/lib/schema/typed/TyperUtils.java @@ -104,17 +104,15 @@ public final class TyperUtils { } /** - * This method extracts all row updates of Class<T> klazz from a TableUpdates + * This method extracts all row updates of {@code Class} klazz from a TableUpdates * that correspond to insertion or updates of rows of type klazz. * Example: - * - * Map<UUID,Bridge> updatedBridges = extractRowsUpdated(Bridge.class,updates,dbSchema) - * + * {@code Map updatedBridges = extractRowsUpdated(Bridge.class,updates,dbSchema)} * * @param klazz Class for row type to be extracted * @param updates TableUpdates from which to extract rowUpdates * @param dbSchema Dbschema for the TableUpdates - * @return Map<UUID,T> for the type of things being sought + * @return {@code Map} for the type of things being sought */ public static > Map extractRowsUpdated(final Class klazz, final TableUpdates updates, final DatabaseSchema dbSchema) { @@ -122,17 +120,15 @@ public final class TyperUtils { } /** - * This method extracts all row updates of Class<T> klazz from a TableUpdates + * This method extracts all row updates of {@code Class} klazz from a TableUpdates * that correspond to old version of rows of type klazz that have been updated. * Example: - * - * Map<UUID,Bridge> oldBridges = extractRowsOld(Bridge.class,updates,dbSchema) - * + * {@code Map oldBridges = extractRowsOld(Bridge.class,updates,dbSchema)} * * @param klazz Class for row type to be extracted * @param updates TableUpdates from which to extract rowUpdates * @param dbSchema Dbschema for the TableUpdates - * @return Map<UUID,T> for the type of things being sought + * @return {@code Map} for the type of things being sought */ public static > Map extractRowsOld(final Class klazz, final TableUpdates updates, final DatabaseSchema dbSchema) { @@ -140,17 +136,15 @@ public final class TyperUtils { } /** - * This method extracts all row updates of Class<T> klazz from a TableUpdates + * This method extracts all row updates of {@code Class} klazz from a TableUpdates * that correspond to removal of rows of type klazz. * Example: - * - * Map<UUID,Bridge> updatedBridges = extractRowsRemoved(Bridge.class,updates,dbSchema) - * + * {@code Map updatedBridges = extractRowsRemoved(Bridge.class,updates,dbSchema)} * * @param klazz Class for row type to be extracted * @param updates TableUpdates from which to extract rowUpdates * @param dbSchema Dbschema for the TableUpdates - * @return Map<UUID,T> for the type of things being sought + * @return {@code Map} for the type of things being sought */ public static > Map extractRowsRemoved(final Class klazz, final TableUpdates updates, final DatabaseSchema dbSchema) { diff --git a/library/it/src/test/java/org/opendaylight/ovsdb/lib/it/LibraryIntegrationTestBase.java b/library/it/src/test/java/org/opendaylight/ovsdb/lib/it/LibraryIntegrationTestBase.java index 99ee19662..6ae6c6cd2 100644 --- a/library/it/src/test/java/org/opendaylight/ovsdb/lib/it/LibraryIntegrationTestBase.java +++ b/library/it/src/test/java/org/opendaylight/ovsdb/lib/it/LibraryIntegrationTestBase.java @@ -192,7 +192,7 @@ public abstract class LibraryIntegrationTestBase extends AbstractMdsalTestBase { * As per RFC 7047, section 4.1.5, if a Monitor request is sent without any columns, the update response will * not include the _uuid column. * --------------------------------------------------------------------------------------------------------------- - * Each <monitor-request> specifies one or more columns and the manner in which the columns (or the entire + * Each {@code monitor-request} specifies one or more columns and the manner in which the columns (or the entire * table) are to be monitored. The "columns" member specifies the columns whose values are monitored. It MUST NOT * contain duplicates. If "columns" is omitted, all columns in the table, except for "_uuid", are monitored. * --------------------------------------------------------------------------------------------------------------- -- 2.34.1 From f6bd6d7a9e2f5183b6056a5985e394781ddee214 Mon Sep 17 00:00:00 2001 From: Robert Varga Date: Thu, 1 Oct 2026 12:34:40 +0200 Subject: [PATCH 4/5] WIP: Bump upstreams Adopt: - odlparent-15.0.2 - infrautils-8.0.3 - yangtools-16.1.0 - ietf-3.0.1 - mdsal-17.0.1 - controller-14.0.1 - aaa-0.24.1 - netconf-12.0.1 Change-Id: I82bd15819a9e2f1338863f537ef7bb798c4f7292 Signed-off-by: Robert Varga --- commons/binding-parent/pom.xml | 6 +- commons/it/pom.xml | 4 +- commons/pom.xml | 2 +- .../hwvtepsouthbound-artifacts/pom.xml | 2 +- .../features/pom.xml | 2 +- .../odl-ovsdb-hwvtepsouthbound-api/pom.xml | 4 +- .../src/main/feature/feature.xml | 4 +- .../odl-ovsdb-hwvtepsouthbound-rest/pom.xml | 6 +- .../src/main/feature/feature.xml | 2 +- .../odl-ovsdb-hwvtepsouthbound-test/pom.xml | 2 +- .../odl-ovsdb-hwvtepsouthbound-ui/pom.xml | 4 +- .../src/main/feature/feature.xml | 2 +- .../odl-ovsdb-hwvtepsouthbound/pom.xml | 2 +- .../hwvtepsouthbound-features/pom.xml | 2 +- .../hwvtepsouthbound/HwvtepDeviceInfo.java | 59 ++++++++++--------- .../transact/AbstractTransactCommand.java | 49 ++++++++------- .../transact/DependentJob.java | 2 +- .../transact/TransactCommand.java | 2 +- .../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 | 2 +- .../src/main/feature/feature.xml | 6 +- 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-features/features/pom.xml | 2 +- .../odl-ovsdb-southbound-api/pom.xml | 4 +- .../src/main/feature/feature.xml | 4 +- .../odl-ovsdb-southbound-impl-rest/pom.xml | 6 +- .../src/main/feature/feature.xml | 2 +- .../odl-ovsdb-southbound-impl-ui/pom.xml | 4 +- .../src/main/feature/feature.xml | 2 +- .../odl-ovsdb-southbound-impl/pom.xml | 4 +- .../src/main/feature/feature.xml | 6 +- .../odl-ovsdb-southbound-test/pom.xml | 2 +- southbound/southbound-features/pom.xml | 2 +- southbound/southbound-karaf/pom.xml | 2 +- utils/odl-ovsdb-utils/pom.xml | 4 +- .../src/main/feature/feature.xml | 2 +- utils/pom.xml | 2 +- .../ovsdb/utils/yang/YangUtils.java | 4 +- 47 files changed, 119 insertions(+), 119 deletions(-) diff --git a/commons/binding-parent/pom.xml b/commons/binding-parent/pom.xml index b89a0569a..7795273ba 100644 --- a/commons/binding-parent/pom.xml +++ b/commons/binding-parent/pom.xml @@ -11,7 +11,7 @@ org.opendaylight.mdsal binding-parent - 16.0.3 + 17.0.1 @@ -25,14 +25,14 @@ org.opendaylight.aaa aaa-artifacts - 0.23.2 + 0.24.1 pom import org.opendaylight.infrautils infrautils-artifacts - 7.1.12 + 8.0.3 pom import diff --git a/commons/it/pom.xml b/commons/it/pom.xml index 549b871e8..6a4609336 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 - 13.0.2 + 14.0.1 @@ -70,7 +70,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html org.opendaylight.mdsal mdsal-artifacts - 16.0.3 + 17.0.1 pom import diff --git a/commons/pom.xml b/commons/pom.xml index 537125f54..f3b18ffc0 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 - 14.3.1 + 15.0.2 diff --git a/hwvtepsouthbound/hwvtepsouthbound-artifacts/pom.xml b/hwvtepsouthbound/hwvtepsouthbound-artifacts/pom.xml index 50979bed3..473eb79b4 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 - 14.3.1 + 15.0.2 diff --git a/hwvtepsouthbound/hwvtepsouthbound-features/features/pom.xml b/hwvtepsouthbound/hwvtepsouthbound-features/features/pom.xml index 052cd79e9..753b936cf 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 - 14.3.1 + 15.0.2 diff --git a/hwvtepsouthbound/hwvtepsouthbound-features/odl-ovsdb-hwvtepsouthbound-api/pom.xml b/hwvtepsouthbound/hwvtepsouthbound-features/odl-ovsdb-hwvtepsouthbound-api/pom.xml index bcf4dc199..007637fb4 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 - 14.3.1 + 15.0.2 @@ -22,7 +22,7 @@ org.opendaylight.mdsal mdsal-artifacts - 16.0.3 + 17.0.1 pom import diff --git a/hwvtepsouthbound/hwvtepsouthbound-features/odl-ovsdb-hwvtepsouthbound-api/src/main/feature/feature.xml b/hwvtepsouthbound/hwvtepsouthbound-features/odl-ovsdb-hwvtepsouthbound-api/src/main/feature/feature.xml index eea434e41..f1c638291 100644 --- a/hwvtepsouthbound/hwvtepsouthbound-features/odl-ovsdb-hwvtepsouthbound-api/src/main/feature/feature.xml +++ b/hwvtepsouthbound/hwvtepsouthbound-features/odl-ovsdb-hwvtepsouthbound-api/src/main/feature/feature.xml @@ -8,7 +8,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html --> - odl-mdsal-model-draft-clemm-netmod-yang-network-topo-01-minimal - odl-mdsal-model-odl-l2-types + odl-mdsal-model-draft-clemm-netmod-yang-network-topo-01-minimal + odl-mdsal-model-odl-l2-types diff --git a/hwvtepsouthbound/hwvtepsouthbound-features/odl-ovsdb-hwvtepsouthbound-rest/pom.xml b/hwvtepsouthbound/hwvtepsouthbound-features/odl-ovsdb-hwvtepsouthbound-rest/pom.xml index 16f5a6b94..469df1a79 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 - 14.3.1 + 15.0.2 @@ -30,7 +30,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html org.opendaylight.netconf netconf-artifacts - 11.0.0 + 12.0.1 import pom @@ -47,7 +47,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html org.opendaylight.netconf - odl-restconf + odl-restconf-nb xml features diff --git a/hwvtepsouthbound/hwvtepsouthbound-features/odl-ovsdb-hwvtepsouthbound-rest/src/main/feature/feature.xml b/hwvtepsouthbound/hwvtepsouthbound-features/odl-ovsdb-hwvtepsouthbound-rest/src/main/feature/feature.xml index 3edbc4c33..b36005d43 100644 --- a/hwvtepsouthbound/hwvtepsouthbound-features/odl-ovsdb-hwvtepsouthbound-rest/src/main/feature/feature.xml +++ b/hwvtepsouthbound/hwvtepsouthbound-features/odl-ovsdb-hwvtepsouthbound-rest/src/main/feature/feature.xml @@ -8,6 +8,6 @@ and is available at http://www.eclipse.org/legal/epl-v10.html --> - odl-restconf + odl-restconf-nb diff --git a/hwvtepsouthbound/hwvtepsouthbound-features/odl-ovsdb-hwvtepsouthbound-test/pom.xml b/hwvtepsouthbound/hwvtepsouthbound-features/odl-ovsdb-hwvtepsouthbound-test/pom.xml index 6da7dfe90..384d14c6e 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 - 14.3.1 + 15.0.2 diff --git a/hwvtepsouthbound/hwvtepsouthbound-features/odl-ovsdb-hwvtepsouthbound-ui/pom.xml b/hwvtepsouthbound/hwvtepsouthbound-features/odl-ovsdb-hwvtepsouthbound-ui/pom.xml index a312d48b8..6d040d1fb 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 - 14.3.1 + 15.0.2 @@ -30,7 +30,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html org.opendaylight.netconf netconf-artifacts - 11.0.0 + 12.0.1 import pom diff --git a/hwvtepsouthbound/hwvtepsouthbound-features/odl-ovsdb-hwvtepsouthbound-ui/src/main/feature/feature.xml b/hwvtepsouthbound/hwvtepsouthbound-features/odl-ovsdb-hwvtepsouthbound-ui/src/main/feature/feature.xml index aa15772a2..af2a847ef 100644 --- a/hwvtepsouthbound/hwvtepsouthbound-features/odl-ovsdb-hwvtepsouthbound-ui/src/main/feature/feature.xml +++ b/hwvtepsouthbound/hwvtepsouthbound-features/odl-ovsdb-hwvtepsouthbound-ui/src/main/feature/feature.xml @@ -8,6 +8,6 @@ and is available at http://www.eclipse.org/legal/epl-v10.html --> - odl-restconf-openapi + odl-restconf-openapi diff --git a/hwvtepsouthbound/hwvtepsouthbound-features/odl-ovsdb-hwvtepsouthbound/pom.xml b/hwvtepsouthbound/hwvtepsouthbound-features/odl-ovsdb-hwvtepsouthbound/pom.xml index bfe41620b..fa8ba1680 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 - 14.3.1 + 15.0.2 diff --git a/hwvtepsouthbound/hwvtepsouthbound-features/pom.xml b/hwvtepsouthbound/hwvtepsouthbound-features/pom.xml index 46b09c9bd..b42e80856 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 - 14.3.1 + 15.0.2 org.opendaylight.ovsdb 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 06eb291bf..c44927e5c 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 @@ -58,20 +58,20 @@ public class HwvtepDeviceInfo { private static final Logger LOG = LoggerFactory.getLogger(HwvtepDeviceInfo.class); - private Map>, Map> availableInOperDs = + private Map>, Map> availableInOperDs = new ConcurrentHashMap<>(); - public void markAvailableInOperDs(Class> cls, InstanceIdentifier key) { + public void markAvailableInOperDs(Class> cls, InstanceIdentifier key) { availableInOperDs.putIfAbsent(cls, new ConcurrentHashMap<>()); availableInOperDs.get(cls).put(key, Boolean.TRUE); } - public Boolean isAvailableInOperDs(Class> cls, InstanceIdentifier key) { + public Boolean isAvailableInOperDs(Class> cls, InstanceIdentifier key) { availableInOperDs.putIfAbsent(cls, new ConcurrentHashMap<>()); return availableInOperDs.get(cls).getOrDefault(key, Boolean.FALSE); } - public Boolean clearOperDsAvailability(Class> cls, InstanceIdentifier key) { + public Boolean clearOperDsAvailability(Class> cls, InstanceIdentifier key) { availableInOperDs.putIfAbsent(cls, new ConcurrentHashMap<>()); return availableInOperDs.get(cls).remove(key); } @@ -141,14 +141,15 @@ public class HwvtepDeviceInfo { logicalSwitchVsMcasts = new ConcurrentHashMap<>(); private final Map physicalSwitches = new ConcurrentHashMap<>(); private final Map mapTunnelToPhysicalSwitch = new ConcurrentHashMap<>(); - private final Map>, Map> opKeyVsData = + private final Map>, Map> opKeyVsData = + new ConcurrentHashMap<>(); + private final Map>, Map> uuidVsData = 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 = + private Map>, Map> configKeyVsData = new ConcurrentHashMap<>(); private TransactionHistory controllerTxHistory = null; private TransactionHistory deviceUpdateHistory = null; @@ -228,33 +229,33 @@ public class HwvtepDeviceInfo { return mapTunnelToPhysicalSwitch; } - public boolean isKeyInTransit(Class> cls, InstanceIdentifier key) { + public boolean isKeyInTransit(Class> cls, InstanceIdentifier key) { DeviceData deviceData = HwvtepSouthboundUtil.getData(opKeyVsData, cls, key); return deviceData != null && DeviceDataStatus.IN_TRANSIT == deviceData.status; } - public boolean isConfigDataAvailable(Class> cls, InstanceIdentifier key) { + public boolean isConfigDataAvailable(Class> cls, InstanceIdentifier key) { return HwvtepSouthboundUtil.getData(configKeyVsData, cls, key) != null; } - public void updateConfigData(Class> cls, InstanceIdentifier key, Object data) { + public void updateConfigData(Class> cls, InstanceIdentifier key, Object data) { HwvtepSouthboundUtil.updateData(configKeyVsData, cls, key, new DeviceData(key, null, data, DeviceDataStatus.AVAILABLE)); } - public DeviceData getConfigData(Class> cls, InstanceIdentifier key) { + public DeviceData getConfigData(Class> cls, InstanceIdentifier key) { return HwvtepSouthboundUtil.getData(configKeyVsData, cls, key); } - public Map>, Map> getConfigData() { + public Map>, Map> getConfigData() { return Collections.unmodifiableMap(configKeyVsData); } - public void clearConfigData(Class> cls, InstanceIdentifier key) { + public void clearConfigData(Class> cls, InstanceIdentifier key) { HwvtepSouthboundUtil.clearData(configKeyVsData, cls, key); } - public void markKeyAsInTransit(Class> cls, InstanceIdentifier key) { + public void markKeyAsInTransit(Class> cls, InstanceIdentifier key) { LOG.debug("Marking device data as intransit {}", key); DeviceData deviceData = getDeviceOperData(cls, key); UUID uuid = null; @@ -268,7 +269,7 @@ public class HwvtepDeviceInfo { new DeviceData(key, uuid, data, DeviceDataStatus.IN_TRANSIT)); } - public void updateDeviceOperData(Class> cls, InstanceIdentifier key, + public void updateDeviceOperData(Class> cls, InstanceIdentifier key, UUID uuid, Object data) { LOG.debug("Updating device data {}", key); DeviceData deviceData = new DeviceData(key, uuid, data, DeviceDataStatus.AVAILABLE); @@ -276,7 +277,7 @@ public class HwvtepDeviceInfo { HwvtepSouthboundUtil.updateData(uuidVsData, cls, uuid, deviceData); } - public void clearDeviceOperData(Class> cls, InstanceIdentifier key) { + public void clearDeviceOperData(Class> cls, InstanceIdentifier key) { DeviceData deviceData = HwvtepSouthboundUtil.getData(opKeyVsData, cls, key); if (deviceData != null && deviceData.uuid != null) { HwvtepSouthboundUtil.clearData(uuidVsData, cls, deviceData.uuid); @@ -284,7 +285,7 @@ public class HwvtepDeviceInfo { HwvtepSouthboundUtil.clearData(opKeyVsData, cls, key); } - public void clearDeviceOperData(Class> cls) { + public void clearDeviceOperData(Class> cls) { Map iids = opKeyVsData.get(cls); if (iids != null && !iids.isEmpty()) { Iterator> it = iids.entrySet().iterator(); @@ -298,7 +299,7 @@ public class HwvtepDeviceInfo { } } - public void clearDeviceOperUUID(Class> cls, InstanceIdentifier key, UUID uuid) { + public void clearDeviceOperUUID(Class> cls, InstanceIdentifier key, UUID uuid) { LOG.debug("Clearing device data {}", key); if (uuidVsData.containsKey(cls) && uuidVsData.get(cls).containsKey(uuid)) { LOG.debug("Remove {} {} from device data.", connectionInstance.getNodeId().getValue(), cls.getSimpleName()); @@ -307,19 +308,19 @@ public class HwvtepDeviceInfo { HwvtepSouthboundUtil.clearData(opKeyVsData, cls, key); } - public DeviceData getDeviceOperData(Class> cls, UUID uuid) { + public DeviceData getDeviceOperData(Class> cls, UUID uuid) { return HwvtepSouthboundUtil.getData(uuidVsData, cls, uuid); } - public DeviceData getDeviceOperData(Class> cls, InstanceIdentifier key) { + public DeviceData getDeviceOperData(Class> cls, InstanceIdentifier key) { return HwvtepSouthboundUtil.getData(opKeyVsData, cls, key); } - public Map getDeviceOperData(Class> cls) { + public Map getDeviceOperData(Class> cls) { return opKeyVsData.get(cls); } - public InstanceIdentifier getDeviceOperKey(final Class> cls, final UUID uuid) { + public InstanceIdentifier getDeviceOperKey(final Class> cls, final UUID uuid) { DeviceData deviceData = HwvtepSouthboundUtil.getData(uuidVsData, cls, uuid); if (deviceData != null) { return deviceData.getKey(); @@ -327,7 +328,7 @@ public class HwvtepDeviceInfo { return null; } - public UUID getUUID(Class> cls, InstanceIdentifier key) { + public UUID getUUID(Class> cls, InstanceIdentifier key) { DeviceData data = HwvtepSouthboundUtil.getData(opKeyVsData, cls, key); if (data != null) { return data.uuid; @@ -335,7 +336,7 @@ public class HwvtepDeviceInfo { return null; } - public > void addJobToQueue(DependentJob job) { + public > void addJobToQueue(DependentJob job) { dependencyQueue.addToQueue(job); } @@ -351,7 +352,7 @@ public class HwvtepDeviceInfo { dependencyQueue.submit(() -> connectionInstance.transact(transactCommand)); } - public void clearInTransit(Class> cls, InstanceIdentifier key) { + public void clearInTransit(Class> cls, InstanceIdentifier key) { DeviceData deviceData = getDeviceOperData(cls, key); if (deviceData != null && deviceData.isInTransitState()) { if (deviceData.getData() != null) { @@ -463,8 +464,8 @@ public class HwvtepDeviceInfo { return connectionInstance; } - public void setConfigKeyVsData(Map>, Map> configKeyVsData) { + public void setConfigKeyVsData( + Map>, Map> configKeyVsData) { this.configKeyVsData = configKeyVsData; } @@ -484,11 +485,11 @@ public class HwvtepDeviceInfo { deviceUpdateHistory.addToHistory(transactionType, object); } - public Map>, Map> getOperData() { + public Map>, Map> getOperData() { return Collections.unmodifiableMap(opKeyVsData); } - public Map>, Map> getUuidData() { + public Map>, Map> getUuidData() { return Collections.unmodifiableMap(uuidVsData); } diff --git a/hwvtepsouthbound/hwvtepsouthbound-impl/src/main/java/org/opendaylight/ovsdb/hwvtepsouthbound/transact/AbstractTransactCommand.java b/hwvtepsouthbound/hwvtepsouthbound-impl/src/main/java/org/opendaylight/ovsdb/hwvtepsouthbound/transact/AbstractTransactCommand.java index 668d90f53..5f49b4a37 100644 --- a/hwvtepsouthbound/hwvtepsouthbound-impl/src/main/java/org/opendaylight/ovsdb/hwvtepsouthbound/transact/AbstractTransactCommand.java +++ b/hwvtepsouthbound/hwvtepsouthbound-impl/src/main/java/org/opendaylight/ovsdb/hwvtepsouthbound/transact/AbstractTransactCommand.java @@ -45,8 +45,8 @@ import org.opendaylight.yangtools.yang.binding.InstanceIdentifier; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -public abstract class AbstractTransactCommand, I extends Key, - A extends Augmentation> implements TransactCommand { +public abstract class AbstractTransactCommand, I extends Key, + A extends Augmentation> implements TransactCommand { private static final Logger LOG = LoggerFactory.getLogger(AbstractTransactCommand.class); protected static final UUID TXUUID = new UUID("TXUUID"); @@ -81,14 +81,14 @@ public abstract class AbstractTransactCommand, I ext return getOperationalState().getConnectionInstance().ops(); } - void updateCurrentTxDeleteData(final Class> cls, final InstanceIdentifier key, + void updateCurrentTxDeleteData(final Class> cls, final InstanceIdentifier key, final T data) { hwvtepOperationalState.updateCurrentTxDeleteData(cls, key); markKeyAsInTransit(cls, key); addToUpdates(key, data); } - void updateCurrentTxData(final Class> cls, final InstanceIdentifier key, + void updateCurrentTxData(final Class> cls, final InstanceIdentifier key, final UUID uuid, final T data) { hwvtepOperationalState.updateCurrentTxData(cls, key, uuid); markKeyAsInTransit(cls, key); @@ -99,8 +99,8 @@ public abstract class AbstractTransactCommand, I ext T oldData = null; Type type = getClass().getGenericSuperclass(); Type classType = ((ParameterizedType) type).getActualTypeArguments()[0]; - if (getConfigData((Class>) classType, key) != null) { - oldData = (T) getConfigData((Class>) classType, key).getData(); + if (getConfigData((Class>) classType, key) != null) { + oldData = (T) getConfigData((Class>) classType, key).getData(); } updates.add(new MdsalUpdate<>(key, data, oldData)); } @@ -118,7 +118,7 @@ public abstract class AbstractTransactCommand, I ext Map confingDependencies = Map.of(); if (isDeleteCmd()) { - if (deviceInfo.isKeyInTransit((Class>) classType, key)) { + if (deviceInfo.isKeyInTransit((Class>) classType, key)) { inTransitDependencies = new HashMap<>(); inTransitDependencies.put(classType, List.of(key)); } @@ -129,7 +129,7 @@ public abstract class AbstractTransactCommand, I ext confingDependencies.remove(TerminationPoint.class); //If this key itself is in transit wait for the response of this key itself - if (deviceInfo.isKeyInTransit((Class>) classType, key) + if (deviceInfo.isKeyInTransit((Class>) classType, key) || deviceInfo.isKeyInDependencyQueue(key)) { inTransitDependencies.put(classType, List.of(key)); } @@ -139,9 +139,9 @@ public abstract class AbstractTransactCommand, I ext && HwvtepSouthboundUtil.isEmptyMap(inTransitDependencies)) { doDeviceTransaction(transaction, nodeIid, data, key, extraData); if (isDeleteCmd()) { - getDeviceInfo().clearConfigData((Class>) classType, key); + getDeviceInfo().clearConfigData((Class>) classType, key); } else { - getDeviceInfo().updateConfigData((Class>) classType, key, data); + getDeviceInfo().updateConfigData((Class>) classType, key, data); } } @@ -155,7 +155,7 @@ public abstract class AbstractTransactCommand, I ext final TransactionBuilder transactionBuilder) { clone.hwvtepOperationalState = operationalState; HwvtepDeviceInfo.DeviceData deviceData = - getDeviceInfo().getConfigData((Class>)getClassType(), key); + getDeviceInfo().getConfigData((Class>)getClassType(), key); T latest = data; if (deviceData != null && deviceData.getData() != null) { latest = (T) deviceData.getData(); @@ -192,7 +192,7 @@ public abstract class AbstractTransactCommand, I ext final TransactionBuilder transactionBuilder) { clone.hwvtepOperationalState = operationalState; HwvtepDeviceInfo.DeviceData deviceData = getDeviceInfo() - .getConfigData((Class>)getClassType(), key); + .getConfigData((Class>)getClassType(), key); T latest = data; if (deviceData != null && deviceData.getData() != null) { latest = (T) deviceData.getData(); @@ -235,10 +235,7 @@ public abstract class AbstractTransactCommand, I ext return null; } ParameterizedType parameterizedType = (ParameterizedType) getClass().getGenericSuperclass(); - Class> augType = - (Class>) parameterizedType.getActualTypeArguments()[1]; - Augmentation augmentation = node.augmentation(augType); - return (A) augmentation; + return (A) node.augmentation((Class) parameterizedType.getActualTypeArguments()[1]); } protected Map getData(final A augmentation) { @@ -267,7 +264,8 @@ public abstract class AbstractTransactCommand, I ext if (!Objects.equals(hwvtepOperationalState.getConnectionInstance().getInstanceIdentifier(), key)) { continue; } - Class> classType = (Class>) getClassType(); + Class> classType = + (Class>) getClassType(); List removed; if (getOperationalState().isInReconciliation()) { removed = getRemoved(change); @@ -291,7 +289,8 @@ public abstract class AbstractTransactCommand, I ext if (!Objects.equals(hwvtepOperationalState.getConnectionInstance().getInstanceIdentifier(), key)) { continue; } - Class> classType = (Class>) getClassType(); + Class> classType = + (Class>) getClassType(); List updated = null; if (getOperationalState().isInReconciliation()) { updated = getUpdated(change); @@ -444,7 +443,7 @@ public abstract class AbstractTransactCommand, I ext getOperationalState().getDeviceInfo().addToControllerTx(transactionType, element); } - public HwvtepDeviceInfo.DeviceData fetchDeviceData(final Class> cls, + public HwvtepDeviceInfo.DeviceData fetchDeviceData(final Class> cls, final InstanceIdentifier key) { HwvtepDeviceInfo.DeviceData deviceData = getDeviceOpData(cls, key); if (deviceData == null) { @@ -461,30 +460,30 @@ public abstract class AbstractTransactCommand, I ext return deviceData; } - public > void addJobToQueue(final DependentJob job) { + public > void addJobToQueue(final DependentJob job) { hwvtepOperationalState.getDeviceInfo().putKeyInDependencyQueue(job.getKey()); hwvtepOperationalState.getDeviceInfo().addJobToQueue(job); } - public void markKeyAsInTransit(final Class> cls, final InstanceIdentifier key) { + public void markKeyAsInTransit(final Class> cls, final InstanceIdentifier key) { hwvtepOperationalState.getDeviceInfo().markKeyAsInTransit(cls, key); } - public HwvtepDeviceInfo.DeviceData getDeviceOpData(final Class> cls, + public HwvtepDeviceInfo.DeviceData getDeviceOpData(final Class> cls, final InstanceIdentifier key) { return getOperationalState().getDeviceInfo().getDeviceOperData(cls, key); } - public void clearConfigData(final Class> cls, final InstanceIdentifier key) { + public void clearConfigData(final Class> cls, final InstanceIdentifier key) { hwvtepOperationalState.getDeviceInfo().clearConfigData(cls, key); } - public HwvtepDeviceInfo.DeviceData getConfigData(final Class> cls, + public HwvtepDeviceInfo.DeviceData getConfigData(final Class> cls, final InstanceIdentifier key) { return hwvtepOperationalState.getDeviceInfo().getConfigData(cls, key); } - public void updateConfigData(final Class> cls, final InstanceIdentifier key, + public void updateConfigData(final Class> cls, final InstanceIdentifier key, final Object data) { hwvtepOperationalState.getDeviceInfo().updateConfigData(cls, key, data); } diff --git a/hwvtepsouthbound/hwvtepsouthbound-impl/src/main/java/org/opendaylight/ovsdb/hwvtepsouthbound/transact/DependentJob.java b/hwvtepsouthbound/hwvtepsouthbound-impl/src/main/java/org/opendaylight/ovsdb/hwvtepsouthbound/transact/DependentJob.java index b18070314..7cf48f801 100644 --- a/hwvtepsouthbound/hwvtepsouthbound-impl/src/main/java/org/opendaylight/ovsdb/hwvtepsouthbound/transact/DependentJob.java +++ b/hwvtepsouthbound/hwvtepsouthbound-impl/src/main/java/org/opendaylight/ovsdb/hwvtepsouthbound/transact/DependentJob.java @@ -23,7 +23,7 @@ import org.opendaylight.yangtools.yang.binding.InstanceIdentifier; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -public abstract class DependentJob> { +public abstract class DependentJob> { private static final Logger LOG = LoggerFactory.getLogger(DependentJob.class); private static final Predicate DATA_INTRANSIT = diff --git a/hwvtepsouthbound/hwvtepsouthbound-impl/src/main/java/org/opendaylight/ovsdb/hwvtepsouthbound/transact/TransactCommand.java b/hwvtepsouthbound/hwvtepsouthbound-impl/src/main/java/org/opendaylight/ovsdb/hwvtepsouthbound/transact/TransactCommand.java index fe4ab90f2..97c39dafa 100644 --- a/hwvtepsouthbound/hwvtepsouthbound-impl/src/main/java/org/opendaylight/ovsdb/hwvtepsouthbound/transact/TransactCommand.java +++ b/hwvtepsouthbound/hwvtepsouthbound-impl/src/main/java/org/opendaylight/ovsdb/hwvtepsouthbound/transact/TransactCommand.java @@ -12,7 +12,7 @@ import org.opendaylight.yang.gen.v1.urn.tbd.params.xml.ns.yang.network.topology. import org.opendaylight.yangtools.binding.EntryObject; import org.opendaylight.yangtools.yang.binding.InstanceIdentifier; -public interface TransactCommand> { +public interface TransactCommand> { void execute(TransactionBuilder transaction); diff --git a/hwvtepsouthbound/hwvtepsouthbound-karaf/pom.xml b/hwvtepsouthbound/hwvtepsouthbound-karaf/pom.xml index f6ff6880b..a3a1380f7 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 - 14.3.1 + 15.0.2 4.0.0 diff --git a/hwvtepsouthbound/pom.xml b/hwvtepsouthbound/pom.xml index 3ff01ae8a..82127df5c 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 - 14.3.1 + 15.0.2 diff --git a/library/artifacts/pom.xml b/library/artifacts/pom.xml index e9058de27..a6413f571 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 - 14.3.1 + 15.0.2 diff --git a/library/features/features/pom.xml b/library/features/features/pom.xml index c661acec6..4e25b61b1 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 - 14.3.1 + 15.0.2 diff --git a/library/features/odl-ovsdb-library/pom.xml b/library/features/odl-ovsdb-library/pom.xml index cc991b60f..9f6ef601f 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 - 14.3.1 + 15.0.2 diff --git a/library/features/odl-ovsdb-library/src/main/feature/feature.xml b/library/features/odl-ovsdb-library/src/main/feature/feature.xml index c80abc3b4..93cc91b1e 100644 --- a/library/features/odl-ovsdb-library/src/main/feature/feature.xml +++ b/library/features/odl-ovsdb-library/src/main/feature/feature.xml @@ -8,9 +8,9 @@ and is available at http://www.eclipse.org/legal/epl-v10.html --> - odl-jackson-2 - odl-netty-4 - odl-aaa-cert + odl-jackson-2 + odl-netty-4 + odl-aaa-cert mvn:org.opendaylight.ovsdb/library/${project.version}/cfg/config diff --git a/library/features/pom.xml b/library/features/pom.xml index ffde3d136..c3f593dda 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 - 14.3.1 + 15.0.2 org.opendaylight.ovsdb diff --git a/library/karaf/pom.xml b/library/karaf/pom.xml index c6435fe34..07580bedf 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 - 14.3.1 + 15.0.2 4.0.0 diff --git a/library/pom.xml b/library/pom.xml index 7a9c5196d..1b216f6e3 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 - 14.3.1 + 15.0.2 diff --git a/pom.xml b/pom.xml index 0e3efeb53..4d75352dc 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 - 14.3.1 + 15.0.2 diff --git a/schemas/pom.xml b/schemas/pom.xml index f9c22d28d..4d8cc8f3d 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 - 14.3.1 + 15.0.2 diff --git a/southbound/pom.xml b/southbound/pom.xml index 4432008bf..1ae8bc46d 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 - 14.3.1 + 15.0.2 diff --git a/southbound/southbound-artifacts/pom.xml b/southbound/southbound-artifacts/pom.xml index ec2c9ea13..e5f03c576 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 - 14.3.1 + 15.0.2 diff --git a/southbound/southbound-features/features/pom.xml b/southbound/southbound-features/features/pom.xml index 7528a9f63..ef35b85f0 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 - 14.3.1 + 15.0.2 diff --git a/southbound/southbound-features/odl-ovsdb-southbound-api/pom.xml b/southbound/southbound-features/odl-ovsdb-southbound-api/pom.xml index 161cdc8a2..b26aa53ff 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 - 14.3.1 + 15.0.2 @@ -29,7 +29,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html org.opendaylight.mdsal mdsal-artifacts - 16.0.3 + 17.0.1 pom import diff --git a/southbound/southbound-features/odl-ovsdb-southbound-api/src/main/feature/feature.xml b/southbound/southbound-features/odl-ovsdb-southbound-api/src/main/feature/feature.xml index d485a2639..7db3d45dd 100644 --- a/southbound/southbound-features/odl-ovsdb-southbound-api/src/main/feature/feature.xml +++ b/southbound/southbound-features/odl-ovsdb-southbound-api/src/main/feature/feature.xml @@ -8,7 +8,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html --> - odl-mdsal-model-draft-clemm-netmod-yang-network-topo-01-minimal - odl-mdsal-model-odl-l2-types + odl-mdsal-model-draft-clemm-netmod-yang-network-topo-01-minimal + odl-mdsal-model-odl-l2-types 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 9e8242112..ea7b861ef 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 - 14.3.1 + 15.0.2 @@ -30,7 +30,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html org.opendaylight.netconf netconf-artifacts - 11.0.0 + 12.0.1 import pom @@ -47,7 +47,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html org.opendaylight.netconf - odl-restconf + odl-restconf-nb xml features diff --git a/southbound/southbound-features/odl-ovsdb-southbound-impl-rest/src/main/feature/feature.xml b/southbound/southbound-features/odl-ovsdb-southbound-impl-rest/src/main/feature/feature.xml index bc30bc4db..6e746f784 100644 --- a/southbound/southbound-features/odl-ovsdb-southbound-impl-rest/src/main/feature/feature.xml +++ b/southbound/southbound-features/odl-ovsdb-southbound-impl-rest/src/main/feature/feature.xml @@ -8,6 +8,6 @@ and is available at http://www.eclipse.org/legal/epl-v10.html --> - odl-restconf + odl-restconf-nb 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 89907a1bc..f7971f856 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 - 14.3.1 + 15.0.2 @@ -30,7 +30,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html org.opendaylight.netconf netconf-artifacts - 11.0.0 + 12.0.1 import pom diff --git a/southbound/southbound-features/odl-ovsdb-southbound-impl-ui/src/main/feature/feature.xml b/southbound/southbound-features/odl-ovsdb-southbound-impl-ui/src/main/feature/feature.xml index d5ef5bc27..1430226ba 100644 --- a/southbound/southbound-features/odl-ovsdb-southbound-impl-ui/src/main/feature/feature.xml +++ b/southbound/southbound-features/odl-ovsdb-southbound-impl-ui/src/main/feature/feature.xml @@ -8,6 +8,6 @@ and is available at http://www.eclipse.org/legal/epl-v10.html --> - odl-restconf-openapi + odl-restconf-openapi diff --git a/southbound/southbound-features/odl-ovsdb-southbound-impl/pom.xml b/southbound/southbound-features/odl-ovsdb-southbound-impl/pom.xml index 4cd202dd9..1350277d3 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 - 14.3.1 + 15.0.2 @@ -30,7 +30,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html org.opendaylight.infrautils infrautils-artifacts - 7.1.12 + 8.0.3 pom import diff --git a/southbound/southbound-features/odl-ovsdb-southbound-impl/src/main/feature/feature.xml b/southbound/southbound-features/odl-ovsdb-southbound-impl/src/main/feature/feature.xml index 9c6171ce8..c73fbc860 100644 --- a/southbound/southbound-features/odl-ovsdb-southbound-impl/src/main/feature/feature.xml +++ b/southbound/southbound-features/odl-ovsdb-southbound-impl/src/main/feature/feature.xml @@ -8,9 +8,9 @@ and is available at http://www.eclipse.org/legal/epl-v10.html --> - odl-jackson-2 - odl-infrautils-diagstatus - odl-infrautils-ready + odl-jackson-2 + odl-infrautils-diagstatus + odl-infrautils-ready mvn:org.opendaylight.ovsdb/southbound-impl/${project.version}/cfg/config diff --git a/southbound/southbound-features/odl-ovsdb-southbound-test/pom.xml b/southbound/southbound-features/odl-ovsdb-southbound-test/pom.xml index 215e50fb9..555e03cc3 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 - 14.3.1 + 15.0.2 diff --git a/southbound/southbound-features/pom.xml b/southbound/southbound-features/pom.xml index cf2ee45c1..108ca078b 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 - 14.3.1 + 15.0.2 diff --git a/southbound/southbound-karaf/pom.xml b/southbound/southbound-karaf/pom.xml index dd43a76fb..0f140e43a 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 - 14.3.1 + 15.0.2 4.0.0 diff --git a/utils/odl-ovsdb-utils/pom.xml b/utils/odl-ovsdb-utils/pom.xml index 5e0cee529..8a10e0b14 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 - 14.3.1 + 15.0.2 @@ -29,7 +29,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html org.opendaylight.controller controller-artifacts - 13.0.2 + 14.0.1 pom import diff --git a/utils/odl-ovsdb-utils/src/main/feature/feature.xml b/utils/odl-ovsdb-utils/src/main/feature/feature.xml index 67533f18b..d8931bac6 100644 --- a/utils/odl-ovsdb-utils/src/main/feature/feature.xml +++ b/utils/odl-ovsdb-utils/src/main/feature/feature.xml @@ -8,6 +8,6 @@ and is available at http://www.eclipse.org/legal/epl-v10.html --> - odl-mdsal-broker + odl-mdsal-broker diff --git a/utils/pom.xml b/utils/pom.xml index be45cfdd2..f81cdd90a 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 - 14.3.1 + 15.0.2 diff --git a/utils/yang-utils/src/main/java/org/opendaylight/ovsdb/utils/yang/YangUtils.java b/utils/yang-utils/src/main/java/org/opendaylight/ovsdb/utils/yang/YangUtils.java index 7425767bf..9261583c9 100644 --- a/utils/yang-utils/src/main/java/org/opendaylight/ovsdb/utils/yang/YangUtils.java +++ b/utils/yang-utils/src/main/java/org/opendaylight/ovsdb/utils/yang/YangUtils.java @@ -65,7 +65,7 @@ public final class YangUtils { * @param The value type. * @return The map. */ - public static , T extends EntryObject, K, V> + public static , T extends EntryObject, K, V> @NonNull Map copyYangKeyValueListToMap(@NonNull Map map, @Nullable Map yangList, @NonNull Function keyExtractor, @NonNull Function valueExtractor) { @@ -102,7 +102,7 @@ public final class YangUtils { * @param The value type. * @return The map. */ - public static , T extends EntryObject, K, V> @NonNull Map + public static , T extends EntryObject, K, V> @NonNull Map convertYangKeyValueListToMap(@Nullable Map yangList, @NonNull Function keyExtractor, @NonNull Function valueExtractor) { return copyYangKeyValueListToMap(new HashMap<>(), yangList, keyExtractor, valueExtractor); -- 2.34.1 From 54079c88f27f6f0c9c510fd739d4cffdd35e4098 Mon Sep 17 00:00:00 2001 From: jenkins-releng Date: Thu, 1 Oct 2026 12:33:11 +0000 Subject: [PATCH 5/5] Release Validate --- commons/binding-parent/pom.xml | 2 +- commons/it/pom.xml | 2 +- commons/pom.xml | 2 +- hwvtepsouthbound/hwvtepsouthbound-api/pom.xml | 4 ++-- hwvtepsouthbound/hwvtepsouthbound-artifacts/pom.xml | 2 +- hwvtepsouthbound/hwvtepsouthbound-features/features/pom.xml | 2 +- .../odl-ovsdb-hwvtepsouthbound-api/pom.xml | 2 +- .../odl-ovsdb-hwvtepsouthbound-rest/pom.xml | 2 +- .../odl-ovsdb-hwvtepsouthbound-test/pom.xml | 2 +- .../odl-ovsdb-hwvtepsouthbound-ui/pom.xml | 2 +- .../odl-ovsdb-hwvtepsouthbound/pom.xml | 2 +- hwvtepsouthbound/hwvtepsouthbound-features/pom.xml | 2 +- hwvtepsouthbound/hwvtepsouthbound-impl/pom.xml | 2 +- hwvtepsouthbound/hwvtepsouthbound-it/pom.xml | 2 +- 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 | 2 +- library/features/pom.xml | 2 +- library/impl/pom.xml | 4 ++-- library/it/pom.xml | 6 +++--- library/karaf/pom.xml | 2 +- library/pom.xml | 2 +- pom.xml | 2 +- schemas/hardwarevtep/pom.xml | 4 ++-- schemas/openvswitch/pom.xml | 4 ++-- schemas/pom.xml | 2 +- southbound/pom.xml | 2 +- southbound/southbound-api/pom.xml | 4 ++-- southbound/southbound-artifacts/pom.xml | 2 +- southbound/southbound-features/features/pom.xml | 2 +- .../southbound-features/odl-ovsdb-southbound-api/pom.xml | 2 +- .../odl-ovsdb-southbound-impl-rest/pom.xml | 2 +- .../odl-ovsdb-southbound-impl-ui/pom.xml | 2 +- .../southbound-features/odl-ovsdb-southbound-impl/pom.xml | 2 +- .../southbound-features/odl-ovsdb-southbound-test/pom.xml | 2 +- southbound/southbound-features/pom.xml | 2 +- southbound/southbound-impl/pom.xml | 2 +- southbound/southbound-it/pom.xml | 2 +- southbound/southbound-karaf/pom.xml | 2 +- utils/config/pom.xml | 4 ++-- utils/hwvtepsouthbound-utils/pom.xml | 4 ++-- utils/mdsal-utils/pom.xml | 4 ++-- utils/odl-ovsdb-utils/pom.xml | 2 +- utils/ovsdb-it-utils/pom.xml | 2 +- utils/pom.xml | 2 +- utils/servicehelper/pom.xml | 4 ++-- utils/southbound-utils/pom.xml | 4 ++-- utils/yang-utils/pom.xml | 2 +- 50 files changed, 62 insertions(+), 62 deletions(-) diff --git a/commons/binding-parent/pom.xml b/commons/binding-parent/pom.xml index 7795273ba..2bd9195f2 100644 --- a/commons/binding-parent/pom.xml +++ b/commons/binding-parent/pom.xml @@ -17,7 +17,7 @@ org.opendaylight.ovsdb ovsdb-binding-parent - 1.23.0-SNAPSHOT + 1.23.0 pom diff --git a/commons/it/pom.xml b/commons/it/pom.xml index 6a4609336..a0ad43e6b 100644 --- a/commons/it/pom.xml +++ b/commons/it/pom.xml @@ -18,7 +18,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html org.opendaylight.ovsdb it - 1.23.0-SNAPSHOT + 1.23.0 pom diff --git a/commons/pom.xml b/commons/pom.xml index f3b18ffc0..53fdd4c1e 100644 --- a/commons/pom.xml +++ b/commons/pom.xml @@ -18,7 +18,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html org.opendaylight.ovsdb parents - 1.23.0-SNAPSHOT + 1.23.0 ODL :: ovsdb :: ${project.artifactId} diff --git a/hwvtepsouthbound/hwvtepsouthbound-api/pom.xml b/hwvtepsouthbound/hwvtepsouthbound-api/pom.xml index f4a24bad2..6e601b75e 100644 --- a/hwvtepsouthbound/hwvtepsouthbound-api/pom.xml +++ b/hwvtepsouthbound/hwvtepsouthbound-api/pom.xml @@ -10,14 +10,14 @@ and is available at http://www.eclipse.org/legal/epl-v10.html org.opendaylight.ovsdb ovsdb-binding-parent - 1.23.0-SNAPSHOT + 1.23.0 ../../commons/binding-parent 4.0.0 org.opendaylight.ovsdb hwvtepsouthbound-api - 1.23.0-SNAPSHOT + 1.23.0 bundle diff --git a/hwvtepsouthbound/hwvtepsouthbound-artifacts/pom.xml b/hwvtepsouthbound/hwvtepsouthbound-artifacts/pom.xml index 473eb79b4..db8a8955a 100644 --- a/hwvtepsouthbound/hwvtepsouthbound-artifacts/pom.xml +++ b/hwvtepsouthbound/hwvtepsouthbound-artifacts/pom.xml @@ -19,7 +19,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html org.opendaylight.ovsdb hwvtepsouthbound-artifacts - 1.23.0-SNAPSHOT + 1.23.0 pom diff --git a/hwvtepsouthbound/hwvtepsouthbound-features/features/pom.xml b/hwvtepsouthbound/hwvtepsouthbound-features/features/pom.xml index 753b936cf..5d3e25f3e 100644 --- a/hwvtepsouthbound/hwvtepsouthbound-features/features/pom.xml +++ b/hwvtepsouthbound/hwvtepsouthbound-features/features/pom.xml @@ -18,7 +18,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html org.opendaylight.ovsdb hwvtepsouthbound-features - 1.23.0-SNAPSHOT + 1.23.0 feature diff --git a/hwvtepsouthbound/hwvtepsouthbound-features/odl-ovsdb-hwvtepsouthbound-api/pom.xml b/hwvtepsouthbound/hwvtepsouthbound-features/odl-ovsdb-hwvtepsouthbound-api/pom.xml index 007637fb4..b16e8af17 100644 --- a/hwvtepsouthbound/hwvtepsouthbound-features/odl-ovsdb-hwvtepsouthbound-api/pom.xml +++ b/hwvtepsouthbound/hwvtepsouthbound-features/odl-ovsdb-hwvtepsouthbound-api/pom.xml @@ -11,7 +11,7 @@ org.opendaylight.ovsdb odl-ovsdb-hwvtepsouthbound-api - 1.23.0-SNAPSHOT + 1.23.0 feature diff --git a/hwvtepsouthbound/hwvtepsouthbound-features/odl-ovsdb-hwvtepsouthbound-rest/pom.xml b/hwvtepsouthbound/hwvtepsouthbound-features/odl-ovsdb-hwvtepsouthbound-rest/pom.xml index 469df1a79..24776aa68 100644 --- a/hwvtepsouthbound/hwvtepsouthbound-features/odl-ovsdb-hwvtepsouthbound-rest/pom.xml +++ b/hwvtepsouthbound/hwvtepsouthbound-features/odl-ovsdb-hwvtepsouthbound-rest/pom.xml @@ -18,7 +18,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html org.opendaylight.ovsdb odl-ovsdb-hwvtepsouthbound-rest - 1.23.0-SNAPSHOT + 1.23.0 feature diff --git a/hwvtepsouthbound/hwvtepsouthbound-impl/pom.xml b/hwvtepsouthbound/hwvtepsouthbound-impl/pom.xml index 88de06a51..9274d3d0a 100644 --- a/hwvtepsouthbound/hwvtepsouthbound-impl/pom.xml +++ b/hwvtepsouthbound/hwvtepsouthbound-impl/pom.xml @@ -12,7 +12,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html org.opendaylight.ovsdb ovsdb-binding-parent - 1.23.0-SNAPSHOT + 1.23.0 ../../commons/binding-parent diff --git a/hwvtepsouthbound/hwvtepsouthbound-it/pom.xml b/hwvtepsouthbound/hwvtepsouthbound-it/pom.xml index 0e2cf0a8e..7cc4fff55 100644 --- a/hwvtepsouthbound/hwvtepsouthbound-it/pom.xml +++ b/hwvtepsouthbound/hwvtepsouthbound-it/pom.xml @@ -11,7 +11,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html org.opendaylight.ovsdb it - 1.23.0-SNAPSHOT + 1.23.0 ../../commons/it diff --git a/hwvtepsouthbound/hwvtepsouthbound-karaf/pom.xml b/hwvtepsouthbound/hwvtepsouthbound-karaf/pom.xml index a3a1380f7..0ba15fd43 100644 --- a/hwvtepsouthbound/hwvtepsouthbound-karaf/pom.xml +++ b/hwvtepsouthbound/hwvtepsouthbound-karaf/pom.xml @@ -15,7 +15,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html INTERNAL 4.0.0 org.opendaylight.ovsdb hwvtepsouthbound-karaf - 1.23.0-SNAPSHOT + 1.23.0 pom diff --git a/hwvtepsouthbound/pom.xml b/hwvtepsouthbound/pom.xml index 82127df5c..1ecadd6b1 100644 --- a/hwvtepsouthbound/pom.xml +++ b/hwvtepsouthbound/pom.xml @@ -17,7 +17,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html INTERNAL org.opendaylight.ovsdb hwvtepsouthbound-aggregator - 1.23.0-SNAPSHOT + 1.23.0 ODL :: ovsdb :: ${project.artifactId} diff --git a/library/artifacts/pom.xml b/library/artifacts/pom.xml index a6413f571..a3389fe1e 100644 --- a/library/artifacts/pom.xml +++ b/library/artifacts/pom.xml @@ -19,7 +19,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html org.opendaylight.ovsdb library-artifacts - 1.23.0-SNAPSHOT + 1.23.0 pom diff --git a/library/features/features/pom.xml b/library/features/features/pom.xml index 4e25b61b1..1648f11ed 100644 --- a/library/features/features/pom.xml +++ b/library/features/features/pom.xml @@ -18,7 +18,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html org.opendaylight.ovsdb library-features - 1.23.0-SNAPSHOT + 1.23.0 feature diff --git a/library/features/odl-ovsdb-library/pom.xml b/library/features/odl-ovsdb-library/pom.xml index 9f6ef601f..b892f903f 100644 --- a/library/features/odl-ovsdb-library/pom.xml +++ b/library/features/odl-ovsdb-library/pom.xml @@ -18,7 +18,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html org.opendaylight.ovsdb odl-ovsdb-library - 1.23.0-SNAPSHOT + 1.23.0 feature ODL :: ovsdb :: ${project.artifactId} diff --git a/library/impl/pom.xml b/library/impl/pom.xml index 074de8b51..021b213b0 100644 --- a/library/impl/pom.xml +++ b/library/impl/pom.xml @@ -12,14 +12,14 @@ and is available at http://www.eclipse.org/legal/epl-v10.html org.opendaylight.ovsdb ovsdb-binding-parent - 1.23.0-SNAPSHOT + 1.23.0 ../../commons/binding-parent 4.0.0 org.opendaylight.ovsdb library - 1.23.0-SNAPSHOT + 1.23.0 bundle diff --git a/library/it/pom.xml b/library/it/pom.xml index 83073c284..71eea8f73 100644 --- a/library/it/pom.xml +++ b/library/it/pom.xml @@ -11,14 +11,14 @@ and is available at http://www.eclipse.org/legal/epl-v10.html org.opendaylight.ovsdb it - 1.23.0-SNAPSHOT + 1.23.0 ../../commons/it 4.0.0 org.opendaylight.ovsdb library-it - 1.23.0-SNAPSHOT + 1.23.0 jar @@ -27,7 +27,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html org.opendaylight.ovsdb library-karaf - 1.23.0-SNAPSHOT + 1.23.0 zip diff --git a/library/karaf/pom.xml b/library/karaf/pom.xml index 07580bedf..5484b4a52 100644 --- a/library/karaf/pom.xml +++ b/library/karaf/pom.xml @@ -15,7 +15,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html INTERNAL 4.0.0 org.opendaylight.ovsdb library-karaf - 1.23.0-SNAPSHOT + 1.23.0 pom diff --git a/library/pom.xml b/library/pom.xml index 1b216f6e3..578ce988f 100644 --- a/library/pom.xml +++ b/library/pom.xml @@ -17,7 +17,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html org.opendaylight.ovsdb library-aggregator - 1.23.0-SNAPSHOT + 1.23.0 ODL :: ovsdb :: ${project.artifactId} diff --git a/pom.xml b/pom.xml index 4d75352dc..a9633c848 100644 --- a/pom.xml +++ b/pom.xml @@ -18,7 +18,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html org.opendaylight.ovsdb ovsdb - 1.23.0-SNAPSHOT + 1.23.0 ${project.artifactId} pom diff --git a/schemas/hardwarevtep/pom.xml b/schemas/hardwarevtep/pom.xml index b1ad4c9ab..a17932db2 100644 --- a/schemas/hardwarevtep/pom.xml +++ b/schemas/hardwarevtep/pom.xml @@ -12,13 +12,13 @@ and is available at http://www.eclipse.org/legal/epl-v10.html org.opendaylight.ovsdb ovsdb-binding-parent - 1.23.0-SNAPSHOT + 1.23.0 ../../commons/binding-parent org.opendaylight.ovsdb schema.hardwarevtep - 1.23.0-SNAPSHOT + 1.23.0 bundle diff --git a/schemas/openvswitch/pom.xml b/schemas/openvswitch/pom.xml index ba9c814f8..078351377 100644 --- a/schemas/openvswitch/pom.xml +++ b/schemas/openvswitch/pom.xml @@ -12,13 +12,13 @@ and is available at http://www.eclipse.org/legal/epl-v10.html org.opendaylight.ovsdb ovsdb-binding-parent - 1.23.0-SNAPSHOT + 1.23.0 ../../commons/binding-parent org.opendaylight.ovsdb schema.openvswitch - 1.23.0-SNAPSHOT + 1.23.0 bundle diff --git a/schemas/pom.xml b/schemas/pom.xml index 4d8cc8f3d..a6947d988 100644 --- a/schemas/pom.xml +++ b/schemas/pom.xml @@ -18,7 +18,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html org.opendaylight.ovsdb schemas - 1.23.0-SNAPSHOT + 1.23.0 ODL :: ovsdb :: ${project.artifactId} diff --git a/southbound/pom.xml b/southbound/pom.xml index 1ae8bc46d..f9f2c3a05 100644 --- a/southbound/pom.xml +++ b/southbound/pom.xml @@ -16,7 +16,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html INTERNAL org.opendaylight.ovsdb southbound-aggregator - 1.23.0-SNAPSHOT + 1.23.0 ODL :: ovsdb :: ${project.artifactId} diff --git a/southbound/southbound-api/pom.xml b/southbound/southbound-api/pom.xml index f085761f0..ee633bd6c 100644 --- a/southbound/southbound-api/pom.xml +++ b/southbound/southbound-api/pom.xml @@ -10,14 +10,14 @@ and is available at http://www.eclipse.org/legal/epl-v10.html org.opendaylight.ovsdb ovsdb-binding-parent - 1.23.0-SNAPSHOT + 1.23.0 ../../commons/binding-parent 4.0.0 org.opendaylight.ovsdb southbound-api - 1.23.0-SNAPSHOT + 1.23.0 bundle diff --git a/southbound/southbound-artifacts/pom.xml b/southbound/southbound-artifacts/pom.xml index e5f03c576..fa8615660 100644 --- a/southbound/southbound-artifacts/pom.xml +++ b/southbound/southbound-artifacts/pom.xml @@ -19,7 +19,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html org.opendaylight.ovsdb southbound-artifacts - 1.23.0-SNAPSHOT + 1.23.0 pom diff --git a/southbound/southbound-features/features/pom.xml b/southbound/southbound-features/features/pom.xml index ef35b85f0..e45c84527 100644 --- a/southbound/southbound-features/features/pom.xml +++ b/southbound/southbound-features/features/pom.xml @@ -18,7 +18,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html org.opendaylight.ovsdb southbound-features - 1.23.0-SNAPSHOT + 1.23.0 feature diff --git a/southbound/southbound-features/odl-ovsdb-southbound-api/pom.xml b/southbound/southbound-features/odl-ovsdb-southbound-api/pom.xml index b26aa53ff..60e0f88e7 100644 --- a/southbound/southbound-features/odl-ovsdb-southbound-api/pom.xml +++ b/southbound/southbound-features/odl-ovsdb-southbound-api/pom.xml @@ -18,7 +18,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html org.opendaylight.ovsdb odl-ovsdb-southbound-api - 1.23.0-SNAPSHOT + 1.23.0 feature 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 ea7b861ef..72c5227dc 100644 --- a/southbound/southbound-features/odl-ovsdb-southbound-impl-rest/pom.xml +++ b/southbound/southbound-features/odl-ovsdb-southbound-impl-rest/pom.xml @@ -18,7 +18,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html org.opendaylight.ovsdb odl-ovsdb-southbound-impl-rest - 1.23.0-SNAPSHOT + 1.23.0 feature ODL :: ovsdb :: ${project.artifactId} diff --git a/southbound/southbound-impl/pom.xml b/southbound/southbound-impl/pom.xml index f4429dcd2..61a4c1d28 100644 --- a/southbound/southbound-impl/pom.xml +++ b/southbound/southbound-impl/pom.xml @@ -12,7 +12,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html org.opendaylight.ovsdb ovsdb-binding-parent - 1.23.0-SNAPSHOT + 1.23.0 ../../commons/binding-parent diff --git a/southbound/southbound-it/pom.xml b/southbound/southbound-it/pom.xml index 9b25ebbe3..72518feda 100644 --- a/southbound/southbound-it/pom.xml +++ b/southbound/southbound-it/pom.xml @@ -12,7 +12,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html org.opendaylight.ovsdb it - 1.23.0-SNAPSHOT + 1.23.0 ../../commons/it 4.0.0 diff --git a/southbound/southbound-karaf/pom.xml b/southbound/southbound-karaf/pom.xml index 0f140e43a..afef891d5 100644 --- a/southbound/southbound-karaf/pom.xml +++ b/southbound/southbound-karaf/pom.xml @@ -15,7 +15,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html INTERNAL 4.0.0 org.opendaylight.ovsdb southbound-karaf - 1.23.0-SNAPSHOT + 1.23.0 pom diff --git a/utils/config/pom.xml b/utils/config/pom.xml index dfba187b9..e2c01613f 100644 --- a/utils/config/pom.xml +++ b/utils/config/pom.xml @@ -12,13 +12,13 @@ and is available at http://www.eclipse.org/legal/epl-v10.html org.opendaylight.ovsdb ovsdb-binding-parent - 1.23.0-SNAPSHOT + 1.23.0 ../../commons/binding-parent org.opendaylight.ovsdb utils.config - 1.23.0-SNAPSHOT + 1.23.0 ODL :: ovsdb :: ${project.artifactId} diff --git a/utils/hwvtepsouthbound-utils/pom.xml b/utils/hwvtepsouthbound-utils/pom.xml index a8473eeba..313bede1f 100644 --- a/utils/hwvtepsouthbound-utils/pom.xml +++ b/utils/hwvtepsouthbound-utils/pom.xml @@ -11,13 +11,13 @@ and is available at http://www.eclipse.org/legal/epl-v10.html org.opendaylight.ovsdb ovsdb-binding-parent - 1.23.0-SNAPSHOT + 1.23.0 ../../commons/binding-parent org.opendaylight.ovsdb utils.hwvtepsouthbound-utils - 1.23.0-SNAPSHOT + 1.23.0 bundle diff --git a/utils/mdsal-utils/pom.xml b/utils/mdsal-utils/pom.xml index 6b93fde63..54c61bdcf 100644 --- a/utils/mdsal-utils/pom.xml +++ b/utils/mdsal-utils/pom.xml @@ -11,13 +11,13 @@ and is available at http://www.eclipse.org/legal/epl-v10.html org.opendaylight.ovsdb ovsdb-binding-parent - 1.23.0-SNAPSHOT + 1.23.0 ../../commons/binding-parent org.opendaylight.ovsdb utils.mdsal-utils - 1.23.0-SNAPSHOT + 1.23.0 bundle diff --git a/utils/odl-ovsdb-utils/pom.xml b/utils/odl-ovsdb-utils/pom.xml index 8a10e0b14..2cd1666ef 100644 --- a/utils/odl-ovsdb-utils/pom.xml +++ b/utils/odl-ovsdb-utils/pom.xml @@ -18,7 +18,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html org.opendaylight.ovsdb odl-ovsdb-utils - 1.23.0-SNAPSHOT + 1.23.0 feature diff --git a/utils/ovsdb-it-utils/pom.xml b/utils/ovsdb-it-utils/pom.xml index a9c8d44f0..1fbde8b7e 100644 --- a/utils/ovsdb-it-utils/pom.xml +++ b/utils/ovsdb-it-utils/pom.xml @@ -11,7 +11,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html org.opendaylight.ovsdb ovsdb-binding-parent - 1.23.0-SNAPSHOT + 1.23.0 ../../commons/binding-parent diff --git a/utils/pom.xml b/utils/pom.xml index f81cdd90a..f1e849989 100644 --- a/utils/pom.xml +++ b/utils/pom.xml @@ -18,7 +18,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html org.opendaylight.ovsdb utils - 1.23.0-SNAPSHOT + 1.23.0 pom diff --git a/utils/servicehelper/pom.xml b/utils/servicehelper/pom.xml index 9e345753f..a8e6b037b 100644 --- a/utils/servicehelper/pom.xml +++ b/utils/servicehelper/pom.xml @@ -12,13 +12,13 @@ and is available at http://www.eclipse.org/legal/epl-v10.html org.opendaylight.ovsdb ovsdb-binding-parent - 1.23.0-SNAPSHOT + 1.23.0 ../../commons/binding-parent org.opendaylight.ovsdb utils.servicehelper - 1.23.0-SNAPSHOT + 1.23.0 bundle diff --git a/utils/southbound-utils/pom.xml b/utils/southbound-utils/pom.xml index fa7faf041..76a5aa794 100644 --- a/utils/southbound-utils/pom.xml +++ b/utils/southbound-utils/pom.xml @@ -11,13 +11,13 @@ and is available at http://www.eclipse.org/legal/epl-v10.html org.opendaylight.ovsdb ovsdb-binding-parent - 1.23.0-SNAPSHOT + 1.23.0 ../../commons/binding-parent org.opendaylight.ovsdb utils.southbound-utils - 1.23.0-SNAPSHOT + 1.23.0 bundle diff --git a/utils/yang-utils/pom.xml b/utils/yang-utils/pom.xml index dad18f7da..a67111874 100644 --- a/utils/yang-utils/pom.xml +++ b/utils/yang-utils/pom.xml @@ -11,7 +11,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html org.opendaylight.ovsdb ovsdb-binding-parent - 1.23.0-SNAPSHOT + 1.23.0 ../../commons/binding-parent -- 2.34.1