From 68da1301f188130063ffccec46f2e11c2d40d408 Mon Sep 17 00:00:00 2001 From: Gilles Thouenon Date: Fri, 7 Jun 2024 20:41:15 +0200 Subject: [PATCH] Bump upstream dependencies to Ca-SR1 Adopt: - odlparent-13.1.3 - yangtools-13.0.6 - mdsal-13.0.4 - netconf-7.0.6 - transportpce-models-20.1.1 Aslo adapt lighty build to tapi code evolution. JIRA: TRNSPRTPCE-799 Change-Id: If1a2e0f19b7dd2885dd952b271090dc46df44edd Signed-off-by: Gilles Thouenon --- api/pom.xml | 4 ++-- artifacts/pom.xml | 2 +- common/pom.xml | 6 +++--- dmaap-client/pom.xml | 4 ++-- features/features-transportpce/pom.xml | 2 +- features/odl-transportpce-dmaap-client/pom.xml | 2 +- features/odl-transportpce-inventory/pom.xml | 8 ++++---- features/odl-transportpce-nbinotifications/pom.xml | 2 +- features/odl-transportpce-tapi/pom.xml | 10 +++++----- features/odl-transportpce/pom.xml | 6 +++--- features/pom.xml | 2 +- inventory/pom.xml | 6 +++--- karaf/pom.xml | 2 +- lighty/pom.xml | 4 ++-- .../controllers/tpce/module/TransportPCEImpl.java | 8 ++++++-- nbinotifications/pom.xml | 4 ++-- networkmodel/pom.xml | 10 +++++----- olm/pom.xml | 4 ++-- pce/pom.xml | 6 +++--- pom.xml | 2 +- renderer/pom.xml | 4 ++-- servicehandler/pom.xml | 4 ++-- tapi/pom.xml | 6 +++--- test-common/pom.xml | 6 +++--- 24 files changed, 59 insertions(+), 55 deletions(-) diff --git a/api/pom.xml b/api/pom.xml index 693e955f3..ec378c300 100644 --- a/api/pom.xml +++ b/api/pom.xml @@ -12,7 +12,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html org.opendaylight.mdsal binding-parent - 13.0.1 + 13.0.4 @@ -22,7 +22,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html bundle - 21.0.0-SNAPSHOT + 20.1.1 diff --git a/artifacts/pom.xml b/artifacts/pom.xml index a7f3cfc8a..9d921684a 100644 --- a/artifacts/pom.xml +++ b/artifacts/pom.xml @@ -13,7 +13,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html INTERNAL org.opendaylight.odlparent odlparent-lite - 13.0.11 + 13.1.3 diff --git a/common/pom.xml b/common/pom.xml index 657be299b..efa131ce8 100644 --- a/common/pom.xml +++ b/common/pom.xml @@ -10,7 +10,7 @@ org.opendaylight.mdsal binding-parent - 13.0.1 + 13.0.4 @@ -20,7 +20,7 @@ bundle - 21.0.0-SNAPSHOT + 20.1.1 @@ -35,7 +35,7 @@ org.opendaylight.netconf netconf-artifacts - 7.0.4 + 7.0.6 import pom diff --git a/dmaap-client/pom.xml b/dmaap-client/pom.xml index df2cae493..a556ad2e6 100644 --- a/dmaap-client/pom.xml +++ b/dmaap-client/pom.xml @@ -9,7 +9,7 @@ org.opendaylight.mdsal binding-parent - 13.0.1 + 13.0.4 @@ -20,7 +20,7 @@ client to send message to Dmaap message router - 21.0.0-SNAPSHOT + 20.1.1 UTF-8 diff --git a/features/features-transportpce/pom.xml b/features/features-transportpce/pom.xml index 4c91daabf..03bc559f9 100644 --- a/features/features-transportpce/pom.xml +++ b/features/features-transportpce/pom.xml @@ -12,7 +12,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html INTERNAL org.opendaylight.odlparent feature-repo-parent - 13.0.11 + 13.1.3 diff --git a/features/odl-transportpce-dmaap-client/pom.xml b/features/odl-transportpce-dmaap-client/pom.xml index c584e675f..c06b1a2c7 100644 --- a/features/odl-transportpce-dmaap-client/pom.xml +++ b/features/odl-transportpce-dmaap-client/pom.xml @@ -11,7 +11,7 @@ org.opendaylight.odlparent single-feature-parent - 13.0.11 + 13.1.3 diff --git a/features/odl-transportpce-inventory/pom.xml b/features/odl-transportpce-inventory/pom.xml index 6b965d0a2..8dc47eefb 100644 --- a/features/odl-transportpce-inventory/pom.xml +++ b/features/odl-transportpce-inventory/pom.xml @@ -9,7 +9,7 @@ org.opendaylight.odlparent single-feature-parent - 13.0.11 + 13.1.3 @@ -20,9 +20,9 @@ OpenDaylight :: transportpce :: Inventory - 13.0.1 - 7.0.4 - 21.0.0-SNAPSHOT + 13.0.4 + 7.0.6 + 20.1.1 localhost:3306 transportpce root diff --git a/features/odl-transportpce-nbinotifications/pom.xml b/features/odl-transportpce-nbinotifications/pom.xml index 42810dcf9..c2e5db503 100644 --- a/features/odl-transportpce-nbinotifications/pom.xml +++ b/features/odl-transportpce-nbinotifications/pom.xml @@ -11,7 +11,7 @@ org.opendaylight.odlparent single-feature-parent - 13.0.11 + 13.1.3 diff --git a/features/odl-transportpce-tapi/pom.xml b/features/odl-transportpce-tapi/pom.xml index c1848d523..99a004699 100644 --- a/features/odl-transportpce-tapi/pom.xml +++ b/features/odl-transportpce-tapi/pom.xml @@ -12,7 +12,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html INTERNAL org.opendaylight.odlparent single-feature-parent - 13.0.11 + 13.1.3 @@ -23,9 +23,9 @@ and is available at http://www.eclipse.org/legal/epl-v10.html INTERNAL OpenDaylight :: transportpce :: tapi - 13.0.1 - 7.0.4 - 21.0.0-SNAPSHOT + 13.0.4 + 7.0.6 + 20.1.1 false @@ -41,7 +41,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html INTERNAL org.opendaylight.mdsal mdsal-artifacts - 13.0.1 + 13.0.4 import pom diff --git a/features/odl-transportpce/pom.xml b/features/odl-transportpce/pom.xml index c56a39f1c..a2e75bccf 100644 --- a/features/odl-transportpce/pom.xml +++ b/features/odl-transportpce/pom.xml @@ -12,7 +12,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html INTERNAL org.opendaylight.odlparent single-feature-parent - 13.0.11 + 13.1.3 @@ -23,8 +23,8 @@ and is available at http://www.eclipse.org/legal/epl-v10.html INTERNAL OpenDaylight :: transportpce - 7.0.4 - 21.0.0-SNAPSHOT + 7.0.6 + 20.1.1 etc/opendaylight/karaf false diff --git a/features/pom.xml b/features/pom.xml index 1d79b7023..2e9fab2f6 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 INTERNAL org.opendaylight.odlparent odlparent-lite - 13.0.11 + 13.1.3 diff --git a/inventory/pom.xml b/inventory/pom.xml index 43f765abe..cea39935f 100644 --- a/inventory/pom.xml +++ b/inventory/pom.xml @@ -10,7 +10,7 @@ org.opendaylight.mdsal binding-parent - 13.0.1 + 13.0.4 @@ -20,7 +20,7 @@ bundle - 21.0.0-SNAPSHOT + 20.1.1 @@ -35,7 +35,7 @@ org.opendaylight.netconf netconf-artifacts - 7.0.4 + 7.0.6 import pom diff --git a/karaf/pom.xml b/karaf/pom.xml index b5ea8c0e3..40c6de513 100644 --- a/karaf/pom.xml +++ b/karaf/pom.xml @@ -12,7 +12,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html INTERNAL org.opendaylight.odlparent karaf4-parent - 13.0.11 + 13.1.3 diff --git a/lighty/pom.xml b/lighty/pom.xml index 461159d7a..4c4a235f9 100644 --- a/lighty/pom.xml +++ b/lighty/pom.xml @@ -24,8 +24,8 @@ io.lighty.controllers.tpce.Main true true - 10.0.0-SNAPSHOT - 21.0.0-SNAPSHOT + 9.1.1-SNAPSHOT + 20.1.1 diff --git a/lighty/src/main/java/io/lighty/controllers/tpce/module/TransportPCEImpl.java b/lighty/src/main/java/io/lighty/controllers/tpce/module/TransportPCEImpl.java index 0cdc6779e..fa62af0a6 100644 --- a/lighty/src/main/java/io/lighty/controllers/tpce/module/TransportPCEImpl.java +++ b/lighty/src/main/java/io/lighty/controllers/tpce/module/TransportPCEImpl.java @@ -76,6 +76,7 @@ import org.opendaylight.transportpce.tapi.impl.TapiProvider; import org.opendaylight.transportpce.tapi.listeners.TapiNetworkModelNotificationHandler; import org.opendaylight.transportpce.tapi.topology.TapiNetworkModelServiceImpl; import org.opendaylight.transportpce.tapi.topology.TapiNetworkUtilsImpl; +import org.opendaylight.transportpce.tapi.utils.TapiContext; import org.opendaylight.transportpce.tapi.utils.TapiLink; import org.opendaylight.transportpce.tapi.utils.TapiLinkImpl; import org.opendaylight.yangtools.concepts.Registration; @@ -218,7 +219,8 @@ public class TransportPCEImpl extends AbstractLightyModule implements TransportP if (activateTapi) { LOG.info("Creating tapi beans ..."); - TapiLink tapiLink = new TapiLinkImpl(networkTransaction); + TapiContext tapiContext = new TapiContext(networkTransaction); + TapiLink tapiLink = new TapiLinkImpl(networkTransaction,tapiContext); new TapiNetworkUtilsImpl(rpcProviderService, networkTransaction, tapiLink); tapiProvider = new TapiProvider( dataBroker, @@ -233,7 +235,9 @@ public class TransportPCEImpl extends AbstractLightyModule implements TransportP networkTransaction, deviceTransactionManager, tapiLink, - notificationPublishService)); + notificationPublishService), + tapiLink, + tapiContext); rpcRegistrations.add(tapiProvider.getRegisteredRpcs()); } if (activateNbiNotification) { diff --git a/nbinotifications/pom.xml b/nbinotifications/pom.xml index 76d928329..feb1f2bc6 100644 --- a/nbinotifications/pom.xml +++ b/nbinotifications/pom.xml @@ -11,7 +11,7 @@ org.opendaylight.mdsal binding-parent - 13.0.1 + 13.0.4 @@ -22,7 +22,7 @@ UTF-8 - 21.0.0-SNAPSHOT + 20.1.1 3.7.0 diff --git a/networkmodel/pom.xml b/networkmodel/pom.xml index ec789f74d..9e08193c5 100644 --- a/networkmodel/pom.xml +++ b/networkmodel/pom.xml @@ -13,7 +13,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html org.opendaylight.odlparent bundle-parent - 13.0.11 + 13.1.3 @@ -23,7 +23,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html bundle - 21.0.0-SNAPSHOT + 20.1.1 @@ -38,21 +38,21 @@ and is available at http://www.eclipse.org/legal/epl-v10.html org.opendaylight.yangtools yangtools-artifacts - 13.0.2 + 13.0.6 import pom org.opendaylight.mdsal mdsal-artifacts - 13.0.1 + 13.0.4 import pom org.opendaylight.netconf netconf-artifacts - 7.0.4 + 7.0.6 import pom diff --git a/olm/pom.xml b/olm/pom.xml index 6a3a9b89f..801cda104 100644 --- a/olm/pom.xml +++ b/olm/pom.xml @@ -13,7 +13,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html org.opendaylight.mdsal binding-parent - 13.0.1 + 13.0.4 @@ -23,7 +23,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html bundle - 21.0.0-SNAPSHOT + 20.1.1 diff --git a/pce/pom.xml b/pce/pom.xml index 922c1d845..e83e34765 100644 --- a/pce/pom.xml +++ b/pce/pom.xml @@ -14,7 +14,7 @@ org.opendaylight.mdsal binding-parent - 13.0.1 + 13.0.4 @@ -24,7 +24,7 @@ bundle - 21.0.0-SNAPSHOT + 20.1.1 @@ -39,7 +39,7 @@ org.opendaylight.mdsal mdsal-artifacts - 13.0.1 + 13.0.4 import pom diff --git a/pom.xml b/pom.xml index aa058cf32..35aa41cf2 100644 --- a/pom.xml +++ b/pom.xml @@ -12,7 +12,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html INTERNAL org.opendaylight.odlparent odlparent-lite - 13.0.11 + 13.1.3 diff --git a/renderer/pom.xml b/renderer/pom.xml index 29a201dd4..f24cc14ec 100644 --- a/renderer/pom.xml +++ b/renderer/pom.xml @@ -13,7 +13,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html org.opendaylight.mdsal binding-parent - 13.0.1 + 13.0.4 @@ -23,7 +23,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html bundle - 21.0.0-SNAPSHOT + 20.1.1 diff --git a/servicehandler/pom.xml b/servicehandler/pom.xml index cfead14e5..8e128bd34 100644 --- a/servicehandler/pom.xml +++ b/servicehandler/pom.xml @@ -15,7 +15,7 @@ Author: Martial Coulibaly on behalf of Orange org.opendaylight.mdsal binding-parent - 13.0.1 + 13.0.4 @@ -25,7 +25,7 @@ Author: Martial Coulibaly on behalf of Orange bundle - 21.0.0-SNAPSHOT + 20.1.1 diff --git a/tapi/pom.xml b/tapi/pom.xml index e9d02450a..74b0dace5 100644 --- a/tapi/pom.xml +++ b/tapi/pom.xml @@ -15,7 +15,7 @@ Author: Martial Coulibaly on behalf of Orange org.opendaylight.mdsal binding-parent - 13.0.1 + 13.0.4 @@ -25,7 +25,7 @@ Author: Martial Coulibaly on behalf of Orange bundle - 21.0.0-SNAPSHOT + 20.1.1 @@ -40,7 +40,7 @@ Author: Martial Coulibaly on behalf of Orange org.opendaylight.netconf netconf-artifacts - 7.0.4 + 7.0.6 import pom diff --git a/test-common/pom.xml b/test-common/pom.xml index d01a52968..4daf1b53a 100644 --- a/test-common/pom.xml +++ b/test-common/pom.xml @@ -12,7 +12,7 @@ org.opendaylight.mdsal binding-parent - 13.0.1 + 13.0.4 @@ -22,7 +22,7 @@ bundle - 21.0.0-SNAPSHOT + 20.1.1 @@ -37,7 +37,7 @@ org.opendaylight.netconf netconf-artifacts - 7.0.4 + 7.0.6 import pom -- 2.36.6