From a4d892d8215a71c0be1c399254d88fe0af542649 Mon Sep 17 00:00:00 2001 From: Robert Varga Date: Mon, 29 Sep 2025 19:07:10 +0200 Subject: [PATCH 1/4] Migrate mappingservice.dsbackend Use DataObjectIdentifier instead of InstanceIdentifier. Change-Id: Ic7f6015d64fca090d1fdfff962f73a59eff63674 Signed-off-by: Robert Varga --- .../dsbackend/DataStoreBackEnd.java | 35 ++++++------- .../dsbackend/InstanceIdentifierUtil.java | 51 ++++++++++--------- .../dsbackend/DataStoreBackEndTest.java | 12 ++--- 3 files changed, 48 insertions(+), 50 deletions(-) diff --git a/mappingservice/dsbackend/src/main/java/org/opendaylight/lispflowmapping/dsbackend/DataStoreBackEnd.java b/mappingservice/dsbackend/src/main/java/org/opendaylight/lispflowmapping/dsbackend/DataStoreBackEnd.java index 54960de3..b8964131 100644 --- a/mappingservice/dsbackend/src/main/java/org/opendaylight/lispflowmapping/dsbackend/DataStoreBackEnd.java +++ b/mappingservice/dsbackend/src/main/java/org/opendaylight/lispflowmapping/dsbackend/DataStoreBackEnd.java @@ -36,7 +36,7 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.lfm.mappingservice.rev15090 import org.opendaylight.yang.gen.v1.urn.opendaylight.lfm.mappingservice.rev150906.mapping.database.LastUpdatedBuilder; import org.opendaylight.yang.gen.v1.urn.opendaylight.lfm.mappingservice.rev150906.mapping.database.VirtualNetworkIdentifier; import org.opendaylight.yangtools.binding.DataObject; -import org.opendaylight.yangtools.yang.binding.InstanceIdentifier; +import org.opendaylight.yangtools.binding.DataObjectIdentifier; import org.opendaylight.yangtools.yang.common.Empty; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -48,10 +48,10 @@ import org.slf4j.LoggerFactory; */ public class DataStoreBackEnd { private static final Logger LOG = LoggerFactory.getLogger(DataStoreBackEnd.class); - private static final InstanceIdentifier DATABASE_ROOT = - InstanceIdentifier.create(MappingDatabase.class); - private static final InstanceIdentifier LAST_UPDATED = - InstanceIdentifier.create(MappingDatabase.class).child(LastUpdated.class); + private static final DataObjectIdentifier DATABASE_ROOT = + DataObjectIdentifier.builder(MappingDatabase.class).build(); + private static final DataObjectIdentifier LAST_UPDATED = + DataObjectIdentifier.builder(MappingDatabase.class).child(LastUpdated.class).build(); private final TransactionChain configTxChain; private final TransactionChain operTxChain; @@ -92,8 +92,7 @@ public class DataStoreBackEnd { LispAddressStringifier.getString(authenticationKey.getEid())); } - InstanceIdentifier path = InstanceIdentifierUtil - .createAuthenticationKeyIid(authenticationKey.getEid()); + final var path = InstanceIdentifierUtil.createAuthenticationKeyIid(authenticationKey.getEid()); writePutTransaction(path, authenticationKey, LogicalDatastoreType.CONFIGURATION, "Adding authentication key to MD-SAL datastore failed"); } @@ -104,7 +103,7 @@ public class DataStoreBackEnd { LispAddressStringifier.getString(mapping.getMappingRecord().getEid())); } - InstanceIdentifier path = InstanceIdentifierUtil + final var path = InstanceIdentifierUtil .createMappingIid(mapping.getMappingRecord().getEid(), mapping.getOrigin()); writePutTransaction(path, mapping, getDestinationDatastore(mapping), "Adding mapping to MD-SAL datastore failed"); @@ -119,7 +118,7 @@ public class DataStoreBackEnd { LispAddressStringifier.getString(mapping.getMappingRecord().getEid()), xtrId); } - InstanceIdentifier path = InstanceIdentifierUtil + final var path = InstanceIdentifierUtil .createXtrIdMappingIid(mapping.getMappingRecord().getEid(), MappingOrigin.Southbound, xtrId); writePutTransaction(path, mapping, LogicalDatastoreType.OPERATIONAL, "Adding xTR-ID mapping to MD-SAL datastore failed"); @@ -131,8 +130,7 @@ public class DataStoreBackEnd { LispAddressStringifier.getString(authenticationKey.getEid())); } - InstanceIdentifier path = InstanceIdentifierUtil - .createAuthenticationKeyIid(authenticationKey.getEid()); + final var path = InstanceIdentifierUtil.createAuthenticationKeyIid(authenticationKey.getEid()); deleteTransaction(path, LogicalDatastoreType.CONFIGURATION, "Deleting authentication key from MD-SAL datastore failed"); } @@ -143,7 +141,7 @@ public class DataStoreBackEnd { LispAddressStringifier.getString(mapping.getMappingRecord().getEid())); } - InstanceIdentifier path = InstanceIdentifierUtil + final var path = InstanceIdentifierUtil .createMappingIid(mapping.getMappingRecord().getEid(), mapping.getOrigin()); deleteTransaction(path, getDestinationDatastore(mapping), "Deleting mapping from MD-SAL datastore failed"); } @@ -156,7 +154,7 @@ public class DataStoreBackEnd { LispAddressStringifier.getString(mapping.getMappingRecord().getEid()), xtrId); } - InstanceIdentifier path = InstanceIdentifierUtil + final var path = InstanceIdentifierUtil .createXtrIdMappingIid(mapping.getMappingRecord().getEid(), MappingOrigin.Southbound, xtrId); deleteTransaction(path, LogicalDatastoreType.OPERATIONAL, "Deleting xTR-ID mapping from MD-SAL datastore failed"); @@ -185,8 +183,7 @@ public class DataStoreBackEnd { authenticationKey.getMappingAuthkey().getKeyString()); } - InstanceIdentifier path = InstanceIdentifierUtil - .createAuthenticationKeyIid(authenticationKey.getEid()); + final var path = InstanceIdentifierUtil.createAuthenticationKeyIid(authenticationKey.getEid()); writePutTransaction(path, authenticationKey, LogicalDatastoreType.CONFIGURATION, "Updating authentication key in MD-SAL datastore failed"); } @@ -197,7 +194,7 @@ public class DataStoreBackEnd { LispAddressStringifier.getString(mapping.getMappingRecord().getEid())); } - InstanceIdentifier path = InstanceIdentifierUtil + final var path = InstanceIdentifierUtil .createMappingIid(mapping.getMappingRecord().getEid(), mapping.getOrigin()); writePutTransaction(path, mapping, getDestinationDatastore(mapping), "Updating mapping in MD-SAL datastore failed"); @@ -282,7 +279,7 @@ public class DataStoreBackEnd { }; } - private void writePutTransaction(InstanceIdentifier addIID, U data, + private void writePutTransaction(DataObjectIdentifier addIID, U data, LogicalDatastoreType logicalDatastoreType, String errMsg) { WriteTransaction writeTx = getChain(logicalDatastoreType).newWriteOnlyTransaction(); // TODO: is is a utility method, hence we do not have enough lifecycle knowledge to use plain put() @@ -300,7 +297,7 @@ public class DataStoreBackEnd { }, MoreExecutors.directExecutor()); } - private U readTransaction(InstanceIdentifier readIID, + private U readTransaction(DataObjectIdentifier readIID, LogicalDatastoreType logicalDatastoreType) { final ListenableFuture> readFuture; try (ReadTransaction readTx = getChain(logicalDatastoreType).newReadOnlyTransaction()) { @@ -319,7 +316,7 @@ public class DataStoreBackEnd { return null; } - private void deleteTransaction(InstanceIdentifier deleteIID, + private void deleteTransaction(DataObjectIdentifier deleteIID, LogicalDatastoreType logicalDatastoreType, String errMsg) { WriteTransaction writeTx = getChain(logicalDatastoreType).newWriteOnlyTransaction(); writeTx.delete(logicalDatastoreType, deleteIID); diff --git a/mappingservice/dsbackend/src/main/java/org/opendaylight/lispflowmapping/dsbackend/InstanceIdentifierUtil.java b/mappingservice/dsbackend/src/main/java/org/opendaylight/lispflowmapping/dsbackend/InstanceIdentifierUtil.java index dfc8fd81..a5de3f5e 100644 --- a/mappingservice/dsbackend/src/main/java/org/opendaylight/lispflowmapping/dsbackend/InstanceIdentifierUtil.java +++ b/mappingservice/dsbackend/src/main/java/org/opendaylight/lispflowmapping/dsbackend/InstanceIdentifierUtil.java @@ -9,6 +9,7 @@ package org.opendaylight.lispflowmapping.dsbackend; import static java.util.Objects.requireNonNull; +import org.eclipse.jdt.annotation.NonNull; import org.opendaylight.lispflowmapping.lisp.util.LispAddressStringifier; import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.lisp.address.types.rev151105.lisp.address.Address; import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.lisp.address.types.rev151105.lisp.address.address.InstanceId; @@ -27,58 +28,58 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.lfm.mappingservice.rev15090 import org.opendaylight.yang.gen.v1.urn.opendaylight.lfm.mappingservice.rev150906.db.instance.mapping.XtrIdMappingKey; import org.opendaylight.yang.gen.v1.urn.opendaylight.lfm.mappingservice.rev150906.mapping.database.VirtualNetworkIdentifier; import org.opendaylight.yang.gen.v1.urn.opendaylight.lfm.mappingservice.rev150906.mapping.database.VirtualNetworkIdentifierKey; -import org.opendaylight.yangtools.yang.binding.InstanceIdentifier; +import org.opendaylight.yangtools.binding.DataObjectIdentifier; +import org.opendaylight.yangtools.binding.DataObjectIdentifier.WithKey; /** * Utility class to create InstanceIdentifier path objects based on EID. * Used for storing RPC data to the config datastore. * * @author Lorand Jakab - * */ public final class InstanceIdentifierUtil { // Utility class, should not be instantiated private InstanceIdentifierUtil() { } - public static InstanceIdentifier createAuthenticationKeyIid(Eid eid) { + public static @NonNull WithKey createAuthenticationKeyIid(Eid eid) { requireNonNull(eid, "Key needs and EID entry!"); - VirtualNetworkIdentifierKey vniKey = new VirtualNetworkIdentifierKey(new VniUri( - Long.toString(getLispInstanceId(eid)))); - AuthenticationKeyKey authKeyKey = new AuthenticationKeyKey(new EidUri( - LispAddressStringifier.getURIString(eid))); - return InstanceIdentifier.create(MappingDatabase.class) - .child(VirtualNetworkIdentifier.class, vniKey).child(AuthenticationKey.class, authKeyKey); + return DataObjectIdentifier.builder(MappingDatabase.class) + .child(VirtualNetworkIdentifier.class, new VirtualNetworkIdentifierKey(new VniUri( + Long.toString(getLispInstanceId(eid))))) + .child(AuthenticationKey.class, new AuthenticationKeyKey(new EidUri( + LispAddressStringifier.getURIString(eid)))) + .build(); } - public static InstanceIdentifier createMappingIid(Eid eid, MappingOrigin orig) { + public static @NonNull WithKey createMappingIid(Eid eid, MappingOrigin orig) { requireNonNull(eid, "Mapping needs an EID entry!"); - VirtualNetworkIdentifierKey vniKey = new VirtualNetworkIdentifierKey(new VniUri( - Long.toString(getLispInstanceId(eid)))); - MappingKey eidKey = new MappingKey(new EidUri(LispAddressStringifier.getURIString(eid)), orig); - return InstanceIdentifier.create(MappingDatabase.class) - .child(VirtualNetworkIdentifier.class, vniKey).child(Mapping.class, eidKey); + return DataObjectIdentifier.builder(MappingDatabase.class) + .child(VirtualNetworkIdentifier.class, new VirtualNetworkIdentifierKey(new VniUri( + Long.toString(getLispInstanceId(eid))))) + .child(Mapping.class, new MappingKey(new EidUri(LispAddressStringifier.getURIString(eid)), orig)) + .build(); } - public static InstanceIdentifier createXtrIdMappingIid(Eid eid, MappingOrigin orig, XtrId xtrId) { + public static @NonNull WithKey createXtrIdMappingIid(Eid eid, MappingOrigin orig, + XtrId xtrId) { requireNonNull(eid, "Mapping needs an EID entry!"); requireNonNull(xtrId, "Mapping needs an xTR-ID entry!"); - VirtualNetworkIdentifierKey vniKey = new VirtualNetworkIdentifierKey(new VniUri( - Long.toString(getLispInstanceId(eid)))); - MappingKey eidKey = new MappingKey(new EidUri(LispAddressStringifier.getURIString(eid)), orig); - XtrIdMappingKey xtrIdKey = new XtrIdMappingKey(new XtrIdUri(LispAddressStringifier.getURIString(xtrId))); - return InstanceIdentifier.create(MappingDatabase.class) - .child(VirtualNetworkIdentifier.class, vniKey).child(Mapping.class, eidKey) - .child(XtrIdMapping.class, xtrIdKey); + return DataObjectIdentifier.builder(MappingDatabase.class) + .child(VirtualNetworkIdentifier.class, new VirtualNetworkIdentifierKey(new VniUri( + Long.toString(getLispInstanceId(eid))))) + .child(Mapping.class, new MappingKey(new EidUri(LispAddressStringifier.getURIString(eid)), orig)) + .child(XtrIdMapping.class, new XtrIdMappingKey(new XtrIdUri(LispAddressStringifier.getURIString(xtrId)))) + .build(); } private static long getLispInstanceId(Eid eid) { Address address = eid.getAddress(); - if (address instanceof InstanceId) { - return ((InstanceId) address).getInstanceId().getIid().getValue().toJava(); + if (address instanceof InstanceId ii) { + return ii.getInstanceId().getIid().getValue().toJava(); } else if (eid.getVirtualNetworkId() != null) { return eid.getVirtualNetworkId().getValue().toJava(); } 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 69b9a430..cfbaab9f 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 @@ -53,8 +53,8 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.lfm.mappingservice.rev15090 import org.opendaylight.yang.gen.v1.urn.opendaylight.lfm.mappingservice.rev150906.mapping.database.VirtualNetworkIdentifier; 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.binding.InstanceIdentifier; import org.opendaylight.yangtools.yang.common.Uint16; import org.powermock.api.mockito.PowerMockito; import org.powermock.core.classloader.annotations.PowerMockIgnore; @@ -70,9 +70,9 @@ import org.slf4j.LoggerFactory; @PrepareForTest({LoggerFactory.class}) public class DataStoreBackEndTest { - @Captor private static ArgumentCaptor> iidCaptorAuthKey; - @Captor private static ArgumentCaptor> iidCaptorMapping; - @Captor private static ArgumentCaptor> iidCaptorXtrIdMapping; + @Captor private static ArgumentCaptor> iidCaptorAuthKey; + @Captor private static ArgumentCaptor> iidCaptorMapping; + @Captor private static ArgumentCaptor> iidCaptorXtrIdMapping; @Mock private static TransactionChain txChainMock; @Mock private static WriteTransaction wTxMock; private static DataStoreBackEnd dataStoreBackEnd; @@ -87,8 +87,8 @@ public class DataStoreBackEndTest { private static final Eid EID_IPV4_3 = LispAddressUtil.asIpv4Eid(IPV4_STRING_3); private static final Eid EID_IPV4_4 = LispAddressUtil.asIpv4Eid(IPV4_STRING_4); private static final byte[] XTR_ID = new byte[]{0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15}; - private static final InstanceIdentifier DATABASE_ROOT = - InstanceIdentifier.create(MappingDatabase.class); + private static final DataObjectIdentifier DATABASE_ROOT = + DataObjectIdentifier.builder(MappingDatabase.class).build(); @Before public void init() { -- 2.34.1 From 1763aa30a45bd8d3d2d891288490d671843fc176 Mon Sep 17 00:00:00 2001 From: Robert Varga Date: Fri, 17 Oct 2025 19:44:10 +0200 Subject: [PATCH 2/4] Migrate AuthenticationKeyDataListener Use a DataObjectReference without a DataTreeIdentifier to fix deprecation warnings. Change-Id: Ica6b7716be17e9e940950da3da8746bfc008c34c Signed-off-by: Robert Varga --- .../lisp/AuthenticationKeyDataListener.java | 15 ++++++--------- .../lisp/AuthenticationKeyDataListenerTest.java | 2 +- 2 files changed, 7 insertions(+), 10 deletions(-) diff --git a/mappingservice/southbound/src/main/java/org/opendaylight/lispflowmapping/southbound/lisp/AuthenticationKeyDataListener.java b/mappingservice/southbound/src/main/java/org/opendaylight/lispflowmapping/southbound/lisp/AuthenticationKeyDataListener.java index e5bf1bd3..0ddcca62 100644 --- a/mappingservice/southbound/src/main/java/org/opendaylight/lispflowmapping/southbound/lisp/AuthenticationKeyDataListener.java +++ b/mappingservice/southbound/src/main/java/org/opendaylight/lispflowmapping/southbound/lisp/AuthenticationKeyDataListener.java @@ -16,7 +16,6 @@ import org.opendaylight.mdsal.binding.api.DataBroker; import org.opendaylight.mdsal.binding.api.DataObjectModification; import org.opendaylight.mdsal.binding.api.DataObjectModification.ModificationType; import org.opendaylight.mdsal.binding.api.DataTreeChangeListener; -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; @@ -26,8 +25,8 @@ 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.binding.DataObjectReference; import org.opendaylight.yangtools.concepts.Registration; -import org.opendaylight.yangtools.yang.binding.InstanceIdentifier; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -38,19 +37,17 @@ import org.slf4j.LoggerFactory; public class AuthenticationKeyDataListener implements DataTreeChangeListener { private static final Logger LOG = LoggerFactory.getLogger(AuthenticationKeyDataListener.class); + private final ConcurrentHashMap updatedEntries = new ConcurrentHashMap<>(); private final AuthKeyDb akdb; - private final InstanceIdentifier path; private final Registration registration; - private final ConcurrentHashMap updatedEntries; public AuthenticationKeyDataListener(final DataBroker broker, final AuthKeyDb akdb) { this.akdb = akdb; - path = InstanceIdentifier.create(MappingDatabase.class).child(VirtualNetworkIdentifier.class) - .child(AuthenticationKey.class); LOG.trace("Registering AuthenticationKey listener."); - registration = broker.registerTreeChangeListener( - DataTreeIdentifier.of(LogicalDatastoreType.CONFIGURATION, path), this); - updatedEntries = new ConcurrentHashMap<>(); + registration = broker.registerTreeChangeListener(LogicalDatastoreType.CONFIGURATION, + DataObjectReference.builder(MappingDatabase.class).child(VirtualNetworkIdentifier.class) + .child(AuthenticationKey.class) + .build(), this); } public void closeDataChangeListener() { diff --git a/mappingservice/southbound/src/test/java/org/opendaylight/lispflowmapping/southbound/lisp/AuthenticationKeyDataListenerTest.java b/mappingservice/southbound/src/test/java/org/opendaylight/lispflowmapping/southbound/lisp/AuthenticationKeyDataListenerTest.java index 995815a7..5a8fac36 100644 --- a/mappingservice/southbound/src/test/java/org/opendaylight/lispflowmapping/southbound/lisp/AuthenticationKeyDataListenerTest.java +++ b/mappingservice/southbound/src/test/java/org/opendaylight/lispflowmapping/southbound/lisp/AuthenticationKeyDataListenerTest.java @@ -96,7 +96,7 @@ public class AuthenticationKeyDataListenerTest { .thenReturn(DataObjectModification.ModificationType.SUBTREE_MODIFIED); Mockito.when(mod_write.modificationType()).thenReturn(DataObjectModification.ModificationType.WRITE); - Mockito.when(brokerMock.registerTreeChangeListener(Mockito.any(DataTreeIdentifier.class), + Mockito.when(brokerMock.registerTreeChangeListener(Mockito.any(), Mockito.any(), Mockito.any(AuthenticationKeyDataListener.class))).thenReturn(registrationMock); authenticationKeyDataListener = new AuthenticationKeyDataListener(brokerMock, akdbMock); } -- 2.34.1 From 7f384d17916d3a15c78e4411cbea8bec2548dfa9 Mon Sep 17 00:00:00 2001 From: Robert Varga Date: Mon, 29 Sep 2025 18:55:40 +0200 Subject: [PATCH 3/4] Bump upstreams Adopt: - odlparent-14.1.4 - mdsal-15.0.1 - controller-12.0.1 - netconf-10.0.0 Change-Id: I909e9209ab4345e81647fcc560950205f859a6e0 Signed-off-by: Robert Varga --- artifacts/pom.xml | 2 +- commons/parent/pom.xml | 6 +- features/features-lispflowmapping/pom.xml | 2 +- .../odl-lispflowmapping-inmemorydb/pom.xml | 4 +- .../src/main/feature/feature.xml | 2 +- .../pom.xml | 2 +- .../pom.xml | 4 +- .../src/main/feature/feature.xml | 2 +- features/odl-lispflowmapping-models/pom.xml | 12 +-- .../src/main/feature/feature.xml | 2 +- features/odl-lispflowmapping-msmr/pom.xml | 2 +- .../odl-lispflowmapping-southbound/pom.xml | 6 +- .../src/main/feature/feature.xml | 6 +- features/pom.xml | 2 +- integrationtest/pom.xml | 2 +- lispflowmapping-karaf/pom.xml | 2 +- mappingservice/api/pom.xml | 4 +- .../mdsal/AuthenticationKeyDataListener.java | 39 ++++------ .../mdsal/MappingDataListener.java | 78 +++++++++---------- .../AuthenticationKeyDataListenerTest.java | 39 +++------- .../mdsal/MappingDataListenerTest.java | 42 +++------- mappingservice/lisp-proto/pom.xml | 6 +- mappingservice/pom.xml | 4 +- .../lisp/AuthenticationKeyDataListener.java | 43 +++++----- .../AuthenticationKeyDataListenerTest.java | 36 +++------ .../lisp/LispSouthboundHandlerTest.java | 7 +- 26 files changed, 143 insertions(+), 213 deletions(-) diff --git a/artifacts/pom.xml b/artifacts/pom.xml index bba62d1d..fac8e717 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.1.3 + 14.1.4 diff --git a/commons/parent/pom.xml b/commons/parent/pom.xml index 9d0ecf97..ce79814f 100644 --- a/commons/parent/pom.xml +++ b/commons/parent/pom.xml @@ -15,7 +15,7 @@ for plugin configuration etc. --> org.opendaylight.odlparent odlparent - 14.1.3 + 14.1.4 @@ -37,14 +37,14 @@ org.opendaylight.mdsal mdsal-artifacts - 14.0.18 + 15.0.1 pom import org.opendaylight.controller controller-artifacts - 11.0.2 + 12.0.1 pom import diff --git a/features/features-lispflowmapping/pom.xml b/features/features-lispflowmapping/pom.xml index 584cdfc8..37b1409a 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.1.3 + 14.1.4 diff --git a/features/odl-lispflowmapping-inmemorydb/pom.xml b/features/odl-lispflowmapping-inmemorydb/pom.xml index f7790cda..8b08bdce 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.1.3 + 14.1.4 @@ -29,7 +29,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html org.opendaylight.controller controller-artifacts - 11.0.2 + 12.0.1 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 f631fe43..61b7c411 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 faa733df..a09c7a9f 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.1.3 + 14.1.4 diff --git a/features/odl-lispflowmapping-mappingservice/pom.xml b/features/odl-lispflowmapping-mappingservice/pom.xml index c4126ac4..7e7d6c6b 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.1.3 + 14.1.4 @@ -29,7 +29,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html org.opendaylight.netconf netconf-artifacts - 9.0.1 + 10.0.0 import pom diff --git a/features/odl-lispflowmapping-mappingservice/src/main/feature/feature.xml b/features/odl-lispflowmapping-mappingservice/src/main/feature/feature.xml index 0b1025ca..ddad5185 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 diff --git a/features/odl-lispflowmapping-models/pom.xml b/features/odl-lispflowmapping-models/pom.xml index 0be171cc..6d8a185a 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.1.3 + 14.1.4 @@ -27,9 +27,9 @@ and is available at http://www.eclipse.org/legal/epl-v10.html - org.opendaylight.mdsal - mdsal-artifacts - 14.0.18 + org.opendaylight.ietf + ietf-artifacts + 1.0.1 pom import @@ -44,8 +44,8 @@ and is available at http://www.eclipse.org/legal/epl-v10.html features - org.opendaylight.mdsal.model - odl-mdsal-model-rfc6991 + org.opendaylight.ietf + odl-ietf-model-rfc6991 xml features diff --git a/features/odl-lispflowmapping-models/src/main/feature/feature.xml b/features/odl-lispflowmapping-models/src/main/feature/feature.xml index 8cc800e0..0864e97b 100644 --- a/features/odl-lispflowmapping-models/src/main/feature/feature.xml +++ b/features/odl-lispflowmapping-models/src/main/feature/feature.xml @@ -9,6 +9,6 @@ and is available at http://www.eclipse.org/legal/epl-v10.html INTERNAL odl-apache-commons-lang3 - odl-mdsal-model-rfc6991 + odl-ietf-model-rfc6991 diff --git a/features/odl-lispflowmapping-msmr/pom.xml b/features/odl-lispflowmapping-msmr/pom.xml index 7624ac86..74f1ddc9 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.1.3 + 14.1.4 diff --git a/features/odl-lispflowmapping-southbound/pom.xml b/features/odl-lispflowmapping-southbound/pom.xml index 070bec33..840a5d05 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.1.3 + 14.1.4 @@ -29,14 +29,14 @@ and is available at http://www.eclipse.org/legal/epl-v10.html org.opendaylight.controller controller-artifacts - 11.0.2 + 12.0.1 import pom org.opendaylight.netconf netconf-artifacts - 9.0.1 + 10.0.0 import pom diff --git a/features/odl-lispflowmapping-southbound/src/main/feature/feature.xml b/features/odl-lispflowmapping-southbound/src/main/feature/feature.xml index 55abe6f2..43071498 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 diff --git a/features/pom.xml b/features/pom.xml index 6cf21d8a..0215292a 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.1.3 + 14.1.4 diff --git a/integrationtest/pom.xml b/integrationtest/pom.xml index dfd51c82..163e3bf3 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 - 11.0.2 + 12.0.1 diff --git a/lispflowmapping-karaf/pom.xml b/lispflowmapping-karaf/pom.xml index b934d46a..be865234 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.1.3 + 14.1.4 diff --git a/mappingservice/api/pom.xml b/mappingservice/api/pom.xml index 81fad0e5..1c4545bc 100644 --- a/mappingservice/api/pom.xml +++ b/mappingservice/api/pom.xml @@ -5,7 +5,7 @@ org.opendaylight.mdsal binding-parent - 14.0.18 + 15.0.1 @@ -32,7 +32,7 @@ yang-ext - org.opendaylight.mdsal.binding.model.ietf + org.opendaylight.ietf.model rfc6991-ietf-inet-types 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 941d001d..1855add6 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 @@ -12,7 +12,6 @@ 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.DataObjectModification; -import org.opendaylight.mdsal.binding.api.DataObjectModification.ModificationType; import org.opendaylight.mdsal.binding.api.DataTreeModification; import org.opendaylight.yang.gen.v1.urn.opendaylight.lfm.lisp.proto.rev151105.eid.container.Eid; import org.opendaylight.yang.gen.v1.urn.opendaylight.lfm.mappingservice.rev150906.MappingDatabase; @@ -47,34 +46,30 @@ public class AuthenticationKeyDataListener extends AbstractDataListener change : changes) { final DataObjectModification mod = change.getRootNode(); - if (ModificationType.DELETE == mod.modificationType()) { - final AuthenticationKey authKey = mod.dataBefore(); + switch (mod.modificationType()) { + case DELETE -> { + final AuthenticationKey authKey = mod.dataBefore(); - LOG.trace("Received deleted data"); - LOG.trace("Key: {}", change.getRootPath().path()); - LOG.trace("Value: {}", authKey); + LOG.trace("Received deleted data"); + LOG.trace("Key: {}", change.getRootPath().path()); + LOG.trace("Value: {}", authKey); - final AuthenticationKey convertedAuthKey = convertToBinaryIfNecessary(authKey); + final AuthenticationKey convertedAuthKey = convertToBinaryIfNecessary(authKey); - mapSystem.removeAuthenticationKey(convertedAuthKey.getEid()); - } else if (ModificationType.WRITE == mod.modificationType() - || ModificationType.SUBTREE_MODIFIED == mod.modificationType()) { - if (ModificationType.WRITE == mod.modificationType()) { - LOG.trace("Received created data"); - } else { - LOG.trace("Received updated data"); + mapSystem.removeAuthenticationKey(convertedAuthKey.getEid()); } - // Process newly created or updated authentication keys - final AuthenticationKey authKey = mod.dataAfter(); + case SUBTREE_MODIFIED, WRITE -> { + // Process newly created or updated authentication keys + final AuthenticationKey authKey = mod.dataAfter(); - LOG.trace("Key: {}", change.getRootPath().path()); - LOG.trace("Value: {}", authKey); + LOG.trace("Key: {}", change.getRootPath().path()); + LOG.trace("Value: {}", authKey); - final AuthenticationKey convertedAuthKey = convertToBinaryIfNecessary(authKey); + final AuthenticationKey convertedAuthKey = convertToBinaryIfNecessary(authKey); - mapSystem.addAuthenticationKey(convertedAuthKey.getEid(), convertedAuthKey.getMappingAuthkey()); - } else { - LOG.warn("Ignoring unhandled modification type {}", mod.modificationType()); + mapSystem.addAuthenticationKey(convertedAuthKey.getEid(), convertedAuthKey.getMappingAuthkey()); + } + default -> LOG.warn("Ignoring unhandled modification type {}", mod.modificationType()); } } } diff --git a/mappingservice/implementation/src/main/java/org/opendaylight/lispflowmapping/implementation/mdsal/MappingDataListener.java b/mappingservice/implementation/src/main/java/org/opendaylight/lispflowmapping/implementation/mdsal/MappingDataListener.java index e2a0afdb..c9a3674c 100644 --- a/mappingservice/implementation/src/main/java/org/opendaylight/lispflowmapping/implementation/mdsal/MappingDataListener.java +++ b/mappingservice/implementation/src/main/java/org/opendaylight/lispflowmapping/implementation/mdsal/MappingDataListener.java @@ -67,54 +67,54 @@ public class MappingDataListener extends AbstractDataListener { for (DataTreeModification change : changes) { final DataObjectModification mod = change.getRootNode(); - if (ModificationType.DELETE == mod.modificationType()) { - // Process deleted mappings + switch (mod.modificationType()) { + case DELETE -> { + // Process deleted mappings - final Mapping mapping = mod.dataBefore(); + final Mapping mapping = mod.dataBefore(); - // Only treat mapping changes caused by Northbound, since Southbound changes are already handled - // before being persisted, except for cluster slaves - if (mapping.getOrigin() == MappingOrigin.Southbound && mapSystem.isMaster()) { - continue; - } - - LOG.trace("Received deleted data"); - LOG.trace("Key: {}", change.getRootPath().path()); - LOG.trace("Value: {}", mapping); - - final Mapping convertedMapping = convertToBinaryIfNecessary(mapping); + // Only treat mapping changes caused by Northbound, since Southbound changes are already handled + // before being persisted, except for cluster slaves + if (mapping.getOrigin() == MappingOrigin.Southbound && mapSystem.isMaster()) { + continue; + } - mapSystem.removeMapping(convertedMapping.getOrigin(), convertedMapping.getMappingRecord().getEid()); + LOG.trace("Received deleted data"); + LOG.trace("Key: {}", change.getRootPath().path()); + LOG.trace("Value: {}", mapping); - } else if (ModificationType.SUBTREE_MODIFIED == mod.modificationType() - || ModificationType.WRITE == mod.modificationType()) { - final Mapping mapping = mod.dataAfter(); + final Mapping convertedMapping = convertToBinaryIfNecessary(mapping); - // Only treat mapping changes caused by Northbound, since Southbound changes are already handled - // before being persisted, except for cluster slaves XXX separate NB and SB to avoid ignoring - // SB notifications - if (mapping.getOrigin() == MappingOrigin.Southbound && mapSystem.isMaster()) { - continue; + mapSystem.removeMapping(convertedMapping.getOrigin(), convertedMapping.getMappingRecord().getEid()); } - - final Mapping convertedMapping = convertToBinaryIfNecessary(mapping); - Eid convertedEid = convertedMapping.getMappingRecord().getEid(); - - if (ModificationType.SUBTREE_MODIFIED == mod.modificationType()) { - LOG.trace("Received update data"); - LOG.trace("Key: {}", change.getRootPath().path()); - LOG.trace("Value: {}", mapping); - mapSystem.updateMapping(convertedMapping.getOrigin(), convertedEid, + case SUBTREE_MODIFIED, WRITE -> { + final Mapping mapping = mod.dataAfter(); + + // Only treat mapping changes caused by Northbound, since Southbound changes are already handled + // before being persisted, except for cluster slaves XXX separate NB and SB to avoid ignoring + // SB notifications + if (mapping.getOrigin() == MappingOrigin.Southbound && mapSystem.isMaster()) { + continue; + } + + final Mapping convertedMapping = convertToBinaryIfNecessary(mapping); + Eid convertedEid = convertedMapping.getMappingRecord().getEid(); + + if (ModificationType.SUBTREE_MODIFIED == mod.modificationType()) { + LOG.trace("Received update data"); + LOG.trace("Key: {}", change.getRootPath().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("Value: {}", mapping); - mapSystem.addMapping(convertedMapping.getOrigin(), convertedEid, + } else { + LOG.trace("Received write data"); + LOG.trace("Key: {}", change.getRootPath().path()); + LOG.trace("Value: {}", mapping); + mapSystem.addMapping(convertedMapping.getOrigin(), convertedEid, new MappingData(convertedMapping.getMappingRecord())); + } } - } else { - LOG.warn("Ignoring unhandled modification type {}", mod.modificationType()); + default -> LOG.warn("Ignoring unhandled modification type {}", mod.modificationType()); } } } 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 269cb58a..69edb30e 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 @@ -14,8 +14,9 @@ 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.DataObjectModification; -import org.opendaylight.mdsal.binding.api.DataObjectModification.ModificationType; +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; @@ -38,9 +39,9 @@ public class AuthenticationKeyDataListenerTest { private static DataTreeModification change_del; private static DataTreeModification change_subtreeModified; private static DataTreeModification change_write; - private static DataObjectModification mod_del; - private static DataObjectModification mod_subtreeModified; - private static DataObjectModification mod_write; + private static DataObjectDeleted mod_del; + private static DataObjectModified mod_subtreeModified; + private static DataObjectWritten mod_write; private static final String IPV4_STRING_1 = "192.168.0.1"; private static final String IPV4_STRING_2 = "192.168.0.2"; @@ -53,7 +54,6 @@ public class AuthenticationKeyDataListenerTest { private static final AuthenticationKey AUTHENTICATION_KEY_3 = getAuthenticationKey(IPV4_EID_3, "pass3"); @Before - @SuppressWarnings("unchecked") public void init() { DataBroker dataBrokerMock = Mockito.mock(DataBroker.class); iMappingSystemMock = Mockito.mock(IMappingSystem.class); @@ -67,9 +67,9 @@ public class AuthenticationKeyDataListenerTest { change_del = Mockito.mock(DataTreeModification.class); change_subtreeModified = Mockito.mock(DataTreeModification.class); change_write = Mockito.mock(DataTreeModification.class); - mod_del = Mockito.mock(DataObjectModification.class); - mod_subtreeModified = Mockito.mock(DataObjectModification.class); - mod_write = Mockito.mock(DataObjectModification.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); @@ -77,9 +77,6 @@ public class AuthenticationKeyDataListenerTest { 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(mod_del.modificationType()).thenReturn(ModificationType.DELETE); - Mockito.when(mod_subtreeModified.modificationType()).thenReturn(ModificationType.SUBTREE_MODIFIED); - Mockito.when(mod_write.modificationType()).thenReturn(ModificationType.WRITE); } /** @@ -130,23 +127,7 @@ public class AuthenticationKeyDataListenerTest { Mockito.verify(iMappingSystemMock).addAuthenticationKey(IPV4_EID_3, AUTHENTICATION_KEY_3.getMappingAuthkey()); } - /** - * Tests {@link AuthenticationKeyDataListener#onDataTreeChanged} method with no modification type. - */ - @Test - @SuppressWarnings("unchecked") - public void onDataTreeChangedTest_noModType() { - final DataTreeModification changeNoModType = Mockito.mock(DataTreeModification.class); - final DataObjectModification modNoType = Mockito.mock(DataObjectModification.class); - - Mockito.when(changeNoModType.getRootNode()).thenReturn(modNoType); - Mockito.when(modNoType.modificationType()).thenReturn(null); - - authenticationKeyDataListener.onDataTreeChanged(List.of(changeNoModType)); - Mockito.verifyZeroInteractions(iMappingSystemMock); - } - - private static AuthenticationKey getAuthenticationKey(Eid eid, String password) { + private static AuthenticationKey getAuthenticationKey(final Eid eid, final String password) { return new AuthenticationKeyBuilder() .withKey(new AuthenticationKeyKey(new EidUri("uri-1"))) .setEid(eid) 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 8e5558f6..bdc1a191 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 @@ -22,8 +22,9 @@ import org.opendaylight.lispflowmapping.lisp.type.MappingData; import org.opendaylight.lispflowmapping.lisp.util.LispAddressStringifier; import org.opendaylight.lispflowmapping.lisp.util.LispAddressUtil; import org.opendaylight.mdsal.binding.api.DataBroker; -import org.opendaylight.mdsal.binding.api.DataObjectModification; -import org.opendaylight.mdsal.binding.api.DataObjectModification.ModificationType; +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; @@ -49,9 +50,9 @@ public class MappingDataListenerTest { private static DataTreeModification change_del; private static DataTreeModification change_subtreeModified; private static DataTreeModification change_write; - private static DataObjectModification mod_del; - private static DataObjectModification mod_subtreeModified; - private static DataObjectModification mod_write; + private static DataObjectDeleted mod_del; + private static DataObjectModified mod_subtreeModified; + private static DataObjectWritten mod_write; private static MappingDataListener mappingDataListener; @@ -70,7 +71,6 @@ public class MappingDataListenerTest { private static final Mapping MAPPING_EID_3_SB = getDefaultMapping(IPV4_EID_3, MappingOrigin.Southbound); @Before - @SuppressWarnings("unchecked") public void init() { final DataBroker dataBrokerMock = Mockito.mock(DataBroker.class); iMappingSystemMock = Mockito.mock(IMappingSystem.class); @@ -87,9 +87,9 @@ public class MappingDataListenerTest { change_del = Mockito.mock(DataTreeModification.class); change_subtreeModified = Mockito.mock(DataTreeModification.class); change_write = Mockito.mock(DataTreeModification.class); - mod_del = Mockito.mock(DataObjectModification.class); - mod_subtreeModified = Mockito.mock(DataObjectModification.class); - mod_write = Mockito.mock(DataObjectModification.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); @@ -97,9 +97,6 @@ public class MappingDataListenerTest { 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(mod_del.modificationType()).thenReturn(ModificationType.DELETE); - Mockito.when(mod_subtreeModified.modificationType()).thenReturn(ModificationType.SUBTREE_MODIFIED); - Mockito.when(mod_write.modificationType()).thenReturn(ModificationType.WRITE); Mockito.when(iMappingSystemMock.isMaster()).thenReturn(true); } @@ -220,26 +217,7 @@ public class MappingDataListenerTest { Mockito.verifyNoMoreInteractions(notificationPublishServiceMock); } - /** - * Tests {@link MappingDataListener#onDataTreeChanged} method with no modification type. - */ - @Test - @SuppressWarnings("unchecked") - public void onDataTreeChangedTest_noModType() { - final DataTreeModification changeNoModType = Mockito.mock(DataTreeModification.class); - final DataObjectModification modNoType = Mockito.mock(DataObjectModification.class); - final List> changes = Lists.newArrayList(changeNoModType); - - Mockito.when(changeNoModType.getRootNode()).thenReturn(modNoType); - Mockito.when(modNoType.modificationType()).thenReturn(null); - - mappingDataListener.onDataTreeChanged(changes); - - Mockito.verifyZeroInteractions(iMappingSystemMock); - Mockito.verifyZeroInteractions(notificationPublishServiceMock); - } - - private static Mapping getDefaultMapping(Eid eid, MappingOrigin origin) { + private static Mapping getDefaultMapping(final Eid eid, final MappingOrigin origin) { final MappingRecord record = new MappingRecordBuilder().setEid(eid).build(); return new MappingBuilder() .withKey(new MappingKey(new EidUri(LispAddressStringifier.getURIString(eid)), origin)) diff --git a/mappingservice/lisp-proto/pom.xml b/mappingservice/lisp-proto/pom.xml index 863ac73f..a46042ea 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 - 14.0.18 + 15.0.1 @@ -31,11 +31,11 @@ and is available at http://www.eclipse.org/legal/epl-v10.html - org.opendaylight.mdsal.binding.model.ietf + org.opendaylight.ietf.model rfc6991-ietf-inet-types - org.opendaylight.mdsal.binding.model.ietf + org.opendaylight.ietf.model rfc6991-ietf-yang-types diff --git a/mappingservice/pom.xml b/mappingservice/pom.xml index 7e1ff348..28eeead4 100644 --- a/mappingservice/pom.xml +++ b/mappingservice/pom.xml @@ -5,7 +5,7 @@ org.opendaylight.odlparent odlparent - 14.1.3 + 14.1.4 @@ -37,7 +37,7 @@ org.opendaylight.mdsal mdsal-artifacts - 14.0.18 + 15.0.1 pom import diff --git a/mappingservice/southbound/src/main/java/org/opendaylight/lispflowmapping/southbound/lisp/AuthenticationKeyDataListener.java b/mappingservice/southbound/src/main/java/org/opendaylight/lispflowmapping/southbound/lisp/AuthenticationKeyDataListener.java index 0ddcca62..9bff6341 100644 --- a/mappingservice/southbound/src/main/java/org/opendaylight/lispflowmapping/southbound/lisp/AuthenticationKeyDataListener.java +++ b/mappingservice/southbound/src/main/java/org/opendaylight/lispflowmapping/southbound/lisp/AuthenticationKeyDataListener.java @@ -14,7 +14,6 @@ import org.opendaylight.lispflowmapping.lisp.util.LispAddressUtil; import org.opendaylight.lispflowmapping.mapcache.AuthKeyDb; import org.opendaylight.mdsal.binding.api.DataBroker; import org.opendaylight.mdsal.binding.api.DataObjectModification; -import org.opendaylight.mdsal.binding.api.DataObjectModification.ModificationType; import org.opendaylight.mdsal.binding.api.DataTreeChangeListener; import org.opendaylight.mdsal.binding.api.DataTreeModification; import org.opendaylight.mdsal.common.api.LogicalDatastoreType; @@ -59,36 +58,32 @@ public class AuthenticationKeyDataListener implements DataTreeChangeListener change : changes) { final DataObjectModification mod = change.getRootNode(); - if (ModificationType.DELETE == mod.modificationType()) { - final AuthenticationKey authKey = mod.dataBefore(); + switch (mod.modificationType()) { + case DELETE -> { + final AuthenticationKey authKey = mod.dataBefore(); - LOG.trace("Received deleted data"); - LOG.trace("Key: {}", change.getRootPath().path()); - LOG.trace("Value: {}", authKey); + LOG.trace("Received deleted data"); + LOG.trace("Key: {}", change.getRootPath().path()); + LOG.trace("Value: {}", authKey); - final AuthenticationKey convertedAuthKey = convertToBinaryIfNecessary(authKey); + final AuthenticationKey convertedAuthKey = convertToBinaryIfNecessary(authKey); - akdb.removeAuthenticationKey(convertedAuthKey.getEid()); - updatedEntries.put(convertedAuthKey.getEid(), System.currentTimeMillis()); - } else if (ModificationType.WRITE == mod.modificationType() - || ModificationType.SUBTREE_MODIFIED == mod.modificationType()) { - if (ModificationType.WRITE == mod.modificationType()) { - LOG.trace("Received created data"); - } else { - LOG.trace("Received updated data"); + akdb.removeAuthenticationKey(convertedAuthKey.getEid()); + updatedEntries.put(convertedAuthKey.getEid(), System.currentTimeMillis()); } - // Process newly created or updated authentication keys - final AuthenticationKey authKey = mod.dataAfter(); + case SUBTREE_MODIFIED, WRITE -> { + // Process newly created or updated authentication keys + final AuthenticationKey authKey = mod.dataAfter(); - LOG.trace("Key: {}", change.getRootPath().path()); - LOG.trace("Value: {}", authKey); + LOG.trace("Key: {}", change.getRootPath().path()); + LOG.trace("Value: {}", authKey); - final AuthenticationKey convertedAuthKey = convertToBinaryIfNecessary(authKey); + final AuthenticationKey convertedAuthKey = convertToBinaryIfNecessary(authKey); - akdb.addAuthenticationKey(convertedAuthKey.getEid(), convertedAuthKey.getMappingAuthkey()); - updatedEntries.put(convertedAuthKey.getEid(), System.currentTimeMillis()); - } else { - LOG.warn("Ignoring unhandled modification type {}", mod.modificationType()); + akdb.addAuthenticationKey(convertedAuthKey.getEid(), convertedAuthKey.getMappingAuthkey()); + updatedEntries.put(convertedAuthKey.getEid(), System.currentTimeMillis()); + } + default -> LOG.warn("Ignoring unhandled modification type {}", mod.modificationType()); } } } diff --git a/mappingservice/southbound/src/test/java/org/opendaylight/lispflowmapping/southbound/lisp/AuthenticationKeyDataListenerTest.java b/mappingservice/southbound/src/test/java/org/opendaylight/lispflowmapping/southbound/lisp/AuthenticationKeyDataListenerTest.java index 5a8fac36..722d7461 100644 --- a/mappingservice/southbound/src/test/java/org/opendaylight/lispflowmapping/southbound/lisp/AuthenticationKeyDataListenerTest.java +++ b/mappingservice/southbound/src/test/java/org/opendaylight/lispflowmapping/southbound/lisp/AuthenticationKeyDataListenerTest.java @@ -18,7 +18,9 @@ import org.mockito.junit.MockitoJUnitRunner; import org.opendaylight.lispflowmapping.lisp.util.LispAddressUtil; import org.opendaylight.lispflowmapping.mapcache.AuthKeyDb; import org.opendaylight.mdsal.binding.api.DataBroker; -import org.opendaylight.mdsal.binding.api.DataObjectModification; +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; @@ -46,9 +48,9 @@ public class AuthenticationKeyDataListenerTest { private static DataTreeModification change_del; private static DataTreeModification change_subtreeModified; private static DataTreeModification change_write; - private static DataObjectModification mod_del; - private static DataObjectModification mod_subtreeModified; - private static DataObjectModification mod_write; + private static DataObjectDeleted mod_del; + private static DataObjectModified mod_subtreeModified; + private static DataObjectWritten mod_write; private static final String IPV4_STRING_1 = "192.168.0.1"; private static final String IPV4_STRING_2 = "192.168.0.2"; @@ -70,7 +72,6 @@ public class AuthenticationKeyDataListenerTest { private static final AuthenticationKey AUTHENTICATION_KEY_PREFIX = getAuthenticationKey(IPV4_PREFIX_EID); @Before - @SuppressWarnings("unchecked") public void init() { final DataTreeIdentifier dataTreeIdentifier = DataTreeIdentifier.of(LogicalDatastoreType.CONFIGURATION, InstanceIdentifier.builder(MappingDatabase.class) @@ -81,9 +82,9 @@ public class AuthenticationKeyDataListenerTest { change_del = Mockito.mock(DataTreeModification.class); change_subtreeModified = Mockito.mock(DataTreeModification.class); change_write = Mockito.mock(DataTreeModification.class); - mod_del = Mockito.mock(DataObjectModification.class); - mod_subtreeModified = Mockito.mock(DataObjectModification.class); - mod_write = Mockito.mock(DataObjectModification.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); @@ -91,10 +92,6 @@ public class AuthenticationKeyDataListenerTest { 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(mod_del.modificationType()).thenReturn(DataObjectModification.ModificationType.DELETE); - Mockito.when(mod_subtreeModified.modificationType()) - .thenReturn(DataObjectModification.ModificationType.SUBTREE_MODIFIED); - Mockito.when(mod_write.modificationType()).thenReturn(DataObjectModification.ModificationType.WRITE); Mockito.when(brokerMock.registerTreeChangeListener(Mockito.any(), Mockito.any(), Mockito.any(AuthenticationKeyDataListener.class))).thenReturn(registrationMock); @@ -145,21 +142,6 @@ public class AuthenticationKeyDataListenerTest { Mockito.verify(akdbMock).addAuthenticationKey(IPV4_BINARY_EID_3, MAPPING_AUTHKEY); } - /** - * Tests {@link AuthenticationKeyDataListener#onDataTreeChanged} method with null mod type. - */ - @Test - @SuppressWarnings("unchecked") - public void onDataTreeChangedTest_nullModType() { - final DataTreeModification change_nullModType = Mockito.mock(DataTreeModification.class); - final DataObjectModification mod_nullModType = Mockito.mock(DataObjectModification.class); - Mockito.when(change_nullModType.getRootNode()).thenReturn(mod_nullModType); - Mockito.when(mod_nullModType.modificationType()).thenReturn(null); - - authenticationKeyDataListener.onDataTreeChanged(Lists.newArrayList(change_nullModType)); - Mockito.verifyNoInteractions(akdbMock); - } - /** * Tests {@link AuthenticationKeyDataListener#closeDataChangeListener} method. */ diff --git a/mappingservice/southbound/src/test/java/org/opendaylight/lispflowmapping/southbound/lisp/LispSouthboundHandlerTest.java b/mappingservice/southbound/src/test/java/org/opendaylight/lispflowmapping/southbound/lisp/LispSouthboundHandlerTest.java index 80220094..31c83744 100644 --- a/mappingservice/southbound/src/test/java/org/opendaylight/lispflowmapping/southbound/lisp/LispSouthboundHandlerTest.java +++ b/mappingservice/southbound/src/test/java/org/opendaylight/lispflowmapping/southbound/lisp/LispSouthboundHandlerTest.java @@ -65,7 +65,6 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.lfm.lisp.proto.rev151105.Me import org.opendaylight.yang.gen.v1.urn.opendaylight.lfm.lisp.proto.rev151105.RequestMapping; 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.eid.list.EidItem; -import org.opendaylight.yang.gen.v1.urn.opendaylight.lfm.lisp.proto.rev151105.locatorrecords.LocatorRecord; import org.opendaylight.yang.gen.v1.urn.opendaylight.lfm.lisp.proto.rev151105.locatorrecords.LocatorRecordBuilder; import org.opendaylight.yang.gen.v1.urn.opendaylight.lfm.lisp.proto.rev151105.map.register.cache.key.container.MapRegisterCacheKey; import org.opendaylight.yang.gen.v1.urn.opendaylight.lfm.lisp.proto.rev151105.map.register.cache.key.container.MapRegisterCacheKeyBuilder; @@ -182,7 +181,7 @@ public class LispSouthboundHandlerTest { + "0050 2a cd 39 c8 d6 08 00 01 01 02 03 04 00 01 c0 a8 88 0a 00 20 " + "0060 00 01 01 02 03 04"); mapReplyBuilder = new MapReplyBuilder(); - mapReplyBuilder.setMappingRecordItem(new ArrayList()); + mapReplyBuilder.setMappingRecordItem(new ArrayList<>()); mapReplyBuilder.setNonce((long) 0); mapReplyBuilder.setEchoNonceEnabled(false); mapReplyBuilder.setProbe(true); @@ -190,7 +189,7 @@ public class LispSouthboundHandlerTest { mappingRecordBuilder = new MappingRecordBuilder(); String ip = "0.0.0.0"; mappingRecordBuilder.setEid(LispAddressUtil.asIpv4PrefixEid(ip + "/0")); - mappingRecordBuilder.setLocatorRecord(new ArrayList()); + mappingRecordBuilder.setLocatorRecord(new ArrayList<>()); mappingRecordBuilder.setRecordTtl(10); mappingRecordBuilder.setMapVersion((short) 0); mappingRecordBuilder.setAction(Action.NativelyForward); @@ -670,7 +669,7 @@ public class LispSouthboundHandlerTest { private DatagramPacket lastMapNotifyPacket() { if (mapNotifyBuilder.getMappingRecordItem() == null) { - mapNotifyBuilder.setMappingRecordItem(new ArrayList()); + mapNotifyBuilder.setMappingRecordItem(new ArrayList<>()); } mapNotifyBuilder.getMappingRecordItem().add(new MappingRecordItemBuilder() .setMappingRecordItemId("foo") -- 2.34.1 From 7fde16ebdeba0f1889ae2244d02dd645a57edfc8 Mon Sep 17 00:00:00 2001 From: jenkins-releng Date: Fri, 17 Oct 2025 17:49:14 +0000 Subject: [PATCH 4/4] 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 fac8e717..d07f1d01 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.22.0-SNAPSHOT + 1.22.0 pom diff --git a/commons/build_tools/pom.xml b/commons/build_tools/pom.xml index 4363358c..fbea2023 100644 --- a/commons/build_tools/pom.xml +++ b/commons/build_tools/pom.xml @@ -5,7 +5,7 @@ org.opendaylight.lispflowmapping lispflowmapping-commons - 1.22.0-SNAPSHOT + 1.22.0 ../parent diff --git a/commons/parent/pom.xml b/commons/parent/pom.xml index ce79814f..e790fcb6 100644 --- a/commons/parent/pom.xml +++ b/commons/parent/pom.xml @@ -21,7 +21,7 @@ org.opendaylight.lispflowmapping lispflowmapping-commons - 1.22.0-SNAPSHOT + 1.22.0 pom @@ -51,7 +51,7 @@ org.opendaylight.lispflowmapping lispflowmapping-artifacts - 1.22.0-SNAPSHOT + 1.22.0 pom import diff --git a/features/features-lispflowmapping/pom.xml b/features/features-lispflowmapping/pom.xml index 37b1409a..5778e468 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.22.0-SNAPSHOT + 1.22.0 feature diff --git a/features/odl-lispflowmapping-inmemorydb/pom.xml b/features/odl-lispflowmapping-inmemorydb/pom.xml index 8b08bdce..dce613e0 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.22.0-SNAPSHOT + 1.22.0 feature diff --git a/features/odl-lispflowmapping-mappingservice-shell/pom.xml b/features/odl-lispflowmapping-mappingservice-shell/pom.xml index a09c7a9f..fe1741a6 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.22.0-SNAPSHOT + 1.22.0 feature diff --git a/features/odl-lispflowmapping-mappingservice/pom.xml b/features/odl-lispflowmapping-mappingservice/pom.xml index 7e7d6c6b..cbe068bb 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.22.0-SNAPSHOT + 1.22.0 feature diff --git a/features/odl-lispflowmapping-models/pom.xml b/features/odl-lispflowmapping-models/pom.xml index 6d8a185a..7fdad3f3 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.22.0-SNAPSHOT + 1.22.0 feature diff --git a/features/odl-lispflowmapping-msmr/pom.xml b/features/odl-lispflowmapping-msmr/pom.xml index 74f1ddc9..ef05e272 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.22.0-SNAPSHOT + 1.22.0 feature diff --git a/features/odl-lispflowmapping-southbound/pom.xml b/features/odl-lispflowmapping-southbound/pom.xml index 840a5d05..044261e8 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.22.0-SNAPSHOT + 1.22.0 feature diff --git a/features/pom.xml b/features/pom.xml index 0215292a..9e1b80d9 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.22.0-SNAPSHOT + 1.22.0 pom diff --git a/integrationtest/pom.xml b/integrationtest/pom.xml index 163e3bf3..2e3de630 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.22.0-SNAPSHOT + 1.22.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.22.0-SNAPSHOT + 1.22.0 zip diff --git a/lispflowmapping-karaf/pom.xml b/lispflowmapping-karaf/pom.xml index be865234..08d3bc71 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.22.0-SNAPSHOT + 1.22.0 pom diff --git a/mappingservice/api/pom.xml b/mappingservice/api/pom.xml index 1c4545bc..f1f5383f 100644 --- a/mappingservice/api/pom.xml +++ b/mappingservice/api/pom.xml @@ -11,7 +11,7 @@ org.opendaylight.lispflowmapping mappingservice.api - 1.22.0-SNAPSHOT + 1.22.0 bundle diff --git a/mappingservice/dsbackend/pom.xml b/mappingservice/dsbackend/pom.xml index ca3b05b3..fb5e978d 100644 --- a/mappingservice/dsbackend/pom.xml +++ b/mappingservice/dsbackend/pom.xml @@ -13,7 +13,7 @@ org.opendaylight.lispflowmapping mappingservice-parent - 1.22.0-SNAPSHOT + 1.22.0 mappingservice.dsbackend diff --git a/mappingservice/implementation/pom.xml b/mappingservice/implementation/pom.xml index cc850fc4..4e7218ac 100644 --- a/mappingservice/implementation/pom.xml +++ b/mappingservice/implementation/pom.xml @@ -5,7 +5,7 @@ org.opendaylight.lispflowmapping mappingservice-parent - 1.22.0-SNAPSHOT + 1.22.0 mappingservice.implementation diff --git a/mappingservice/inmemorydb/pom.xml b/mappingservice/inmemorydb/pom.xml index 2632e844..57d6fbd6 100644 --- a/mappingservice/inmemorydb/pom.xml +++ b/mappingservice/inmemorydb/pom.xml @@ -5,7 +5,7 @@ org.opendaylight.lispflowmapping mappingservice-parent - 1.22.0-SNAPSHOT + 1.22.0 mappingservice.inmemorydb diff --git a/mappingservice/lisp-proto/pom.xml b/mappingservice/lisp-proto/pom.xml index a46042ea..5a6302f4 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.22.0-SNAPSHOT + 1.22.0 bundle diff --git a/mappingservice/mapcache/pom.xml b/mappingservice/mapcache/pom.xml index 92459179..720d72ed 100644 --- a/mappingservice/mapcache/pom.xml +++ b/mappingservice/mapcache/pom.xml @@ -5,7 +5,7 @@ org.opendaylight.lispflowmapping mappingservice-parent - 1.22.0-SNAPSHOT + 1.22.0 mappingservice.mapcache diff --git a/mappingservice/pom.xml b/mappingservice/pom.xml index 28eeead4..5cb47ad1 100644 --- a/mappingservice/pom.xml +++ b/mappingservice/pom.xml @@ -11,7 +11,7 @@ org.opendaylight.lispflowmapping mappingservice-parent - 1.22.0-SNAPSHOT + 1.22.0 pom diff --git a/mappingservice/shell/pom.xml b/mappingservice/shell/pom.xml index 6cf1bf7e..2ad2a0c7 100644 --- a/mappingservice/shell/pom.xml +++ b/mappingservice/shell/pom.xml @@ -5,7 +5,7 @@ org.opendaylight.lispflowmapping mappingservice-parent - 1.22.0-SNAPSHOT + 1.22.0 mappingservice.shell diff --git a/mappingservice/southbound/pom.xml b/mappingservice/southbound/pom.xml index 0b5d95de..cea085d7 100644 --- a/mappingservice/southbound/pom.xml +++ b/mappingservice/southbound/pom.xml @@ -5,7 +5,7 @@ org.opendaylight.lispflowmapping mappingservice-parent - 1.22.0-SNAPSHOT + 1.22.0 mappingservice.southbound diff --git a/pom.xml b/pom.xml index ba7c8b66..90bab88f 100644 --- a/pom.xml +++ b/pom.xml @@ -5,7 +5,7 @@ org.opendaylight.lispflowmapping lispflowmapping-commons - 1.22.0-SNAPSHOT + 1.22.0 commons/parent -- 2.34.1