From bc4ad3e363775cc668982a286b1e6b7af5146da9 Mon Sep 17 00:00:00 2001 From: Robert Varga Date: Mon, 28 Sep 2026 11:00:29 +0200 Subject: [PATCH 1/6] Migrate users of InstanceIdentifier Switch to using DataObjectReference instead. Change-Id: Iac02eb5fbda43233e61cc7daea8c1347b2ad44ff Signed-off-by: Robert Varga --- .../implementation/mdsal/AbstractDataListener.java | 13 +++++-------- .../mdsal/AuthenticationKeyDataListener.java | 8 +++++--- .../implementation/mdsal/MappingDataListener.java | 14 ++++++++------ .../mdsal/AuthenticationKeyDataListenerTest.java | 6 +++--- .../mdsal/MappingDataListenerTest.java | 7 ++++--- 5 files changed, 25 insertions(+), 23 deletions(-) diff --git a/mappingservice/implementation/src/main/java/org/opendaylight/lispflowmapping/implementation/mdsal/AbstractDataListener.java b/mappingservice/implementation/src/main/java/org/opendaylight/lispflowmapping/implementation/mdsal/AbstractDataListener.java index 8b7e9da9..592b104a 100644 --- a/mappingservice/implementation/src/main/java/org/opendaylight/lispflowmapping/implementation/mdsal/AbstractDataListener.java +++ b/mappingservice/implementation/src/main/java/org/opendaylight/lispflowmapping/implementation/mdsal/AbstractDataListener.java @@ -9,11 +9,10 @@ package org.opendaylight.lispflowmapping.implementation.mdsal; import org.opendaylight.mdsal.binding.api.DataBroker; import org.opendaylight.mdsal.binding.api.DataTreeChangeListener; -import org.opendaylight.mdsal.binding.api.DataTreeIdentifier; import org.opendaylight.mdsal.common.api.LogicalDatastoreType; import org.opendaylight.yangtools.binding.DataObject; +import org.opendaylight.yangtools.binding.DataObjectReference; import org.opendaylight.yangtools.concepts.Registration; -import org.opendaylight.yangtools.yang.binding.InstanceIdentifier; /** * The superclass for the different MD-SAL data change event listeners. @@ -21,15 +20,13 @@ import org.opendaylight.yangtools.yang.binding.InstanceIdentifier; */ public abstract class AbstractDataListener implements DataTreeChangeListener { private DataBroker broker; - private InstanceIdentifier path; + private DataObjectReference path; private Registration configRegistration; private Registration operRegistration; void registerDataChangeListener() { - configRegistration = broker.registerTreeChangeListener( - DataTreeIdentifier.of(LogicalDatastoreType.CONFIGURATION, path), this); - operRegistration = broker.registerTreeChangeListener( - DataTreeIdentifier.of(LogicalDatastoreType.OPERATIONAL, path), this); + configRegistration = broker.registerTreeChangeListener(LogicalDatastoreType.CONFIGURATION, path, this); + operRegistration = broker.registerTreeChangeListener(LogicalDatastoreType.OPERATIONAL, path, this); } public void closeDataChangeListener() { @@ -41,7 +38,7 @@ public abstract class AbstractDataListener implements Data this.broker = broker; } - void setPath(InstanceIdentifier path) { + void setPath(DataObjectReference path) { this.path = path; } } diff --git a/mappingservice/implementation/src/main/java/org/opendaylight/lispflowmapping/implementation/mdsal/AuthenticationKeyDataListener.java b/mappingservice/implementation/src/main/java/org/opendaylight/lispflowmapping/implementation/mdsal/AuthenticationKeyDataListener.java index 8c0e6a31..661b58c6 100644 --- a/mappingservice/implementation/src/main/java/org/opendaylight/lispflowmapping/implementation/mdsal/AuthenticationKeyDataListener.java +++ b/mappingservice/implementation/src/main/java/org/opendaylight/lispflowmapping/implementation/mdsal/AuthenticationKeyDataListener.java @@ -19,7 +19,7 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.lfm.mappingservice.rev15090 import org.opendaylight.yang.gen.v1.urn.opendaylight.lfm.mappingservice.rev150906.db.instance.AuthenticationKey; import org.opendaylight.yang.gen.v1.urn.opendaylight.lfm.mappingservice.rev150906.db.instance.AuthenticationKeyBuilder; import org.opendaylight.yang.gen.v1.urn.opendaylight.lfm.mappingservice.rev150906.mapping.database.VirtualNetworkIdentifier; -import org.opendaylight.yangtools.yang.binding.InstanceIdentifier; +import org.opendaylight.yangtools.binding.DataObjectReference; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -36,8 +36,10 @@ public class AuthenticationKeyDataListener extends AbstractDataListener { setBroker(broker); setMappingSystem(msmr); setNotificationProviderService(nps); - setPath(InstanceIdentifier.create(MappingDatabase.class).child(VirtualNetworkIdentifier.class) - .child(Mapping.class)); + setPath(DataObjectReference.builder(MappingDatabase.class) + .child(VirtualNetworkIdentifier.class) + .child(Mapping.class) + .build()); LOG.trace("Registering Mapping listener."); registerDataChangeListener(); } @@ -80,7 +82,7 @@ public class MappingDataListener extends AbstractDataListener { } LOG.trace("Received deleted data"); - LOG.trace("Key: {}", change.getRootPath().path()); + LOG.trace("Key: {}", change.path()); LOG.trace("Value: {}", mapping); final Mapping convertedMapping = convertToBinaryIfNecessary(mapping); @@ -102,13 +104,13 @@ public class MappingDataListener extends AbstractDataListener { if (ModificationType.SUBTREE_MODIFIED == mod.modificationType()) { LOG.trace("Received update data"); - LOG.trace("Key: {}", change.getRootPath().path()); + LOG.trace("Key: {}", change.path()); LOG.trace("Value: {}", mapping); mapSystem.updateMapping(convertedMapping.getOrigin(), convertedEid, new MappingData(convertedMapping.getMappingRecord())); } else { LOG.trace("Received write data"); - LOG.trace("Key: {}", change.getRootPath().path()); + LOG.trace("Key: {}", change.path()); LOG.trace("Value: {}", mapping); mapSystem.addMapping(convertedMapping.getOrigin(), convertedEid, new MappingData(convertedMapping.getMappingRecord())); diff --git a/mappingservice/implementation/src/test/java/org/opendaylight/lispflowmapping/implementation/mdsal/AuthenticationKeyDataListenerTest.java b/mappingservice/implementation/src/test/java/org/opendaylight/lispflowmapping/implementation/mdsal/AuthenticationKeyDataListenerTest.java index 69edb30e..c80d8459 100644 --- a/mappingservice/implementation/src/test/java/org/opendaylight/lispflowmapping/implementation/mdsal/AuthenticationKeyDataListenerTest.java +++ b/mappingservice/implementation/src/test/java/org/opendaylight/lispflowmapping/implementation/mdsal/AuthenticationKeyDataListenerTest.java @@ -28,7 +28,7 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.lfm.mappingservice.rev15090 import org.opendaylight.yang.gen.v1.urn.opendaylight.lfm.mappingservice.rev150906.db.instance.AuthenticationKeyBuilder; import org.opendaylight.yang.gen.v1.urn.opendaylight.lfm.mappingservice.rev150906.db.instance.AuthenticationKeyKey; import org.opendaylight.yang.gen.v1.urn.opendaylight.lfm.mappingservice.rev150906.mapping.database.VirtualNetworkIdentifier; -import org.opendaylight.yangtools.yang.binding.InstanceIdentifier; +import org.opendaylight.yangtools.binding.DataObjectReference; import org.opendaylight.yangtools.yang.common.Uint16; public class AuthenticationKeyDataListenerTest { @@ -61,8 +61,8 @@ public class AuthenticationKeyDataListenerTest { final DataTreeIdentifier dataTreeIdentifier = DataTreeIdentifier.of( LogicalDatastoreType.CONFIGURATION, - InstanceIdentifier.create(MappingDatabase.class).child(VirtualNetworkIdentifier.class) - .child(AuthenticationKey.class)); + DataObjectReference.builder(MappingDatabase.class).child(VirtualNetworkIdentifier.class) + .child(AuthenticationKey.class).build()); change_del = Mockito.mock(DataTreeModification.class); change_subtreeModified = Mockito.mock(DataTreeModification.class); diff --git a/mappingservice/implementation/src/test/java/org/opendaylight/lispflowmapping/implementation/mdsal/MappingDataListenerTest.java b/mappingservice/implementation/src/test/java/org/opendaylight/lispflowmapping/implementation/mdsal/MappingDataListenerTest.java index 5ff01e5d..e753c3f7 100644 --- a/mappingservice/implementation/src/test/java/org/opendaylight/lispflowmapping/implementation/mdsal/MappingDataListenerTest.java +++ b/mappingservice/implementation/src/test/java/org/opendaylight/lispflowmapping/implementation/mdsal/MappingDataListenerTest.java @@ -40,7 +40,7 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.lfm.mappingservice.rev15090 import org.opendaylight.yang.gen.v1.urn.opendaylight.lfm.mappingservice.rev150906.db.instance.MappingBuilder; import org.opendaylight.yang.gen.v1.urn.opendaylight.lfm.mappingservice.rev150906.db.instance.MappingKey; import org.opendaylight.yang.gen.v1.urn.opendaylight.lfm.mappingservice.rev150906.mapping.database.VirtualNetworkIdentifier; -import org.opendaylight.yangtools.yang.binding.InstanceIdentifier; +import org.opendaylight.yangtools.binding.DataObjectReference; public class MappingDataListenerTest { private static IMappingSystem iMappingSystemMock; @@ -79,9 +79,10 @@ public class MappingDataListenerTest { final DataTreeIdentifier dataTreeIdentifier = DataTreeIdentifier.of( LogicalDatastoreType.CONFIGURATION, - InstanceIdentifier.create(MappingDatabase.class) + DataObjectReference.builder(MappingDatabase.class) .child(VirtualNetworkIdentifier.class) - .child(Mapping.class)); + .child(Mapping.class) + .build()); change_del = Mockito.mock(DataTreeModification.class); change_subtreeModified = Mockito.mock(DataTreeModification.class); -- 2.34.1 From b59e3003f8a00a9641a81c9787667c381d03efe8 Mon Sep 17 00:00:00 2001 From: Robert Varga Date: Wed, 30 Sep 2026 17:27:50 +0200 Subject: [PATCH 2/6] Remove use of Sets.newConcurrentHashSet() Use ConcurrentHashMap.newKeySet() instead. Change-Id: Ie5ab4bf4c8acc9862e7594e50b6be677730e76b5 Signed-off-by: Robert Varga --- .../lispflowmapping/implementation/MappingSystem.java | 3 +-- .../implementation/util/MSNotificationInputUtil.java | 7 +++---- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/mappingservice/implementation/src/main/java/org/opendaylight/lispflowmapping/implementation/MappingSystem.java b/mappingservice/implementation/src/main/java/org/opendaylight/lispflowmapping/implementation/MappingSystem.java index 21ef0527..9751349b 100644 --- a/mappingservice/implementation/src/main/java/org/opendaylight/lispflowmapping/implementation/MappingSystem.java +++ b/mappingservice/implementation/src/main/java/org/opendaylight/lispflowmapping/implementation/MappingSystem.java @@ -9,7 +9,6 @@ package org.opendaylight.lispflowmapping.implementation; import static java.util.Objects.requireNonNull; -import com.google.common.collect.Sets; import java.util.ArrayList; import java.util.Collections; import java.util.Date; @@ -761,7 +760,7 @@ public class MappingSystem implements IMappingSystem { public synchronized void subscribe(Subscriber subscriber, Eid subscribedEid) { Set subscribers = getSubscribers(subscribedEid); if (subscribers == null) { - subscribers = Sets.newConcurrentHashSet(); + subscribers = ConcurrentHashMap.newKeySet(); } else if (subscribers.contains(subscriber)) { // If there is an entry already for this subscriber, remove it, so that it gets the new timestamp subscribers.remove(subscriber); diff --git a/mappingservice/implementation/src/main/java/org/opendaylight/lispflowmapping/implementation/util/MSNotificationInputUtil.java b/mappingservice/implementation/src/main/java/org/opendaylight/lispflowmapping/implementation/util/MSNotificationInputUtil.java index b51bac5a..5fa8d938 100644 --- a/mappingservice/implementation/src/main/java/org/opendaylight/lispflowmapping/implementation/util/MSNotificationInputUtil.java +++ b/mappingservice/implementation/src/main/java/org/opendaylight/lispflowmapping/implementation/util/MSNotificationInputUtil.java @@ -5,13 +5,12 @@ * 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.lispflowmapping.implementation.util; -import com.google.common.collect.Sets; import java.util.ArrayList; import java.util.List; import java.util.Set; +import java.util.concurrent.ConcurrentHashMap; import org.opendaylight.lispflowmapping.interfaces.dao.Subscriber; import org.opendaylight.yang.gen.v1.urn.opendaylight.lfm.lisp.proto.rev151105.eid.container.Eid; import org.opendaylight.yang.gen.v1.urn.opendaylight.lfm.lisp.proto.rev151105.mapping._record.container.MappingRecord; @@ -73,7 +72,7 @@ public final class MSNotificationInputUtil { if (subscribers == null) { return null; } - Set subscriberSet = Sets.newConcurrentHashSet(); + Set subscriberSet = ConcurrentHashMap.newKeySet(); for (SubscriberItem subscriber : subscribers) { subscriberSet.add(new Subscriber(subscriber.getSubscriberData())); } @@ -84,7 +83,7 @@ public final class MSNotificationInputUtil { if (subscribers == null) { return null; } - Set subscriberSet = Sets.newConcurrentHashSet(); + Set subscriberSet = ConcurrentHashMap.newKeySet(); for (DstSubscriberItem subscriber : subscribers) { subscriberSet.add(new Subscriber(subscriber.getSubscriberData())); } -- 2.34.1 From f0df0c8319763ae49b3b99f780338950a875318b Mon Sep 17 00:00:00 2001 From: Robert Varga Date: Wed, 30 Sep 2026 17:23:50 +0200 Subject: [PATCH 3/6] Migrate {Mapping.AugmenticationKey}DataListener Improve layout by importing static mock methods and use DataObjectIdentifiers instead of DataTreeIdentifier. Change-Id: Iff6d7388b41c4ca576ed2ab06d3ff5a197fa8133 Signed-off-by: Robert Varga --- .../AuthenticationKeyDataListenerTest.java | 117 +++++++------ .../mdsal/MappingDataListenerTest.java | 162 +++++++++--------- 2 files changed, 147 insertions(+), 132 deletions(-) diff --git a/mappingservice/implementation/src/test/java/org/opendaylight/lispflowmapping/implementation/mdsal/AuthenticationKeyDataListenerTest.java b/mappingservice/implementation/src/test/java/org/opendaylight/lispflowmapping/implementation/mdsal/AuthenticationKeyDataListenerTest.java index c80d8459..0edbe230 100644 --- a/mappingservice/implementation/src/test/java/org/opendaylight/lispflowmapping/implementation/mdsal/AuthenticationKeyDataListenerTest.java +++ b/mappingservice/implementation/src/test/java/org/opendaylight/lispflowmapping/implementation/mdsal/AuthenticationKeyDataListenerTest.java @@ -7,42 +7,36 @@ */ package org.opendaylight.lispflowmapping.implementation.mdsal; +import static org.mockito.Mockito.mock; +import static org.mockito.Mockito.spy; +import static org.mockito.Mockito.verify; +import static org.mockito.Mockito.when; + import java.util.List; import org.junit.Before; import org.junit.Test; -import org.mockito.Mockito; import org.opendaylight.lispflowmapping.interfaces.mapcache.IMappingSystem; import org.opendaylight.lispflowmapping.lisp.util.LispAddressUtil; import org.opendaylight.mdsal.binding.api.DataBroker; import org.opendaylight.mdsal.binding.api.DataObjectDeleted; import org.opendaylight.mdsal.binding.api.DataObjectModified; import org.opendaylight.mdsal.binding.api.DataObjectWritten; -import org.opendaylight.mdsal.binding.api.DataTreeIdentifier; import org.opendaylight.mdsal.binding.api.DataTreeModification; -import org.opendaylight.mdsal.common.api.LogicalDatastoreType; import org.opendaylight.yang.gen.v1.urn.opendaylight.lfm.lisp.proto.rev151105.eid.container.Eid; import org.opendaylight.yang.gen.v1.urn.opendaylight.lfm.lisp.proto.rev151105.mapping.authkey.container.MappingAuthkeyBuilder; import org.opendaylight.yang.gen.v1.urn.opendaylight.lfm.mappingservice.rev150906.EidUri; import org.opendaylight.yang.gen.v1.urn.opendaylight.lfm.mappingservice.rev150906.MappingDatabase; +import org.opendaylight.yang.gen.v1.urn.opendaylight.lfm.mappingservice.rev150906.VniUri; import org.opendaylight.yang.gen.v1.urn.opendaylight.lfm.mappingservice.rev150906.db.instance.AuthenticationKey; import org.opendaylight.yang.gen.v1.urn.opendaylight.lfm.mappingservice.rev150906.db.instance.AuthenticationKeyBuilder; import org.opendaylight.yang.gen.v1.urn.opendaylight.lfm.mappingservice.rev150906.db.instance.AuthenticationKeyKey; import org.opendaylight.yang.gen.v1.urn.opendaylight.lfm.mappingservice.rev150906.mapping.database.VirtualNetworkIdentifier; -import org.opendaylight.yangtools.binding.DataObjectReference; +import org.opendaylight.yang.gen.v1.urn.opendaylight.lfm.mappingservice.rev150906.mapping.database.VirtualNetworkIdentifierKey; +import org.opendaylight.yangtools.binding.DataObjectIdentifier; import org.opendaylight.yangtools.yang.common.Uint16; public class AuthenticationKeyDataListenerTest { - - private static IMappingSystem iMappingSystemMock; - private static AuthenticationKeyDataListener authenticationKeyDataListener; - - private static DataTreeModification change_del; - private static DataTreeModification change_subtreeModified; - private static DataTreeModification change_write; - private static DataObjectDeleted mod_del; - private static DataObjectModified mod_subtreeModified; - private static DataObjectWritten mod_write; - + private static final VirtualNetworkIdentifierKey VNI_KEY = new VirtualNetworkIdentifierKey(new VniUri("urn:foo")); private static final String IPV4_STRING_1 = "192.168.0.1"; private static final String IPV4_STRING_2 = "192.168.0.2"; private static final String IPV4_STRING_3 = "192.168.0.3"; @@ -53,30 +47,45 @@ public class AuthenticationKeyDataListenerTest { private static final AuthenticationKey AUTHENTICATION_KEY_2 = getAuthenticationKey(IPV4_EID_2, "pass2"); private static final AuthenticationKey AUTHENTICATION_KEY_3 = getAuthenticationKey(IPV4_EID_3, "pass3"); + private IMappingSystem mappingSystemMock; + private AuthenticationKeyDataListener authenticationKeyDataListener; + + private DataTreeModification changeDel; + private DataTreeModification changeSubtreeModified; + private DataTreeModification changeWrite; + private DataObjectDeleted modDel; + private DataObjectModified modSubtreeModified; + private DataObjectWritten modWrite; + @Before public void init() { - DataBroker dataBrokerMock = Mockito.mock(DataBroker.class); - iMappingSystemMock = Mockito.mock(IMappingSystem.class); - authenticationKeyDataListener = new AuthenticationKeyDataListener(dataBrokerMock, iMappingSystemMock); - - final DataTreeIdentifier dataTreeIdentifier = DataTreeIdentifier.of( - LogicalDatastoreType.CONFIGURATION, - DataObjectReference.builder(MappingDatabase.class).child(VirtualNetworkIdentifier.class) - .child(AuthenticationKey.class).build()); - - change_del = Mockito.mock(DataTreeModification.class); - change_subtreeModified = Mockito.mock(DataTreeModification.class); - change_write = Mockito.mock(DataTreeModification.class); - mod_del = Mockito.spy(DataObjectDeleted.class); - mod_subtreeModified = Mockito.spy(DataObjectModified.class); - mod_write = Mockito.spy(DataObjectWritten.class); - - Mockito.when(change_del.getRootPath()).thenReturn(dataTreeIdentifier); - Mockito.when(change_del.getRootNode()).thenReturn(mod_del); - Mockito.when(change_subtreeModified.getRootPath()).thenReturn(dataTreeIdentifier); - Mockito.when(change_subtreeModified.getRootNode()).thenReturn(mod_subtreeModified); - Mockito.when(change_write.getRootPath()).thenReturn(dataTreeIdentifier); - Mockito.when(change_write.getRootNode()).thenReturn(mod_write); + DataBroker dataBrokerMock = mock(DataBroker.class); + mappingSystemMock = mock(IMappingSystem.class); + authenticationKeyDataListener = new AuthenticationKeyDataListener(dataBrokerMock, mappingSystemMock); + + changeDel = mock(DataTreeModification.class); + modDel = spy(DataObjectDeleted.class); + when(changeDel.path()).thenReturn(DataObjectIdentifier.builder(MappingDatabase.class) + .child(VirtualNetworkIdentifier.class, VNI_KEY) + .child(AuthenticationKey.class, AUTHENTICATION_KEY_1.key()) + .build()); + when(changeDel.getRootNode()).thenReturn(modDel); + + changeSubtreeModified = mock(DataTreeModification.class); + modSubtreeModified = spy(DataObjectModified.class); + when(changeSubtreeModified.path()).thenReturn(DataObjectIdentifier.builder(MappingDatabase.class) + .child(VirtualNetworkIdentifier.class, VNI_KEY) + .child(AuthenticationKey.class, AUTHENTICATION_KEY_3.key()) + .build()); + when(changeSubtreeModified.getRootNode()).thenReturn(modSubtreeModified); + + changeWrite = mock(DataTreeModification.class); + modWrite = spy(DataObjectWritten.class); + when(changeWrite.path()).thenReturn(DataObjectIdentifier.builder(MappingDatabase.class) + .child(VirtualNetworkIdentifier.class, VNI_KEY) + .child(AuthenticationKey.class, AUTHENTICATION_KEY_2.key()) + .build()); + when(changeWrite.getRootNode()).thenReturn(modWrite); } /** @@ -84,10 +93,10 @@ public class AuthenticationKeyDataListenerTest { */ @Test public void onDataTreeChangedTest_delete() { - Mockito.when(mod_del.dataBefore()).thenReturn(AUTHENTICATION_KEY_1); + when(modDel.dataBefore()).thenReturn(AUTHENTICATION_KEY_1); - authenticationKeyDataListener.onDataTreeChanged(List.of(change_del)); - Mockito.verify(iMappingSystemMock).removeAuthenticationKey(IPV4_EID_1); + authenticationKeyDataListener.onDataTreeChanged(List.of(changeDel)); + verify(mappingSystemMock).removeAuthenticationKey(IPV4_EID_1); } /** @@ -95,10 +104,10 @@ public class AuthenticationKeyDataListenerTest { */ @Test public void onDataTreeChangedTest_write() { - Mockito.when(mod_write.dataAfter()).thenReturn(AUTHENTICATION_KEY_2); + when(modWrite.dataAfter()).thenReturn(AUTHENTICATION_KEY_2); - authenticationKeyDataListener.onDataTreeChanged(List.of(change_write)); - Mockito.verify(iMappingSystemMock).addAuthenticationKey(IPV4_EID_2, AUTHENTICATION_KEY_2.getMappingAuthkey()); + authenticationKeyDataListener.onDataTreeChanged(List.of(changeWrite)); + verify(mappingSystemMock).addAuthenticationKey(IPV4_EID_2, AUTHENTICATION_KEY_2.getMappingAuthkey()); } /** @@ -106,10 +115,10 @@ public class AuthenticationKeyDataListenerTest { */ @Test public void onDataTreeChangedTest_subtreeModified() { - Mockito.when(mod_subtreeModified.dataAfter()).thenReturn(AUTHENTICATION_KEY_3); + when(modSubtreeModified.dataAfter()).thenReturn(AUTHENTICATION_KEY_3); - authenticationKeyDataListener.onDataTreeChanged(List.of(change_subtreeModified)); - Mockito.verify(iMappingSystemMock).addAuthenticationKey(IPV4_EID_3, AUTHENTICATION_KEY_3.getMappingAuthkey()); + authenticationKeyDataListener.onDataTreeChanged(List.of(changeSubtreeModified)); + verify(mappingSystemMock).addAuthenticationKey(IPV4_EID_3, AUTHENTICATION_KEY_3.getMappingAuthkey()); } /** @@ -117,14 +126,14 @@ public class AuthenticationKeyDataListenerTest { */ @Test public void onDataTreeChangedTest_multipleModTypes() { - Mockito.when(mod_del.dataBefore()).thenReturn(AUTHENTICATION_KEY_1); - Mockito.when(mod_write.dataAfter()).thenReturn(AUTHENTICATION_KEY_2); - Mockito.when(mod_subtreeModified.dataAfter()).thenReturn(AUTHENTICATION_KEY_3); - - authenticationKeyDataListener.onDataTreeChanged(List.of(change_del, change_write, change_subtreeModified)); - Mockito.verify(iMappingSystemMock).removeAuthenticationKey(IPV4_EID_1); - Mockito.verify(iMappingSystemMock).addAuthenticationKey(IPV4_EID_2, AUTHENTICATION_KEY_2.getMappingAuthkey()); - Mockito.verify(iMappingSystemMock).addAuthenticationKey(IPV4_EID_3, AUTHENTICATION_KEY_3.getMappingAuthkey()); + when(modDel.dataBefore()).thenReturn(AUTHENTICATION_KEY_1); + when(modWrite.dataAfter()).thenReturn(AUTHENTICATION_KEY_2); + when(modSubtreeModified.dataAfter()).thenReturn(AUTHENTICATION_KEY_3); + + authenticationKeyDataListener.onDataTreeChanged(List.of(changeDel, changeWrite, changeSubtreeModified)); + verify(mappingSystemMock).removeAuthenticationKey(IPV4_EID_1); + verify(mappingSystemMock).addAuthenticationKey(IPV4_EID_2, AUTHENTICATION_KEY_2.getMappingAuthkey()); + verify(mappingSystemMock).addAuthenticationKey(IPV4_EID_3, AUTHENTICATION_KEY_3.getMappingAuthkey()); } private static AuthenticationKey getAuthenticationKey(final Eid eid, final String password) { diff --git a/mappingservice/implementation/src/test/java/org/opendaylight/lispflowmapping/implementation/mdsal/MappingDataListenerTest.java b/mappingservice/implementation/src/test/java/org/opendaylight/lispflowmapping/implementation/mdsal/MappingDataListenerTest.java index e753c3f7..2b939c75 100644 --- a/mappingservice/implementation/src/test/java/org/opendaylight/lispflowmapping/implementation/mdsal/MappingDataListenerTest.java +++ b/mappingservice/implementation/src/test/java/org/opendaylight/lispflowmapping/implementation/mdsal/MappingDataListenerTest.java @@ -7,14 +7,20 @@ */ package org.opendaylight.lispflowmapping.implementation.mdsal; -import static org.junit.Assert.assertEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.mockito.ArgumentMatchers.eq; +import static org.mockito.Mockito.mock; +import static org.mockito.Mockito.spy; +import static org.mockito.Mockito.verify; +import static org.mockito.Mockito.verifyNoMoreInteractions; +import static org.mockito.Mockito.verifyZeroInteractions; +import static org.mockito.Mockito.when; import java.util.List; import org.junit.Before; import org.junit.Ignore; import org.junit.Test; import org.mockito.ArgumentCaptor; -import org.mockito.Mockito; import org.opendaylight.lispflowmapping.implementation.util.MSNotificationInputUtil; import org.opendaylight.lispflowmapping.interfaces.mapcache.IMappingSystem; import org.opendaylight.lispflowmapping.lisp.type.MappingData; @@ -24,10 +30,8 @@ import org.opendaylight.mdsal.binding.api.DataBroker; import org.opendaylight.mdsal.binding.api.DataObjectDeleted; import org.opendaylight.mdsal.binding.api.DataObjectModified; import org.opendaylight.mdsal.binding.api.DataObjectWritten; -import org.opendaylight.mdsal.binding.api.DataTreeIdentifier; import org.opendaylight.mdsal.binding.api.DataTreeModification; import org.opendaylight.mdsal.binding.api.NotificationPublishService; -import org.opendaylight.mdsal.common.api.LogicalDatastoreType; import org.opendaylight.yang.gen.v1.urn.opendaylight.lfm.lisp.proto.rev151105.eid.container.Eid; import org.opendaylight.yang.gen.v1.urn.opendaylight.lfm.lisp.proto.rev151105.mapping._record.container.MappingRecord; import org.opendaylight.yang.gen.v1.urn.opendaylight.lfm.lisp.proto.rev151105.mapping._record.container.MappingRecordBuilder; @@ -36,25 +40,16 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.lfm.mappingservice.rev15090 import org.opendaylight.yang.gen.v1.urn.opendaylight.lfm.mappingservice.rev150906.MappingChanged; import org.opendaylight.yang.gen.v1.urn.opendaylight.lfm.mappingservice.rev150906.MappingDatabase; import org.opendaylight.yang.gen.v1.urn.opendaylight.lfm.mappingservice.rev150906.MappingOrigin; +import org.opendaylight.yang.gen.v1.urn.opendaylight.lfm.mappingservice.rev150906.VniUri; import org.opendaylight.yang.gen.v1.urn.opendaylight.lfm.mappingservice.rev150906.db.instance.Mapping; import org.opendaylight.yang.gen.v1.urn.opendaylight.lfm.mappingservice.rev150906.db.instance.MappingBuilder; import org.opendaylight.yang.gen.v1.urn.opendaylight.lfm.mappingservice.rev150906.db.instance.MappingKey; import org.opendaylight.yang.gen.v1.urn.opendaylight.lfm.mappingservice.rev150906.mapping.database.VirtualNetworkIdentifier; -import org.opendaylight.yangtools.binding.DataObjectReference; +import org.opendaylight.yang.gen.v1.urn.opendaylight.lfm.mappingservice.rev150906.mapping.database.VirtualNetworkIdentifierKey; +import org.opendaylight.yangtools.binding.DataObjectIdentifier; public class MappingDataListenerTest { - private static IMappingSystem iMappingSystemMock; - private static NotificationPublishService notificationPublishServiceMock; - - private static DataTreeModification change_del; - private static DataTreeModification change_subtreeModified; - private static DataTreeModification change_write; - private static DataObjectDeleted mod_del; - private static DataObjectModified mod_subtreeModified; - private static DataObjectWritten mod_write; - - private static MappingDataListener mappingDataListener; - + private static final VirtualNetworkIdentifierKey VNI_KEY = new VirtualNetworkIdentifierKey(new VniUri("urn:foo")); private static final String IPV4_STRING_1 = "192.168.0.1"; private static final String IPV4_STRING_2 = "192.168.0.2"; private static final String IPV4_STRING_3 = "192.168.0.3"; @@ -69,35 +64,49 @@ public class MappingDataListenerTest { private static final Mapping MAPPING_EID_3_NB = getDefaultMapping(IPV4_EID_3, MappingOrigin.Northbound); private static final Mapping MAPPING_EID_3_SB = getDefaultMapping(IPV4_EID_3, MappingOrigin.Southbound); + private IMappingSystem mappingSystemMock; + private NotificationPublishService notificationPublishServiceMock; + + private DataTreeModification changeDel; + private DataTreeModification changeSubtreeModified; + private DataTreeModification changeWrite; + private DataObjectDeleted modDel; + private DataObjectModified modSubtreeModified; + private DataObjectWritten modWrite; + + private MappingDataListener mappingDataListener; + @Before public void init() { - final DataBroker dataBrokerMock = Mockito.mock(DataBroker.class); - iMappingSystemMock = Mockito.mock(IMappingSystem.class); - notificationPublishServiceMock = Mockito.mock(NotificationPublishService .class); + final DataBroker dataBrokerMock = mock(DataBroker.class); + mappingSystemMock = mock(IMappingSystem.class); + notificationPublishServiceMock = mock(NotificationPublishService .class); mappingDataListener = - new MappingDataListener(dataBrokerMock, iMappingSystemMock, notificationPublishServiceMock); - - final DataTreeIdentifier dataTreeIdentifier = DataTreeIdentifier.of( - LogicalDatastoreType.CONFIGURATION, - DataObjectReference.builder(MappingDatabase.class) - .child(VirtualNetworkIdentifier.class) - .child(Mapping.class) - .build()); - - change_del = Mockito.mock(DataTreeModification.class); - change_subtreeModified = Mockito.mock(DataTreeModification.class); - change_write = Mockito.mock(DataTreeModification.class); - mod_del = Mockito.spy(DataObjectDeleted.class); - mod_subtreeModified = Mockito.spy(DataObjectModified.class); - mod_write = Mockito.spy(DataObjectWritten.class); - - Mockito.when(change_del.getRootPath()).thenReturn(dataTreeIdentifier); - Mockito.when(change_del.getRootNode()).thenReturn(mod_del); - Mockito.when(change_subtreeModified.getRootPath()).thenReturn(dataTreeIdentifier); - Mockito.when(change_subtreeModified.getRootNode()).thenReturn(mod_subtreeModified); - Mockito.when(change_write.getRootPath()).thenReturn(dataTreeIdentifier); - Mockito.when(change_write.getRootNode()).thenReturn(mod_write); - Mockito.when(iMappingSystemMock.isMaster()).thenReturn(true); + new MappingDataListener(dataBrokerMock, mappingSystemMock, notificationPublishServiceMock); + + changeDel = mock(DataTreeModification.class); + changeSubtreeModified = mock(DataTreeModification.class); + changeWrite = mock(DataTreeModification.class); + modDel = spy(DataObjectDeleted.class); + modSubtreeModified = spy(DataObjectModified.class); + modWrite = spy(DataObjectWritten.class); + + when(changeDel.path()).thenReturn(DataObjectIdentifier.builder(MappingDatabase.class) + .child(VirtualNetworkIdentifier.class, VNI_KEY) + .child(Mapping.class, MAPPING_EID_1_NB.key()) + .build()); + when(changeDel.getRootNode()).thenReturn(modDel); + when(changeSubtreeModified.path()).thenReturn(DataObjectIdentifier.builder(MappingDatabase.class) + .child(VirtualNetworkIdentifier.class, VNI_KEY) + .child(Mapping.class, MAPPING_EID_2_NB.key()) + .build()); + when(changeSubtreeModified.getRootNode()).thenReturn(modSubtreeModified); + when(changeWrite.path()).thenReturn(DataObjectIdentifier.builder(MappingDatabase.class) + .child(VirtualNetworkIdentifier.class, VNI_KEY) + .child(Mapping.class, MAPPING_EID_3_NB.key()) + .build()); + when(changeWrite.getRootNode()).thenReturn(modWrite); + when(mappingSystemMock.isMaster()).thenReturn(true); } /** @@ -105,11 +114,11 @@ public class MappingDataListenerTest { */ @Test public void onDataTreeChangedTest_delete_NB() throws InterruptedException { - final List> changes = List.of(change_del); - Mockito.when(mod_del.dataBefore()).thenReturn(MAPPING_EID_1_NB); + final List> changes = List.of(changeDel); + when(modDel.dataBefore()).thenReturn(MAPPING_EID_1_NB); mappingDataListener.onDataTreeChanged(changes); - Mockito.verify(iMappingSystemMock).removeMapping(MappingOrigin.Northbound, IPV4_EID_1); + verify(mappingSystemMock).removeMapping(MappingOrigin.Northbound, IPV4_EID_1); } /** @@ -117,12 +126,12 @@ public class MappingDataListenerTest { */ @Test public void onDataTreeChangedTest_delete_SB() { - final List> changes = List.of(change_del); - Mockito.when(mod_del.dataBefore()).thenReturn(MAPPING_EID_1_SB); + final List> changes = List.of(changeDel); + when(modDel.dataBefore()).thenReturn(MAPPING_EID_1_SB); mappingDataListener.onDataTreeChanged(changes); - //Mockito.verifyZeroInteractions(iMappingSystemMock); - Mockito.verifyZeroInteractions(notificationPublishServiceMock); + //verifyZeroInteractions(iMappingSystemMock); + verifyZeroInteractions(notificationPublishServiceMock); } /** @@ -132,17 +141,16 @@ public class MappingDataListenerTest { @Test @Ignore public void onDataTreeChangedTest_subtreeModified_NB() throws InterruptedException { - final List> changes = List.of(change_subtreeModified); + final List> changes = List.of(changeSubtreeModified); final MappingChanged mapChanged = MSNotificationInputUtil.toMappingChanged( MAPPING_EID_2_NB.getMappingRecord(), null, null, null, MappingChange.Updated); - Mockito.when(mod_subtreeModified.dataAfter()).thenReturn(MAPPING_EID_2_NB); + when(modSubtreeModified.dataAfter()).thenReturn(MAPPING_EID_2_NB); mappingDataListener.onDataTreeChanged(changes); final ArgumentCaptor captor = ArgumentCaptor.forClass(MappingData.class); - Mockito.verify(iMappingSystemMock) - .addMapping(Mockito.eq(MappingOrigin.Northbound), Mockito.eq(IPV4_EID_2), captor.capture()); + verify(mappingSystemMock).addMapping(eq(MappingOrigin.Northbound), eq(IPV4_EID_2), captor.capture()); assertEquals(captor.getValue().getRecord(), MAPPING_EID_2_NB.getMappingRecord()); - Mockito.verify(notificationPublishServiceMock).putNotification(mapChanged); + verify(notificationPublishServiceMock).putNotification(mapChanged); } /** @@ -151,12 +159,12 @@ public class MappingDataListenerTest { */ @Test public void onDataTreeChangedTest_subtreeModified_SB() { - final List> changes = List.of(change_subtreeModified); - Mockito.when(mod_subtreeModified.dataAfter()).thenReturn(MAPPING_EID_2_SB); + final List> changes = List.of(changeSubtreeModified); + when(modSubtreeModified.dataAfter()).thenReturn(MAPPING_EID_2_SB); mappingDataListener.onDataTreeChanged(changes); - //Mockito.verifyZeroInteractions(iMappingSystemMock); - Mockito.verifyZeroInteractions(notificationPublishServiceMock); + //verifyZeroInteractions(iMappingSystemMock); + verifyZeroInteractions(notificationPublishServiceMock); } /** @@ -165,17 +173,16 @@ public class MappingDataListenerTest { @Test @Ignore public void onDataTreeChangedTest_write_NB() throws InterruptedException { - final List> changes = List.of(change_write); + final List> changes = List.of(changeWrite); final MappingChanged mapChanged = MSNotificationInputUtil.toMappingChanged( MAPPING_EID_3_NB.getMappingRecord(), null, null, null, MappingChange.Created); - Mockito.when(mod_write.dataAfter()).thenReturn(MAPPING_EID_3_NB); + when(modWrite.dataAfter()).thenReturn(MAPPING_EID_3_NB); mappingDataListener.onDataTreeChanged(changes); final ArgumentCaptor captor = ArgumentCaptor.forClass(MappingData.class); - Mockito.verify(iMappingSystemMock) - .addMapping(Mockito.eq(MappingOrigin.Northbound), Mockito.eq(IPV4_EID_3), captor.capture()); + verify(mappingSystemMock).addMapping(eq(MappingOrigin.Northbound), eq(IPV4_EID_3), captor.capture()); assertEquals(captor.getValue().getRecord(), MAPPING_EID_3_NB.getMappingRecord()); - Mockito.verify(notificationPublishServiceMock).putNotification(mapChanged); + verify(notificationPublishServiceMock).putNotification(mapChanged); } /** @@ -183,12 +190,12 @@ public class MappingDataListenerTest { */ @Test public void onDataTreeChangedTest_write_SB() { - final List> changes = List.of(change_write); - Mockito.when(mod_write.dataAfter()).thenReturn(MAPPING_EID_3_SB); + final List> changes = List.of(changeWrite); + when(modWrite.dataAfter()).thenReturn(MAPPING_EID_3_SB); mappingDataListener.onDataTreeChanged(changes); - //Mockito.verifyZeroInteractions(iMappingSystemMock); - Mockito.verifyZeroInteractions(notificationPublishServiceMock); + //verifyZeroInteractions(iMappingSystemMock); + verifyZeroInteractions(notificationPublishServiceMock); } /** @@ -198,23 +205,22 @@ public class MappingDataListenerTest { @Ignore public void onDataTreeChangedTest_multipleChanges() throws InterruptedException { final List> changes = - List.of(change_del, change_subtreeModified, change_write); + List.of(changeDel, changeSubtreeModified, changeWrite); final MappingChanged mapChangedSubtreeMod = MSNotificationInputUtil.toMappingChanged( MAPPING_EID_2_NB.getMappingRecord(), null, null, null, MappingChange.Updated); - Mockito.when(mod_del.dataBefore()).thenReturn(MAPPING_EID_1_NB); - Mockito.when(mod_subtreeModified.dataAfter()).thenReturn(MAPPING_EID_2_NB); - Mockito.when(mod_write.dataAfter()).thenReturn(MAPPING_EID_3_SB); + when(modDel.dataBefore()).thenReturn(MAPPING_EID_1_NB); + when(modSubtreeModified.dataAfter()).thenReturn(MAPPING_EID_2_NB); + when(modWrite.dataAfter()).thenReturn(MAPPING_EID_3_SB); mappingDataListener.onDataTreeChanged(changes); final ArgumentCaptor captor = ArgumentCaptor.forClass(MappingData.class); - Mockito.verify(iMappingSystemMock).removeMapping(MappingOrigin.Northbound, IPV4_EID_1); - Mockito.verify(iMappingSystemMock) - .addMapping(Mockito.eq(MappingOrigin.Northbound), Mockito.eq(IPV4_EID_2), captor.capture()); + verify(mappingSystemMock).removeMapping(MappingOrigin.Northbound, IPV4_EID_1); + verify(mappingSystemMock).addMapping(eq(MappingOrigin.Northbound), eq(IPV4_EID_2), captor.capture()); assertEquals(captor.getValue().getRecord(), MAPPING_EID_2_NB.getMappingRecord()); - Mockito.verify(notificationPublishServiceMock).putNotification(mapChangedSubtreeMod); - //Mockito.verifyNoMoreInteractions(iMappingSystemMock); - Mockito.verifyNoMoreInteractions(notificationPublishServiceMock); + verify(notificationPublishServiceMock).putNotification(mapChangedSubtreeMod); + //verifyNoMoreInteractions(iMappingSystemMock); + verifyNoMoreInteractions(notificationPublishServiceMock); } private static Mapping getDefaultMapping(final Eid eid, final MappingOrigin origin) { -- 2.34.1 From 8b42fa0d1c73871b656a0b32e96856d5cf19819c Mon Sep 17 00:00:00 2001 From: Robert Varga Date: Sat, 22 Aug 2026 10:12:06 +0200 Subject: [PATCH 4/6] Bump upstreams Adopt: - odlparent-14.3.7 - infrautils-7.1.14 - yangtools-15.1.5 - ietf-2.0.6 - mdsal-16.0.6 - controller-13.0.4 - aaa-0.23.4 - netconf-11.0.1 Change-Id: I36e20fe1bb70fd8c70161a2de379cd34912a0a2a Signed-off-by: Robert Varga --- artifacts/pom.xml | 2 +- commons/parent/pom.xml | 6 +++--- features/features-lispflowmapping/pom.xml | 2 +- features/odl-lispflowmapping-inmemorydb/pom.xml | 4 ++-- features/odl-lispflowmapping-mappingservice-shell/pom.xml | 2 +- features/odl-lispflowmapping-mappingservice/pom.xml | 4 ++-- features/odl-lispflowmapping-models/pom.xml | 4 ++-- features/odl-lispflowmapping-msmr/pom.xml | 2 +- features/odl-lispflowmapping-southbound/pom.xml | 6 +++--- features/pom.xml | 2 +- integrationtest/pom.xml | 2 +- lispflowmapping-karaf/pom.xml | 2 +- mappingservice/api/pom.xml | 2 +- mappingservice/lisp-proto/pom.xml | 2 +- mappingservice/pom.xml | 4 ++-- 15 files changed, 23 insertions(+), 23 deletions(-) diff --git a/artifacts/pom.xml b/artifacts/pom.xml index adba6522..aaf7760e 100644 --- a/artifacts/pom.xml +++ b/artifacts/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 + 14.3.7 diff --git a/commons/parent/pom.xml b/commons/parent/pom.xml index cfa90df7..62dcad7f 100644 --- a/commons/parent/pom.xml +++ b/commons/parent/pom.xml @@ -15,7 +15,7 @@ for plugin configuration etc. --> org.opendaylight.odlparent odlparent - 14.3.1 + 14.3.7 @@ -37,14 +37,14 @@ org.opendaylight.mdsal mdsal-artifacts - 16.0.3 + 16.0.6 pom import org.opendaylight.controller controller-artifacts - 13.0.2 + 13.0.4 pom import diff --git a/features/features-lispflowmapping/pom.xml b/features/features-lispflowmapping/pom.xml index 9306baa1..72c5ec73 100644 --- a/features/features-lispflowmapping/pom.xml +++ b/features/features-lispflowmapping/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 + 14.3.7 diff --git a/features/odl-lispflowmapping-inmemorydb/pom.xml b/features/odl-lispflowmapping-inmemorydb/pom.xml index eda3cae6..507d1a5c 100644 --- a/features/odl-lispflowmapping-inmemorydb/pom.xml +++ b/features/odl-lispflowmapping-inmemorydb/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 + 14.3.7 @@ -29,7 +29,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html org.opendaylight.controller controller-artifacts - 13.0.2 + 13.0.4 pom import diff --git a/features/odl-lispflowmapping-mappingservice-shell/pom.xml b/features/odl-lispflowmapping-mappingservice-shell/pom.xml index bea9365f..697692d0 100644 --- a/features/odl-lispflowmapping-mappingservice-shell/pom.xml +++ b/features/odl-lispflowmapping-mappingservice-shell/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 + 14.3.7 diff --git a/features/odl-lispflowmapping-mappingservice/pom.xml b/features/odl-lispflowmapping-mappingservice/pom.xml index a3d5f7f4..88796fd3 100644 --- a/features/odl-lispflowmapping-mappingservice/pom.xml +++ b/features/odl-lispflowmapping-mappingservice/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 + 14.3.7 @@ -29,7 +29,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html org.opendaylight.netconf netconf-artifacts - 11.0.0 + 11.0.1 import pom diff --git a/features/odl-lispflowmapping-models/pom.xml b/features/odl-lispflowmapping-models/pom.xml index 6718766d..7e7ad79a 100644 --- a/features/odl-lispflowmapping-models/pom.xml +++ b/features/odl-lispflowmapping-models/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 + 14.3.7 @@ -29,7 +29,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html org.opendaylight.ietf ietf-artifacts - 2.0.2 + 2.0.6 pom import diff --git a/features/odl-lispflowmapping-msmr/pom.xml b/features/odl-lispflowmapping-msmr/pom.xml index 024df4d0..eba59e36 100644 --- a/features/odl-lispflowmapping-msmr/pom.xml +++ b/features/odl-lispflowmapping-msmr/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 + 14.3.7 diff --git a/features/odl-lispflowmapping-southbound/pom.xml b/features/odl-lispflowmapping-southbound/pom.xml index 1605b456..705be2a9 100644 --- a/features/odl-lispflowmapping-southbound/pom.xml +++ b/features/odl-lispflowmapping-southbound/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 + 14.3.7 @@ -29,14 +29,14 @@ and is available at http://www.eclipse.org/legal/epl-v10.html org.opendaylight.controller controller-artifacts - 13.0.2 + 13.0.4 import pom org.opendaylight.netconf netconf-artifacts - 11.0.0 + 11.0.1 import pom diff --git a/features/pom.xml b/features/pom.xml index 15e84aa6..294cf0a2 100644 --- a/features/pom.xml +++ b/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 + 14.3.7 diff --git a/integrationtest/pom.xml b/integrationtest/pom.xml index 438797da..7383ebd3 100644 --- a/integrationtest/pom.xml +++ b/integrationtest/pom.xml @@ -11,7 +11,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html org.opendaylight.controller mdsal-it-parent - 13.0.2 + 13.0.4 diff --git a/lispflowmapping-karaf/pom.xml b/lispflowmapping-karaf/pom.xml index 096f324d..a98826f4 100644 --- a/lispflowmapping-karaf/pom.xml +++ b/lispflowmapping-karaf/pom.xml @@ -12,7 +12,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html org.opendaylight.odlparent karaf4-parent - 14.3.1 + 14.3.7 diff --git a/mappingservice/api/pom.xml b/mappingservice/api/pom.xml index 36d1b9d8..744ebdf9 100644 --- a/mappingservice/api/pom.xml +++ b/mappingservice/api/pom.xml @@ -5,7 +5,7 @@ org.opendaylight.mdsal binding-parent - 16.0.3 + 16.0.6 diff --git a/mappingservice/lisp-proto/pom.xml b/mappingservice/lisp-proto/pom.xml index cf789c1b..8a5c5178 100644 --- a/mappingservice/lisp-proto/pom.xml +++ b/mappingservice/lisp-proto/pom.xml @@ -12,7 +12,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html org.opendaylight.mdsal binding-parent - 16.0.3 + 16.0.6 diff --git a/mappingservice/pom.xml b/mappingservice/pom.xml index 018de647..0cfbcbdd 100644 --- a/mappingservice/pom.xml +++ b/mappingservice/pom.xml @@ -5,7 +5,7 @@ org.opendaylight.odlparent odlparent - 14.3.1 + 14.3.7 @@ -37,7 +37,7 @@ org.opendaylight.mdsal mdsal-artifacts - 16.0.3 + 16.0.6 pom import -- 2.34.1 From 91038bdc69a82f4be5ba267964eb68c03af99f6a Mon Sep 17 00:00:00 2001 From: Robert Varga Date: Sun, 27 Sep 2026 20:50:49 +0200 Subject: [PATCH 5/6] 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 - netconf-12.0.0 Change-Id: I24a72e2c288a734e02182df636b0c4d7a1c2afa6 Signed-off-by: Robert Varga --- artifacts/pom.xml | 2 +- commons/parent/pom.xml | 6 +++--- features/features-lispflowmapping/pom.xml | 2 +- features/odl-lispflowmapping-inmemorydb/pom.xml | 4 ++-- .../src/main/feature/feature.xml | 2 +- features/odl-lispflowmapping-mappingservice-shell/pom.xml | 2 +- features/odl-lispflowmapping-mappingservice/pom.xml | 6 +++--- .../src/main/feature/feature.xml | 2 +- features/odl-lispflowmapping-models/pom.xml | 4 ++-- .../src/main/feature/feature.xml | 4 ++-- features/odl-lispflowmapping-msmr/pom.xml | 2 +- features/odl-lispflowmapping-southbound/pom.xml | 8 ++++---- .../src/main/feature/feature.xml | 6 +++--- features/pom.xml | 2 +- integrationtest/pom.xml | 2 +- lispflowmapping-karaf/pom.xml | 2 +- mappingservice/api/pom.xml | 2 +- .../interfaces/mapcache/IMappingSystem.java | 1 + .../lispflowmapping/dsbackend/DataStoreBackEndTest.java | 2 +- .../lispflowmapping/inmemorydb/radixtrie/RadixTrie.java | 1 + mappingservice/lisp-proto/pom.xml | 2 +- .../java/org/opendaylight/lispflowmapping/TestUtils.java | 4 ++-- mappingservice/pom.xml | 4 ++-- 23 files changed, 37 insertions(+), 35 deletions(-) diff --git a/artifacts/pom.xml b/artifacts/pom.xml index aaf7760e..a79332c8 100644 --- a/artifacts/pom.xml +++ b/artifacts/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.7 + 15.0.2 diff --git a/commons/parent/pom.xml b/commons/parent/pom.xml index 62dcad7f..1360a475 100644 --- a/commons/parent/pom.xml +++ b/commons/parent/pom.xml @@ -15,7 +15,7 @@ for plugin configuration etc. --> org.opendaylight.odlparent odlparent - 14.3.7 + 15.0.2 @@ -37,14 +37,14 @@ org.opendaylight.mdsal mdsal-artifacts - 16.0.6 + 17.0.1 pom import org.opendaylight.controller controller-artifacts - 13.0.4 + 14.0.2 pom import diff --git a/features/features-lispflowmapping/pom.xml b/features/features-lispflowmapping/pom.xml index 72c5ec73..07e21c0c 100644 --- a/features/features-lispflowmapping/pom.xml +++ b/features/features-lispflowmapping/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.7 + 15.0.2 diff --git a/features/odl-lispflowmapping-inmemorydb/pom.xml b/features/odl-lispflowmapping-inmemorydb/pom.xml index 507d1a5c..d058e9a9 100644 --- a/features/odl-lispflowmapping-inmemorydb/pom.xml +++ b/features/odl-lispflowmapping-inmemorydb/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.7 + 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.4 + 14.0.2 pom import diff --git a/features/odl-lispflowmapping-inmemorydb/src/main/feature/feature.xml b/features/odl-lispflowmapping-inmemorydb/src/main/feature/feature.xml index c80e457b..0c7f1dca 100644 --- a/features/odl-lispflowmapping-inmemorydb/src/main/feature/feature.xml +++ b/features/odl-lispflowmapping-inmemorydb/src/main/feature/feature.xml @@ -8,6 +8,6 @@ and is available at http://www.eclipse.org/legal/epl-v10.html INTERNAL --> - odl-mdsal-broker + odl-mdsal-broker diff --git a/features/odl-lispflowmapping-mappingservice-shell/pom.xml b/features/odl-lispflowmapping-mappingservice-shell/pom.xml index 697692d0..29529049 100644 --- a/features/odl-lispflowmapping-mappingservice-shell/pom.xml +++ b/features/odl-lispflowmapping-mappingservice-shell/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.7 + 15.0.2 diff --git a/features/odl-lispflowmapping-mappingservice/pom.xml b/features/odl-lispflowmapping-mappingservice/pom.xml index 88796fd3..1af4e0fa 100644 --- a/features/odl-lispflowmapping-mappingservice/pom.xml +++ b/features/odl-lispflowmapping-mappingservice/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.7 + 15.0.2 @@ -29,7 +29,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html org.opendaylight.netconf netconf-artifacts - 11.0.1 + 12.0.1 import pom @@ -39,7 +39,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/features/odl-lispflowmapping-mappingservice/src/main/feature/feature.xml b/features/odl-lispflowmapping-mappingservice/src/main/feature/feature.xml index 2eda785a..c4b8a163 100644 --- a/features/odl-lispflowmapping-mappingservice/src/main/feature/feature.xml +++ b/features/odl-lispflowmapping-mappingservice/src/main/feature/feature.xml @@ -8,6 +8,6 @@ and is available at http://www.eclipse.org/legal/epl-v10.html INTERNAL --> - odl-restconf + odl-restconf-nb diff --git a/features/odl-lispflowmapping-models/pom.xml b/features/odl-lispflowmapping-models/pom.xml index 7e7ad79a..c95a988c 100644 --- a/features/odl-lispflowmapping-models/pom.xml +++ b/features/odl-lispflowmapping-models/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.7 + 15.0.2 @@ -29,7 +29,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html org.opendaylight.ietf ietf-artifacts - 2.0.6 + 3.0.1 pom import diff --git a/features/odl-lispflowmapping-models/src/main/feature/feature.xml b/features/odl-lispflowmapping-models/src/main/feature/feature.xml index 588404ea..15e17670 100644 --- a/features/odl-lispflowmapping-models/src/main/feature/feature.xml +++ b/features/odl-lispflowmapping-models/src/main/feature/feature.xml @@ -8,7 +8,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html INTERNAL --> - odl-apache-commons-lang3 - odl-ietf-model-rfc6991 + odl-apache-commons-lang3 + odl-ietf-model-rfc6991 diff --git a/features/odl-lispflowmapping-msmr/pom.xml b/features/odl-lispflowmapping-msmr/pom.xml index eba59e36..87c0e808 100644 --- a/features/odl-lispflowmapping-msmr/pom.xml +++ b/features/odl-lispflowmapping-msmr/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.7 + 15.0.2 diff --git a/features/odl-lispflowmapping-southbound/pom.xml b/features/odl-lispflowmapping-southbound/pom.xml index 705be2a9..388d9299 100644 --- a/features/odl-lispflowmapping-southbound/pom.xml +++ b/features/odl-lispflowmapping-southbound/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.7 + 15.0.2 @@ -29,14 +29,14 @@ and is available at http://www.eclipse.org/legal/epl-v10.html org.opendaylight.controller controller-artifacts - 13.0.4 + 14.0.2 import pom org.opendaylight.netconf netconf-artifacts - 11.0.1 + 12.0.1 import pom @@ -52,7 +52,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/features/odl-lispflowmapping-southbound/src/main/feature/feature.xml b/features/odl-lispflowmapping-southbound/src/main/feature/feature.xml index 460fea30..0e8015ca 100644 --- a/features/odl-lispflowmapping-southbound/src/main/feature/feature.xml +++ b/features/odl-lispflowmapping-southbound/src/main/feature/feature.xml @@ -8,8 +8,8 @@ and is available at http://www.eclipse.org/legal/epl-v10.html INTERNAL --> - odl-netty-4 - odl-mdsal-broker - odl-restconf + odl-netty-4 + odl-mdsal-broker + odl-restconf-nb diff --git a/features/pom.xml b/features/pom.xml index 294cf0a2..14800e54 100644 --- a/features/pom.xml +++ b/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.7 + 15.0.2 diff --git a/integrationtest/pom.xml b/integrationtest/pom.xml index 7383ebd3..445d45e6 100644 --- a/integrationtest/pom.xml +++ b/integrationtest/pom.xml @@ -11,7 +11,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html org.opendaylight.controller mdsal-it-parent - 13.0.4 + 14.0.2 diff --git a/lispflowmapping-karaf/pom.xml b/lispflowmapping-karaf/pom.xml index a98826f4..701341f6 100644 --- a/lispflowmapping-karaf/pom.xml +++ b/lispflowmapping-karaf/pom.xml @@ -12,7 +12,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html org.opendaylight.odlparent karaf4-parent - 14.3.7 + 15.0.2 diff --git a/mappingservice/api/pom.xml b/mappingservice/api/pom.xml index 744ebdf9..9d59d1e5 100644 --- a/mappingservice/api/pom.xml +++ b/mappingservice/api/pom.xml @@ -5,7 +5,7 @@ org.opendaylight.mdsal binding-parent - 16.0.6 + 17.0.1 diff --git a/mappingservice/api/src/main/java/org/opendaylight/lispflowmapping/interfaces/mapcache/IMappingSystem.java b/mappingservice/api/src/main/java/org/opendaylight/lispflowmapping/interfaces/mapcache/IMappingSystem.java index 613b75fb..9f7e1d63 100644 --- a/mappingservice/api/src/main/java/org/opendaylight/lispflowmapping/interfaces/mapcache/IMappingSystem.java +++ b/mappingservice/api/src/main/java/org/opendaylight/lispflowmapping/interfaces/mapcache/IMappingSystem.java @@ -79,6 +79,7 @@ public interface IMappingSystem { /** * Retrieves mapping for the provided dst key for a particular xtr id. + * * @param src * Source Key to be looked up. * @param dst diff --git a/mappingservice/dsbackend/src/test/java/org/opendaylight/lispflowmapping/dsbackend/DataStoreBackEndTest.java b/mappingservice/dsbackend/src/test/java/org/opendaylight/lispflowmapping/dsbackend/DataStoreBackEndTest.java index bfe8d650..7e257732 100644 --- a/mappingservice/dsbackend/src/test/java/org/opendaylight/lispflowmapping/dsbackend/DataStoreBackEndTest.java +++ b/mappingservice/dsbackend/src/test/java/org/opendaylight/lispflowmapping/dsbackend/DataStoreBackEndTest.java @@ -30,6 +30,7 @@ import org.opendaylight.mdsal.binding.api.ReadTransaction; import org.opendaylight.mdsal.binding.api.TransactionChain; import org.opendaylight.mdsal.binding.api.WriteTransaction; import org.opendaylight.mdsal.common.api.CommitInfo; +import org.opendaylight.mdsal.common.api.FluentFutures; import org.opendaylight.mdsal.common.api.LogicalDatastoreType; import org.opendaylight.yang.gen.v1.urn.opendaylight.lfm.lisp.proto.rev151105.XtrId; import org.opendaylight.yang.gen.v1.urn.opendaylight.lfm.lisp.proto.rev151105.eid.container.Eid; @@ -54,7 +55,6 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.lfm.mappingservice.rev15090 import org.opendaylight.yang.gen.v1.urn.opendaylight.lfm.mappingservice.rev150906.mapping.database.VirtualNetworkIdentifierBuilder; import org.opendaylight.yang.gen.v1.urn.opendaylight.lfm.mappingservice.rev150906.mapping.database.VirtualNetworkIdentifierKey; import org.opendaylight.yangtools.binding.DataObjectIdentifier; -import org.opendaylight.yangtools.util.concurrent.FluentFutures; import org.opendaylight.yangtools.yang.common.Uint16; import org.powermock.api.mockito.PowerMockito; import org.powermock.core.classloader.annotations.PowerMockIgnore; diff --git a/mappingservice/inmemorydb/src/main/java/org/opendaylight/lispflowmapping/inmemorydb/radixtrie/RadixTrie.java b/mappingservice/inmemorydb/src/main/java/org/opendaylight/lispflowmapping/inmemorydb/radixtrie/RadixTrie.java index 193df81a..870cc7a7 100644 --- a/mappingservice/inmemorydb/src/main/java/org/opendaylight/lispflowmapping/inmemorydb/radixtrie/RadixTrie.java +++ b/mappingservice/inmemorydb/src/main/java/org/opendaylight/lispflowmapping/inmemorydb/radixtrie/RadixTrie.java @@ -78,6 +78,7 @@ public class RadixTrie { /** * Test bit in byte. Assumes bits are numbered from 0 to 7 + * * @param byteArg byte * @param bitPosition the position to be tested * @return 1 if bit at position is 1, 0 otherwise. diff --git a/mappingservice/lisp-proto/pom.xml b/mappingservice/lisp-proto/pom.xml index 8a5c5178..8f1631f0 100644 --- a/mappingservice/lisp-proto/pom.xml +++ b/mappingservice/lisp-proto/pom.xml @@ -12,7 +12,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html org.opendaylight.mdsal binding-parent - 16.0.6 + 17.0.1 diff --git a/mappingservice/lisp-proto/src/test/java/org/opendaylight/lispflowmapping/TestUtils.java b/mappingservice/lisp-proto/src/test/java/org/opendaylight/lispflowmapping/TestUtils.java index d8d4cf42..4f27ba03 100644 --- a/mappingservice/lisp-proto/src/test/java/org/opendaylight/lispflowmapping/TestUtils.java +++ b/mappingservice/lisp-proto/src/test/java/org/opendaylight/lispflowmapping/TestUtils.java @@ -28,10 +28,10 @@ public final class TestUtils { } public static void assertHexEquals(short expected, short actual) { - assertEquals(String.format("0x%04X", expected), String.format("0x%04X", actual)); + assertEquals("0x%04X".formatted(expected), "0x%04X".formatted(actual)); } public static void assertHexEquals(byte expected, byte actual) { - assertEquals(String.format("0x%02X", expected), String.format("0x%02X", actual)); + assertEquals("0x%02X".formatted(expected), "0x%02X".formatted(actual)); } } diff --git a/mappingservice/pom.xml b/mappingservice/pom.xml index 0cfbcbdd..dcee9001 100644 --- a/mappingservice/pom.xml +++ b/mappingservice/pom.xml @@ -5,7 +5,7 @@ org.opendaylight.odlparent odlparent - 14.3.7 + 15.0.2 @@ -37,7 +37,7 @@ org.opendaylight.mdsal mdsal-artifacts - 16.0.6 + 17.0.1 pom import -- 2.34.1 From 7c080f8754c7d64b8127de6b89fc49de431ed8b0 Mon Sep 17 00:00:00 2001 From: jenkins-releng Date: Wed, 30 Sep 2026 15:32:20 +0000 Subject: [PATCH 6/6] Release Validate --- artifacts/pom.xml | 2 +- commons/build_tools/pom.xml | 2 +- commons/parent/pom.xml | 4 ++-- features/features-lispflowmapping/pom.xml | 2 +- features/odl-lispflowmapping-inmemorydb/pom.xml | 2 +- features/odl-lispflowmapping-mappingservice-shell/pom.xml | 2 +- features/odl-lispflowmapping-mappingservice/pom.xml | 2 +- features/odl-lispflowmapping-models/pom.xml | 2 +- features/odl-lispflowmapping-msmr/pom.xml | 2 +- features/odl-lispflowmapping-southbound/pom.xml | 2 +- features/pom.xml | 2 +- integrationtest/pom.xml | 4 ++-- lispflowmapping-karaf/pom.xml | 2 +- mappingservice/api/pom.xml | 2 +- mappingservice/dsbackend/pom.xml | 2 +- mappingservice/implementation/pom.xml | 2 +- mappingservice/inmemorydb/pom.xml | 2 +- mappingservice/lisp-proto/pom.xml | 2 +- mappingservice/mapcache/pom.xml | 2 +- mappingservice/pom.xml | 2 +- mappingservice/shell/pom.xml | 2 +- mappingservice/southbound/pom.xml | 2 +- pom.xml | 2 +- 23 files changed, 25 insertions(+), 25 deletions(-) diff --git a/artifacts/pom.xml b/artifacts/pom.xml index a79332c8..e48431bf 100644 --- a/artifacts/pom.xml +++ b/artifacts/pom.xml @@ -18,7 +18,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html org.opendaylight.lispflowmapping lispflowmapping-artifacts - 1.24.0-SNAPSHOT + 1.24.0 pom diff --git a/commons/build_tools/pom.xml b/commons/build_tools/pom.xml index 3f437e6f..f16a6c6a 100644 --- a/commons/build_tools/pom.xml +++ b/commons/build_tools/pom.xml @@ -5,7 +5,7 @@ org.opendaylight.lispflowmapping lispflowmapping-commons - 1.24.0-SNAPSHOT + 1.24.0 ../parent diff --git a/commons/parent/pom.xml b/commons/parent/pom.xml index 1360a475..f8452c6b 100644 --- a/commons/parent/pom.xml +++ b/commons/parent/pom.xml @@ -21,7 +21,7 @@ org.opendaylight.lispflowmapping lispflowmapping-commons - 1.24.0-SNAPSHOT + 1.24.0 pom @@ -51,7 +51,7 @@ org.opendaylight.lispflowmapping lispflowmapping-artifacts - 1.24.0-SNAPSHOT + 1.24.0 pom import diff --git a/features/features-lispflowmapping/pom.xml b/features/features-lispflowmapping/pom.xml index 07e21c0c..5e26522b 100644 --- a/features/features-lispflowmapping/pom.xml +++ b/features/features-lispflowmapping/pom.xml @@ -18,7 +18,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html org.opendaylight.lispflowmapping features-lispflowmapping - 1.24.0-SNAPSHOT + 1.24.0 feature diff --git a/features/odl-lispflowmapping-inmemorydb/pom.xml b/features/odl-lispflowmapping-inmemorydb/pom.xml index d058e9a9..c26f1854 100644 --- a/features/odl-lispflowmapping-inmemorydb/pom.xml +++ b/features/odl-lispflowmapping-inmemorydb/pom.xml @@ -18,7 +18,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html org.opendaylight.lispflowmapping odl-lispflowmapping-inmemorydb - 1.24.0-SNAPSHOT + 1.24.0 feature diff --git a/features/odl-lispflowmapping-mappingservice-shell/pom.xml b/features/odl-lispflowmapping-mappingservice-shell/pom.xml index 29529049..590f7a9a 100644 --- a/features/odl-lispflowmapping-mappingservice-shell/pom.xml +++ b/features/odl-lispflowmapping-mappingservice-shell/pom.xml @@ -18,7 +18,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html org.opendaylight.lispflowmapping odl-lispflowmapping-mappingservice-shell - 1.24.0-SNAPSHOT + 1.24.0 feature diff --git a/features/odl-lispflowmapping-mappingservice/pom.xml b/features/odl-lispflowmapping-mappingservice/pom.xml index 1af4e0fa..629b707c 100644 --- a/features/odl-lispflowmapping-mappingservice/pom.xml +++ b/features/odl-lispflowmapping-mappingservice/pom.xml @@ -18,7 +18,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html org.opendaylight.lispflowmapping odl-lispflowmapping-mappingservice - 1.24.0-SNAPSHOT + 1.24.0 feature diff --git a/features/odl-lispflowmapping-models/pom.xml b/features/odl-lispflowmapping-models/pom.xml index c95a988c..2a3f569a 100644 --- a/features/odl-lispflowmapping-models/pom.xml +++ b/features/odl-lispflowmapping-models/pom.xml @@ -18,7 +18,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html org.opendaylight.lispflowmapping odl-lispflowmapping-models - 1.24.0-SNAPSHOT + 1.24.0 feature diff --git a/features/odl-lispflowmapping-msmr/pom.xml b/features/odl-lispflowmapping-msmr/pom.xml index 87c0e808..c7462c8f 100644 --- a/features/odl-lispflowmapping-msmr/pom.xml +++ b/features/odl-lispflowmapping-msmr/pom.xml @@ -18,7 +18,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html org.opendaylight.lispflowmapping odl-lispflowmapping-msmr - 1.24.0-SNAPSHOT + 1.24.0 feature diff --git a/features/odl-lispflowmapping-southbound/pom.xml b/features/odl-lispflowmapping-southbound/pom.xml index 388d9299..bbda6603 100644 --- a/features/odl-lispflowmapping-southbound/pom.xml +++ b/features/odl-lispflowmapping-southbound/pom.xml @@ -18,7 +18,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html org.opendaylight.lispflowmapping odl-lispflowmapping-southbound - 1.24.0-SNAPSHOT + 1.24.0 feature diff --git a/features/pom.xml b/features/pom.xml index 14800e54..54e720ce 100644 --- a/features/pom.xml +++ b/features/pom.xml @@ -18,7 +18,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html org.opendaylight.lispflowmapping features-aggregator - 1.24.0-SNAPSHOT + 1.24.0 pom diff --git a/integrationtest/pom.xml b/integrationtest/pom.xml index 445d45e6..a1a24cbb 100644 --- a/integrationtest/pom.xml +++ b/integrationtest/pom.xml @@ -18,7 +18,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html 4.0.0 org.opendaylight.lispflowmapping mappingservice.integrationtest - 1.24.0-SNAPSHOT + 1.24.0 bundle @@ -28,7 +28,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html false org.opendaylight.lispflowmapping lispflowmapping-karaf - 1.24.0-SNAPSHOT + 1.24.0 zip diff --git a/lispflowmapping-karaf/pom.xml b/lispflowmapping-karaf/pom.xml index 701341f6..54fc5230 100644 --- a/lispflowmapping-karaf/pom.xml +++ b/lispflowmapping-karaf/pom.xml @@ -18,7 +18,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html org.opendaylight.lispflowmapping lispflowmapping-karaf - 1.24.0-SNAPSHOT + 1.24.0 pom diff --git a/mappingservice/api/pom.xml b/mappingservice/api/pom.xml index 9d59d1e5..6a02083b 100644 --- a/mappingservice/api/pom.xml +++ b/mappingservice/api/pom.xml @@ -11,7 +11,7 @@ org.opendaylight.lispflowmapping mappingservice.api - 1.24.0-SNAPSHOT + 1.24.0 bundle diff --git a/mappingservice/dsbackend/pom.xml b/mappingservice/dsbackend/pom.xml index 2f09abca..1adfacd4 100644 --- a/mappingservice/dsbackend/pom.xml +++ b/mappingservice/dsbackend/pom.xml @@ -13,7 +13,7 @@ org.opendaylight.lispflowmapping mappingservice-parent - 1.24.0-SNAPSHOT + 1.24.0 mappingservice.dsbackend diff --git a/mappingservice/implementation/pom.xml b/mappingservice/implementation/pom.xml index 23019210..962b266f 100644 --- a/mappingservice/implementation/pom.xml +++ b/mappingservice/implementation/pom.xml @@ -5,7 +5,7 @@ org.opendaylight.lispflowmapping mappingservice-parent - 1.24.0-SNAPSHOT + 1.24.0 mappingservice.implementation diff --git a/mappingservice/inmemorydb/pom.xml b/mappingservice/inmemorydb/pom.xml index 1bc453c6..9c71b340 100644 --- a/mappingservice/inmemorydb/pom.xml +++ b/mappingservice/inmemorydb/pom.xml @@ -5,7 +5,7 @@ org.opendaylight.lispflowmapping mappingservice-parent - 1.24.0-SNAPSHOT + 1.24.0 mappingservice.inmemorydb diff --git a/mappingservice/lisp-proto/pom.xml b/mappingservice/lisp-proto/pom.xml index 8f1631f0..19daf76e 100644 --- a/mappingservice/lisp-proto/pom.xml +++ b/mappingservice/lisp-proto/pom.xml @@ -18,7 +18,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html org.opendaylight.lispflowmapping mappingservice.lisp-proto - 1.24.0-SNAPSHOT + 1.24.0 bundle diff --git a/mappingservice/mapcache/pom.xml b/mappingservice/mapcache/pom.xml index b48d1afe..a5bdb514 100644 --- a/mappingservice/mapcache/pom.xml +++ b/mappingservice/mapcache/pom.xml @@ -5,7 +5,7 @@ org.opendaylight.lispflowmapping mappingservice-parent - 1.24.0-SNAPSHOT + 1.24.0 mappingservice.mapcache diff --git a/mappingservice/pom.xml b/mappingservice/pom.xml index dcee9001..ee7f1c0f 100644 --- a/mappingservice/pom.xml +++ b/mappingservice/pom.xml @@ -11,7 +11,7 @@ org.opendaylight.lispflowmapping mappingservice-parent - 1.24.0-SNAPSHOT + 1.24.0 pom diff --git a/mappingservice/shell/pom.xml b/mappingservice/shell/pom.xml index 1259ea65..4a3b6e26 100644 --- a/mappingservice/shell/pom.xml +++ b/mappingservice/shell/pom.xml @@ -5,7 +5,7 @@ org.opendaylight.lispflowmapping mappingservice-parent - 1.24.0-SNAPSHOT + 1.24.0 mappingservice.shell diff --git a/mappingservice/southbound/pom.xml b/mappingservice/southbound/pom.xml index 3b694821..773347c6 100644 --- a/mappingservice/southbound/pom.xml +++ b/mappingservice/southbound/pom.xml @@ -5,7 +5,7 @@ org.opendaylight.lispflowmapping mappingservice-parent - 1.24.0-SNAPSHOT + 1.24.0 mappingservice.southbound diff --git a/pom.xml b/pom.xml index 9e6feb28..9a1415c8 100644 --- a/pom.xml +++ b/pom.xml @@ -5,7 +5,7 @@ org.opendaylight.lispflowmapping lispflowmapping-commons - 1.24.0-SNAPSHOT + 1.24.0 commons/parent -- 2.34.1