From a4d892d8215a71c0be1c399254d88fe0af542649 Mon Sep 17 00:00:00 2001 From: Robert Varga Date: Mon, 29 Sep 2025 19:07:10 +0200 Subject: [PATCH 1/3] 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 cd27691fc185278d251bfe92eb9b4ac3f5dbd77b Mon Sep 17 00:00:00 2001 From: Robert Varga Date: Mon, 29 Sep 2025 18:55:40 +0200 Subject: [PATCH 2/3] WIP: Bump upstreams Adopt: - ietf-1.0.0 - mdsal-15.0.0 - controller-12.0.0 - aaa-0.22.0 - netconf-10.0.0-SNAPSHOT Change-Id: I909e9209ab4345e81647fcc560950205f859a6e0 Signed-off-by: Robert Varga --- commons/parent/pom.xml | 4 ++-- features/odl-lispflowmapping-inmemorydb/pom.xml | 2 +- .../src/main/feature/feature.xml | 2 +- features/odl-lispflowmapping-mappingservice/pom.xml | 2 +- .../src/main/feature/feature.xml | 2 +- features/odl-lispflowmapping-models/pom.xml | 10 +++++----- .../src/main/feature/feature.xml | 2 +- features/odl-lispflowmapping-southbound/pom.xml | 4 ++-- .../src/main/feature/feature.xml | 6 +++--- integrationtest/pom.xml | 2 +- mappingservice/api/pom.xml | 4 ++-- mappingservice/lisp-proto/pom.xml | 6 +++--- mappingservice/pom.xml | 2 +- 13 files changed, 24 insertions(+), 24 deletions(-) diff --git a/commons/parent/pom.xml b/commons/parent/pom.xml index 9d0ecf97..2c22d770 100644 --- a/commons/parent/pom.xml +++ b/commons/parent/pom.xml @@ -37,14 +37,14 @@ org.opendaylight.mdsal mdsal-artifacts - 14.0.18 + 15.0.0 pom import org.opendaylight.controller controller-artifacts - 11.0.2 + 12.0.0 pom import diff --git a/features/odl-lispflowmapping-inmemorydb/pom.xml b/features/odl-lispflowmapping-inmemorydb/pom.xml index f7790cda..6e29e35c 100644 --- a/features/odl-lispflowmapping-inmemorydb/pom.xml +++ b/features/odl-lispflowmapping-inmemorydb/pom.xml @@ -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.0 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/pom.xml b/features/odl-lispflowmapping-mappingservice/pom.xml index c4126ac4..4412d632 100644 --- a/features/odl-lispflowmapping-mappingservice/pom.xml +++ b/features/odl-lispflowmapping-mappingservice/pom.xml @@ -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-SNAPSHOT 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..dcb0c568 100644 --- a/features/odl-lispflowmapping-models/pom.xml +++ b/features/odl-lispflowmapping-models/pom.xml @@ -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.0 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-southbound/pom.xml b/features/odl-lispflowmapping-southbound/pom.xml index 070bec33..00984875 100644 --- a/features/odl-lispflowmapping-southbound/pom.xml +++ b/features/odl-lispflowmapping-southbound/pom.xml @@ -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.0 import pom org.opendaylight.netconf netconf-artifacts - 9.0.1 + 10.0.0-SNAPSHOT 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/integrationtest/pom.xml b/integrationtest/pom.xml index dfd51c82..f8e7427d 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.0 diff --git a/mappingservice/api/pom.xml b/mappingservice/api/pom.xml index 81fad0e5..21057b54 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.0 @@ -32,7 +32,7 @@ yang-ext - org.opendaylight.mdsal.binding.model.ietf + org.opendaylight.ietf.model rfc6991-ietf-inet-types diff --git a/mappingservice/lisp-proto/pom.xml b/mappingservice/lisp-proto/pom.xml index 863ac73f..9632394a 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.0 @@ -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..d6e695f1 100644 --- a/mappingservice/pom.xml +++ b/mappingservice/pom.xml @@ -37,7 +37,7 @@ org.opendaylight.mdsal mdsal-artifacts - 14.0.18 + 15.0.0 pom import -- 2.34.1 From a46d702328331099bf89cd367421fe24a7b1b48f Mon Sep 17 00:00:00 2001 From: jenkins-releng Date: Mon, 29 Sep 2025 17:10:28 +0000 Subject: [PATCH 3/3] 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 | 4 ++-- features/odl-lispflowmapping-models/pom.xml | 2 +- features/odl-lispflowmapping-msmr/pom.xml | 2 +- features/odl-lispflowmapping-southbound/pom.xml | 4 ++-- 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, 27 insertions(+), 27 deletions(-) diff --git a/artifacts/pom.xml b/artifacts/pom.xml index bba62d1d..ddb60391 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 2c22d770..f8c93816 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 584cdfc8..aa7811c6 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 6e29e35c..2caeeeda 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 faa733df..11ed0daa 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 4412d632..f306a7da 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 @@ -29,7 +29,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html org.opendaylight.netconf netconf-artifacts - 10.0.0-SNAPSHOT + 10.0.0 import pom diff --git a/features/odl-lispflowmapping-models/pom.xml b/features/odl-lispflowmapping-models/pom.xml index dcb0c568..89a21e87 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 7624ac86..93b4e719 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 00984875..45e576e5 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 @@ -36,7 +36,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html org.opendaylight.netconf netconf-artifacts - 10.0.0-SNAPSHOT + 10.0.0 import pom diff --git a/features/pom.xml b/features/pom.xml index 6cf21d8a..7a84ef98 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 f8e7427d..2a6bcb25 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 b934d46a..358dff0c 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 21057b54..cfde717c 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 9632394a..bae9add7 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 d6e695f1..f4ea044e 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