From e469f96007756cee894f5ca2f1c108752ef4df1f Mon Sep 17 00:00:00 2001 From: Gilles Thouenon Date: Fri, 20 Jan 2023 09:37:24 +0100 Subject: [PATCH] Bump upstream dependencies to Argon Adopt: - odlparent-12.0.2 - yangtools-10.0.3 - mdsal-11.0.6 - netconf-5.0.2 - transportpce-models-18.0.0-SNAPSHOT Also - add netconf-topology dependency and adapt some netconf imports - adapt GNPy UT - adapt karaf message in functional tests TODO: need to upgrade lighty to 18.0.0 when available JIRA: TRNSPRTPCE-719 Signed-off-by: Gilles Thouenon Change-Id: Icecd1b21a25c1fc7f66b31f090a4a614ba741c6f --- api/pom.xml | 8 +++-- artifacts/pom.xml | 2 +- common/pom.xml | 10 +++++-- .../common/InstanceIdentifiers.java | 2 +- dmaap-client/pom.xml | 4 +-- features/features-transportpce/pom.xml | 2 +- .../odl-transportpce-dmaap-client/pom.xml | 2 +- features/odl-transportpce-inventory/pom.xml | 8 ++--- .../odl-transportpce-nbinotifications/pom.xml | 2 +- features/odl-transportpce-swagger/pom.xml | 4 +-- features/odl-transportpce-tapi/pom.xml | 10 +++---- features/odl-transportpce/pom.xml | 6 ++-- features/pom.xml | 2 +- inventory/pom.xml | 10 +++++-- .../listener/DeviceConfigListener.java | 9 +++--- .../inventory/listener/DeviceListener.java | 12 ++++---- karaf/pom.xml | 2 +- lighty/pom.xml | 2 +- nbinotifications/pom.xml | 4 +-- networkmodel/pom.xml | 14 +++++---- .../networkmodel/NetConfTopologyListener.java | 6 ++-- .../service/NetworkModelService.java | 4 +-- .../service/NetworkModelServiceImpl.java | 4 +-- .../NetConfTopologyListenerTest.java | 30 +++++++++---------- olm/pom.xml | 4 +-- pce/pom.xml | 11 +++++-- .../consumer/RequestMessageBodyWriter.java | 6 ++-- pom.xml | 2 +- renderer/pom.xml | 4 +-- servicehandler/pom.xml | 4 +-- tapi/pom.xml | 10 +++++-- .../TapiNetworkModelListenerImpl.java | 11 +++---- .../topology/TapiNetconfTopologyListener.java | 6 ++-- test-common/pom.xml | 6 ++-- tests/transportpce_tests/common/test_utils.py | 5 ++-- 35 files changed, 127 insertions(+), 101 deletions(-) diff --git a/api/pom.xml b/api/pom.xml index 54d6d8489..a477feb1c 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 - 10.0.6 + 11.0.6 @@ -22,7 +22,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html bundle - 17.2.0 + 18.0.0-SNAPSHOT @@ -90,6 +90,10 @@ and is available at http://www.eclipse.org/legal/epl-v10.html org.opendaylight.mdsal.binding.model.ietf rfc8345-ietf-network-topology + + org.opendaylight.mdsal + yang-binding + com.google.guava guava diff --git a/artifacts/pom.xml b/artifacts/pom.xml index 41e49a98a..ea4f5b55c 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 - 11.0.4 + 12.0.2 diff --git a/common/pom.xml b/common/pom.xml index 9d961519c..7a2233b7c 100644 --- a/common/pom.xml +++ b/common/pom.xml @@ -10,7 +10,7 @@ org.opendaylight.mdsal binding-parent - 10.0.6 + 11.0.6 @@ -20,7 +20,7 @@ bundle - 17.2.0 + 18.0.0-SNAPSHOT @@ -35,7 +35,7 @@ org.opendaylight.netconf netconf-artifacts - 4.0.5 + 5.0.2 import pom @@ -144,6 +144,10 @@ org.opendaylight.mdsal mdsal-binding-runtime-api + + org.opendaylight.netconf + netconf-topology + org.opendaylight.netconf sal-netconf-connector diff --git a/common/src/main/java/org/opendaylight/transportpce/common/InstanceIdentifiers.java b/common/src/main/java/org/opendaylight/transportpce/common/InstanceIdentifiers.java index d8d63d800..cfb6b4995 100644 --- a/common/src/main/java/org/opendaylight/transportpce/common/InstanceIdentifiers.java +++ b/common/src/main/java/org/opendaylight/transportpce/common/InstanceIdentifiers.java @@ -19,7 +19,7 @@ import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.network.top import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.network.topology.rev180226.TpId; import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.network.topology.rev180226.networks.network.node.TerminationPoint; import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.network.topology.rev180226.networks.network.node.TerminationPointKey; -import org.opendaylight.yang.gen.v1.urn.opendaylight.netconf.node.topology.rev150114.network.topology.topology.topology.types.TopologyNetconf; +import org.opendaylight.yang.gen.v1.urn.opendaylight.netconf.node.topology.rev221225.network.topology.topology.topology.types.TopologyNetconf; import org.opendaylight.yang.gen.v1.urn.tbd.params.xml.ns.yang.network.topology.rev131021.NetworkTopology; import org.opendaylight.yang.gen.v1.urn.tbd.params.xml.ns.yang.network.topology.rev131021.TopologyId; import org.opendaylight.yang.gen.v1.urn.tbd.params.xml.ns.yang.network.topology.rev131021.network.topology.Topology; diff --git a/dmaap-client/pom.xml b/dmaap-client/pom.xml index 627d4ac97..9868f208f 100644 --- a/dmaap-client/pom.xml +++ b/dmaap-client/pom.xml @@ -9,7 +9,7 @@ org.opendaylight.mdsal binding-parent - 10.0.6 + 11.0.6 @@ -20,7 +20,7 @@ client to send message to Dmaap message router - 17.2.0 + 18.0.0-SNAPSHOT UTF-8 diff --git a/features/features-transportpce/pom.xml b/features/features-transportpce/pom.xml index 3a74244b1..87cef6434 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 - 11.0.4 + 12.0.2 diff --git a/features/odl-transportpce-dmaap-client/pom.xml b/features/odl-transportpce-dmaap-client/pom.xml index 9f85ca04e..f23bbc963 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 - 11.0.4 + 12.0.2 diff --git a/features/odl-transportpce-inventory/pom.xml b/features/odl-transportpce-inventory/pom.xml index 7333dca3c..1fa07e107 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 - 11.0.4 + 12.0.2 @@ -20,9 +20,9 @@ OpenDaylight :: transportpce :: Inventory - 10.0.6 - 4.0.5 - 17.2.0 + 11.0.6 + 5.0.2 + 18.0.0-SNAPSHOT localhost:3306 transportpce root diff --git a/features/odl-transportpce-nbinotifications/pom.xml b/features/odl-transportpce-nbinotifications/pom.xml index cce8ce599..2ce19aa90 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 - 11.0.4 + 12.0.2 diff --git a/features/odl-transportpce-swagger/pom.xml b/features/odl-transportpce-swagger/pom.xml index 959f3ec1f..bf1359476 100644 --- a/features/odl-transportpce-swagger/pom.xml +++ b/features/odl-transportpce-swagger/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 - 11.0.4 + 12.0.2 @@ -23,7 +23,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html INTERNAL OpenDaylight :: transportpce :: swagger - 4.0.5 + 5.0.2 etc/opendaylight/karaf false diff --git a/features/odl-transportpce-tapi/pom.xml b/features/odl-transportpce-tapi/pom.xml index b59724cc5..f80f8897c 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 - 11.0.4 + 12.0.2 @@ -23,9 +23,9 @@ and is available at http://www.eclipse.org/legal/epl-v10.html INTERNAL OpenDaylight :: transportpce :: tapi - 10.0.6 - 4.0.5 - 17.2.0 + 11.0.6 + 5.0.2 + 18.0.0-SNAPSHOT false @@ -41,7 +41,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html INTERNAL org.opendaylight.mdsal mdsal-artifacts - 10.0.6 + 11.0.6 import pom diff --git a/features/odl-transportpce/pom.xml b/features/odl-transportpce/pom.xml index 20376a19e..c0c97c2a7 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 - 11.0.4 + 12.0.2 @@ -23,8 +23,8 @@ and is available at http://www.eclipse.org/legal/epl-v10.html INTERNAL OpenDaylight :: transportpce - 4.0.5 - 17.2.0 + 5.0.2 + 18.0.0-SNAPSHOT etc/opendaylight/karaf false diff --git a/features/pom.xml b/features/pom.xml index b49489d26..1659f6454 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 - 11.0.4 + 12.0.2 diff --git a/inventory/pom.xml b/inventory/pom.xml index 58b1a1e54..7d86e0925 100644 --- a/inventory/pom.xml +++ b/inventory/pom.xml @@ -10,7 +10,7 @@ org.opendaylight.mdsal binding-parent - 10.0.6 + 11.0.6 @@ -20,7 +20,7 @@ bundle - 17.2.0 + 18.0.0-SNAPSHOT @@ -35,7 +35,7 @@ org.opendaylight.netconf netconf-artifacts - 4.0.5 + 5.0.2 import pom @@ -92,6 +92,10 @@ com.google.guava guava + + org.opendaylight.netconf + netconf-topology + org.opendaylight.netconf sal-netconf-connector diff --git a/inventory/src/main/java/org/opendaylight/transportpce/inventory/listener/DeviceConfigListener.java b/inventory/src/main/java/org/opendaylight/transportpce/inventory/listener/DeviceConfigListener.java index ae2bd2447..6e4ccfad9 100644 --- a/inventory/src/main/java/org/opendaylight/transportpce/inventory/listener/DeviceConfigListener.java +++ b/inventory/src/main/java/org/opendaylight/transportpce/inventory/listener/DeviceConfigListener.java @@ -18,9 +18,8 @@ import org.opendaylight.mdsal.binding.api.DataTreeChangeListener; import org.opendaylight.mdsal.binding.api.DataTreeModification; import org.opendaylight.transportpce.common.StringConstants; import org.opendaylight.transportpce.inventory.DeviceInventory; -import org.opendaylight.yang.gen.v1.urn.opendaylight.netconf.node.topology.rev150114.NetconfNode; -import org.opendaylight.yang.gen.v1.urn.opendaylight.netconf.node.topology.rev150114.NetconfNodeConnectionStatus; -import org.opendaylight.yang.gen.v1.urn.opendaylight.netconf.node.topology.rev150114.NetconfNodeConnectionStatus.ConnectionStatus; +import org.opendaylight.yang.gen.v1.urn.opendaylight.netconf.device.rev221225.ConnectionOper.ConnectionStatus; +import org.opendaylight.yang.gen.v1.urn.opendaylight.netconf.node.topology.rev221225.NetconfNode; import org.opendaylight.yang.gen.v1.urn.tbd.params.xml.ns.yang.network.topology.rev131021.network.topology.topology.Node; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -56,7 +55,7 @@ public class DeviceConfigListener implements DataTreeChangeListener { LOG.debug("nodeId {}", nodeId); NetconfNode netconfNode = rootNode.getDataAfter().augmentation(NetconfNode.class); - NetconfNodeConnectionStatus.ConnectionStatus connectionStatus = + ConnectionStatus connectionStatus = netconfNode.getConnectionStatus(); long count = netconfNode.getAvailableCapabilities().getAvailableCapability().stream() .filter(cp -> cp.getCapability().contains(StringConstants.OPENROADM_DEVICE_MODEL_NAME)) @@ -89,7 +88,7 @@ public class DeviceConfigListener implements DataTreeChangeListener { */ private void processModifiedSubtree(String nodeId, NetconfNode netconfNode, String openROADMversion) throws InterruptedException, ExecutionException { - NetconfNodeConnectionStatus.ConnectionStatus connectionStatus = netconfNode.getConnectionStatus(); + ConnectionStatus connectionStatus = netconfNode.getConnectionStatus(); /*long count = netconfNode.getAvailableCapabilities().getAvailableCapability().stream() .filter(cp -> cp.getCapability().contains(StringConstants.OPENROADM_DEVICE_MODEL_NAME)).count(); if (count < 1) { diff --git a/inventory/src/main/java/org/opendaylight/transportpce/inventory/listener/DeviceListener.java b/inventory/src/main/java/org/opendaylight/transportpce/inventory/listener/DeviceListener.java index f64836c72..3ba26dfe4 100644 --- a/inventory/src/main/java/org/opendaylight/transportpce/inventory/listener/DeviceListener.java +++ b/inventory/src/main/java/org/opendaylight/transportpce/inventory/listener/DeviceListener.java @@ -17,9 +17,8 @@ import org.opendaylight.mdsal.binding.api.DataTreeChangeListener; import org.opendaylight.mdsal.binding.api.DataTreeModification; import org.opendaylight.transportpce.common.StringConstants; import org.opendaylight.transportpce.inventory.DeviceInventory; -import org.opendaylight.yang.gen.v1.urn.opendaylight.netconf.node.topology.rev150114.NetconfNode; -import org.opendaylight.yang.gen.v1.urn.opendaylight.netconf.node.topology.rev150114.NetconfNodeConnectionStatus; -import org.opendaylight.yang.gen.v1.urn.opendaylight.netconf.node.topology.rev150114.NetconfNodeConnectionStatus.ConnectionStatus; +import org.opendaylight.yang.gen.v1.urn.opendaylight.netconf.device.rev221225.ConnectionOper.ConnectionStatus; +import org.opendaylight.yang.gen.v1.urn.opendaylight.netconf.node.topology.rev221225.NetconfNode; import org.opendaylight.yang.gen.v1.urn.tbd.params.xml.ns.yang.network.topology.rev131021.network.topology.topology.Node; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -50,8 +49,7 @@ public class DeviceListener implements DataTreeChangeListener { for (DataTreeModification device : changesWithoutDefaultNetconfNode) { String nodeId = device.getRootNode().getDataAfter().key().getNodeId().getValue(); NetconfNode netconfNode = device.getRootNode().getDataAfter().augmentation(NetconfNode.class); - NetconfNodeConnectionStatus.ConnectionStatus connectionStatus = - netconfNode.getConnectionStatus(); + ConnectionStatus connectionStatus = netconfNode.getConnectionStatus(); long count = netconfNode.getAvailableCapabilities().getAvailableCapability().stream() .filter(cp -> cp.getCapability().contains(StringConstants.OPENROADM_DEVICE_MODEL_NAME)) .count(); @@ -86,7 +84,7 @@ public class DeviceListener implements DataTreeChangeListener { */ private void processModifiedSubtree(String nodeId, NetconfNode netconfNode, String openROADMversion) throws InterruptedException, ExecutionException { - NetconfNodeConnectionStatus.ConnectionStatus connectionStatus = netconfNode.getConnectionStatus(); + ConnectionStatus connectionStatus = netconfNode.getConnectionStatus(); long count = netconfNode.getAvailableCapabilities().getAvailableCapability().stream() .filter(cp -> cp.getCapability().contains(StringConstants.OPENROADM_DEVICE_MODEL_NAME)) @@ -142,4 +140,4 @@ public class DeviceListener implements DataTreeChangeListener { return change.getRootNode().getDataBefore() != null && change.getRootNode().getDataAfter() == null && ModificationType.DELETE.equals(change.getRootNode().getModificationType()); } -} +} \ No newline at end of file diff --git a/karaf/pom.xml b/karaf/pom.xml index 5e8373813..2054182fa 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 - 11.0.4 + 12.0.2 diff --git a/lighty/pom.xml b/lighty/pom.xml index 5e395b5bb..0da6a9637 100644 --- a/lighty/pom.xml +++ b/lighty/pom.xml @@ -25,7 +25,7 @@ true true 7.0.0-SNAPSHOT - 17.2.0 + 18.0.0-SNAPSHOT diff --git a/nbinotifications/pom.xml b/nbinotifications/pom.xml index 2bbd79f1d..070ec4f99 100644 --- a/nbinotifications/pom.xml +++ b/nbinotifications/pom.xml @@ -11,7 +11,7 @@ org.opendaylight.mdsal binding-parent - 10.0.6 + 11.0.6 @@ -22,7 +22,7 @@ UTF-8 - 17.2.0 + 18.0.0-SNAPSHOT 3.0.0 diff --git a/networkmodel/pom.xml b/networkmodel/pom.xml index 73676f0aa..de28023d0 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 - 11.0.4 + 12.0.2 @@ -23,7 +23,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html bundle - 17.2.0 + 18.0.0-SNAPSHOT @@ -38,21 +38,21 @@ and is available at http://www.eclipse.org/legal/epl-v10.html org.opendaylight.yangtools yangtools-artifacts - 9.0.6 + 10.0.3 import pom org.opendaylight.mdsal mdsal-artifacts - 10.0.6 + 11.0.6 import pom org.opendaylight.netconf netconf-artifacts - 4.0.5 + 5.0.2 import pom @@ -190,6 +190,10 @@ and is available at http://www.eclipse.org/legal/epl-v10.html org.opendaylight.netconf.model rfc5277 + + org.opendaylight.netconf + netconf-topology + org.opendaylight.netconf sal-netconf-connector diff --git a/networkmodel/src/main/java/org/opendaylight/transportpce/networkmodel/NetConfTopologyListener.java b/networkmodel/src/main/java/org/opendaylight/transportpce/networkmodel/NetConfTopologyListener.java index b48c61ffe..1e395c240 100644 --- a/networkmodel/src/main/java/org/opendaylight/transportpce/networkmodel/NetConfTopologyListener.java +++ b/networkmodel/src/main/java/org/opendaylight/transportpce/networkmodel/NetConfTopologyListener.java @@ -38,9 +38,9 @@ import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.netconf.notification. import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.netmod.notification.rev080714.Netconf; import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.netmod.notification.rev080714.netconf.Streams; import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.netmod.notification.rev080714.netconf.streams.Stream; -import org.opendaylight.yang.gen.v1.urn.opendaylight.netconf.node.topology.rev150114.NetconfNode; -import org.opendaylight.yang.gen.v1.urn.opendaylight.netconf.node.topology.rev150114.NetconfNodeConnectionStatus.ConnectionStatus; -import org.opendaylight.yang.gen.v1.urn.opendaylight.netconf.node.topology.rev150114.netconf.node.connection.status.available.capabilities.AvailableCapability; +import org.opendaylight.yang.gen.v1.urn.opendaylight.netconf.device.rev221225.ConnectionOper.ConnectionStatus; +import org.opendaylight.yang.gen.v1.urn.opendaylight.netconf.device.rev221225.connection.oper.available.capabilities.AvailableCapability; +import org.opendaylight.yang.gen.v1.urn.opendaylight.netconf.node.topology.rev221225.NetconfNode; import org.opendaylight.yang.gen.v1.urn.tbd.params.xml.ns.yang.network.topology.rev131021.network.topology.topology.Node; import org.opendaylight.yangtools.yang.binding.InstanceIdentifier; import org.opendaylight.yangtools.yang.common.RpcResult; diff --git a/networkmodel/src/main/java/org/opendaylight/transportpce/networkmodel/service/NetworkModelService.java b/networkmodel/src/main/java/org/opendaylight/transportpce/networkmodel/service/NetworkModelService.java index dbbf0aaaf..e771bae8a 100644 --- a/networkmodel/src/main/java/org/opendaylight/transportpce/networkmodel/service/NetworkModelService.java +++ b/networkmodel/src/main/java/org/opendaylight/transportpce/networkmodel/service/NetworkModelService.java @@ -11,7 +11,7 @@ import java.util.List; import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.networkutils.rev220630.OtnLinkType; import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev220316.mapping.Mapping; import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.renderer.rev210915.renderer.rpc.result.sp.Link; -import org.opendaylight.yang.gen.v1.urn.opendaylight.netconf.node.topology.rev150114.NetconfNodeConnectionStatus; +import org.opendaylight.yang.gen.v1.urn.opendaylight.netconf.device.rev221225.ConnectionOper.ConnectionStatus; import org.opendaylight.yangtools.yang.common.Uint32; /** @@ -59,7 +59,7 @@ public interface NetworkModelService { * @param connectionStatus * connection status of the node */ - void setOpenRoadmNodeStatus(String nodeId, NetconfNodeConnectionStatus.ConnectionStatus connectionStatus); + void setOpenRoadmNodeStatus(String nodeId, ConnectionStatus connectionStatus); /** * create new otn link in otn-topology. diff --git a/networkmodel/src/main/java/org/opendaylight/transportpce/networkmodel/service/NetworkModelServiceImpl.java b/networkmodel/src/main/java/org/opendaylight/transportpce/networkmodel/service/NetworkModelServiceImpl.java index 93dbc07f4..f051e6ccf 100644 --- a/networkmodel/src/main/java/org/opendaylight/transportpce/networkmodel/service/NetworkModelServiceImpl.java +++ b/networkmodel/src/main/java/org/opendaylight/transportpce/networkmodel/service/NetworkModelServiceImpl.java @@ -63,7 +63,7 @@ import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.network.top import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.network.topology.rev180226.networks.network.node.TerminationPoint; import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.network.topology.rev180226.networks.network.node.TerminationPointKey; import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.network.topology.rev180226.networks.network.node.termination.point.SupportingTerminationPoint; -import org.opendaylight.yang.gen.v1.urn.opendaylight.netconf.node.topology.rev150114.NetconfNodeConnectionStatus; +import org.opendaylight.yang.gen.v1.urn.opendaylight.netconf.device.rev221225.ConnectionOper.ConnectionStatus; import org.opendaylight.yangtools.yang.binding.InstanceIdentifier; import org.opendaylight.yangtools.yang.common.Uint32; import org.slf4j.Logger; @@ -185,7 +185,7 @@ public class NetworkModelServiceImpl implements NetworkModelService { } @Override - public void setOpenRoadmNodeStatus(String nodeId, NetconfNodeConnectionStatus.ConnectionStatus connectionStatus) { + public void setOpenRoadmNodeStatus(String nodeId, ConnectionStatus connectionStatus) { LOG.info("setOpenROADMNodeStatus: {} {}", nodeId, connectionStatus.name()); /* TODO: set connection status of the device in model, diff --git a/networkmodel/src/test/java/org/opendaylight/transportpce/networkmodel/NetConfTopologyListenerTest.java b/networkmodel/src/test/java/org/opendaylight/transportpce/networkmodel/NetConfTopologyListenerTest.java index 3656c8f02..7fc2b4c5f 100644 --- a/networkmodel/src/test/java/org/opendaylight/transportpce/networkmodel/NetConfTopologyListenerTest.java +++ b/networkmodel/src/test/java/org/opendaylight/transportpce/networkmodel/NetConfTopologyListenerTest.java @@ -36,14 +36,14 @@ import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types. import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev130715.IpAddress; import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev130715.Ipv4Address; import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev130715.PortNumber; -import org.opendaylight.yang.gen.v1.urn.opendaylight.netconf.node.topology.rev150114.NetconfNode; -import org.opendaylight.yang.gen.v1.urn.opendaylight.netconf.node.topology.rev150114.NetconfNodeBuilder; -import org.opendaylight.yang.gen.v1.urn.opendaylight.netconf.node.topology.rev150114.NetconfNodeConnectionStatus; -import org.opendaylight.yang.gen.v1.urn.opendaylight.netconf.node.topology.rev150114.netconf.node.connection.status.AvailableCapabilities; -import org.opendaylight.yang.gen.v1.urn.opendaylight.netconf.node.topology.rev150114.netconf.node.connection.status.AvailableCapabilitiesBuilder; -import org.opendaylight.yang.gen.v1.urn.opendaylight.netconf.node.topology.rev150114.netconf.node.connection.status.available.capabilities.AvailableCapability; -import org.opendaylight.yang.gen.v1.urn.opendaylight.netconf.node.topology.rev150114.netconf.node.connection.status.available.capabilities.AvailableCapabilityBuilder; -import org.opendaylight.yang.gen.v1.urn.opendaylight.netconf.node.topology.rev150114.netconf.node.credentials.credentials.LoginPasswordBuilder; +import org.opendaylight.yang.gen.v1.urn.opendaylight.netconf.device.rev221225.ConnectionOper.ConnectionStatus; +import org.opendaylight.yang.gen.v1.urn.opendaylight.netconf.device.rev221225.connection.oper.AvailableCapabilities; +import org.opendaylight.yang.gen.v1.urn.opendaylight.netconf.device.rev221225.connection.oper.AvailableCapabilitiesBuilder; +import org.opendaylight.yang.gen.v1.urn.opendaylight.netconf.device.rev221225.connection.oper.available.capabilities.AvailableCapability; +import org.opendaylight.yang.gen.v1.urn.opendaylight.netconf.device.rev221225.connection.oper.available.capabilities.AvailableCapabilityBuilder; +import org.opendaylight.yang.gen.v1.urn.opendaylight.netconf.device.rev221225.credentials.credentials.LoginPasswordBuilder; +import org.opendaylight.yang.gen.v1.urn.opendaylight.netconf.node.topology.rev221225.NetconfNode; +import org.opendaylight.yang.gen.v1.urn.opendaylight.netconf.node.topology.rev221225.NetconfNodeBuilder; import org.opendaylight.yang.gen.v1.urn.tbd.params.xml.ns.yang.network.topology.rev131021.NodeId; import org.opendaylight.yang.gen.v1.urn.tbd.params.xml.ns.yang.network.topology.rev131021.network.topology.topology.Node; import org.opendaylight.yang.gen.v1.urn.tbd.params.xml.ns.yang.network.topology.rev131021.network.topology.topology.NodeBuilder; @@ -74,7 +74,7 @@ public class NetConfTopologyListenerTest { changes.add(ch); when(ch.getRootNode()).thenReturn(node); - final Node netconfNode = getNetconfNode("netconfNode1", NetconfNodeConnectionStatus.ConnectionStatus.Connecting, + final Node netconfNode = getNetconfNode("netconfNode1", ConnectionStatus.Connecting, OPENROADM_DEVICE_VERSION_2_2_1); when(node.getModificationType()).thenReturn(DataObjectModification.ModificationType.DELETE); when(node.getDataBefore()).thenReturn(netconfNode); @@ -98,9 +98,9 @@ public class NetConfTopologyListenerTest { when(ch.getRootNode()).thenReturn(node); final Node netconfNodeBefore = getNetconfNode("netconfNode1", - NetconfNodeConnectionStatus.ConnectionStatus.Connecting, OPENROADM_DEVICE_VERSION_2_2_1); + ConnectionStatus.Connecting, OPENROADM_DEVICE_VERSION_2_2_1); final Node netconfNodeAfter = getNetconfNode("netconfNode1", - NetconfNodeConnectionStatus.ConnectionStatus.Connected, OPENROADM_DEVICE_VERSION_2_2_1); + ConnectionStatus.Connected, OPENROADM_DEVICE_VERSION_2_2_1); when(node.getModificationType()).thenReturn(DataObjectModification.ModificationType.WRITE); when(node.getDataBefore()).thenReturn(netconfNodeBefore); when(node.getDataAfter()).thenReturn(netconfNodeAfter); @@ -124,9 +124,9 @@ public class NetConfTopologyListenerTest { when(ch.getRootNode()).thenReturn(node); final Node netconfNodeBefore = getNetconfNode("netconfNode1", - NetconfNodeConnectionStatus.ConnectionStatus.Connected, OPENROADM_DEVICE_VERSION_2_2_1); + ConnectionStatus.Connected, OPENROADM_DEVICE_VERSION_2_2_1); final Node netconfNodeAfter = getNetconfNode("netconfNode1", - NetconfNodeConnectionStatus.ConnectionStatus.Connecting, OPENROADM_DEVICE_VERSION_2_2_1); + ConnectionStatus.Connecting, OPENROADM_DEVICE_VERSION_2_2_1); when(node.getModificationType()).thenReturn(DataObjectModification.ModificationType.WRITE); when(node.getDataBefore()).thenReturn(netconfNodeBefore); when(node.getDataAfter()).thenReturn(netconfNodeAfter); @@ -151,7 +151,7 @@ public class NetConfTopologyListenerTest { when(ch.getRootNode()).thenReturn(node); final Node netconfNodeBefore = getNetconfNode("netconfNode1", - NetconfNodeConnectionStatus.ConnectionStatus.Connected, OPENROADM_DEVICE_VERSION_2_2_1); + ConnectionStatus.Connected, OPENROADM_DEVICE_VERSION_2_2_1); when(node.getModificationType()).thenReturn(DataObjectModification.ModificationType.SUBTREE_MODIFIED); when(node.getDataBefore()).thenReturn(netconfNodeBefore); @@ -166,7 +166,7 @@ public class NetConfTopologyListenerTest { verify(networkModelService, never()).deleteOpenRoadmnode(anyString()); } - private Node getNetconfNode(final String nodeId, final NetconfNodeConnectionStatus.ConnectionStatus cs, + private Node getNetconfNode(final String nodeId, final ConnectionStatus cs, final String openRoadmVersion) { final List avCapList = new ArrayList<>(); avCapList.add(new AvailableCapabilityBuilder() diff --git a/olm/pom.xml b/olm/pom.xml index 5bcb5f5e2..ae8eab530 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 - 10.0.6 + 11.0.6 @@ -23,7 +23,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html bundle - 17.2.0 + 18.0.0-SNAPSHOT diff --git a/pce/pom.xml b/pce/pom.xml index 003e9a715..015943ab5 100644 --- a/pce/pom.xml +++ b/pce/pom.xml @@ -14,7 +14,7 @@ org.opendaylight.mdsal binding-parent - 10.0.6 + 11.0.6 @@ -24,7 +24,7 @@ bundle - 17.2.0 + 18.0.0-SNAPSHOT @@ -36,6 +36,13 @@ pom import + + org.opendaylight.mdsal + mdsal-artifacts + 11.0.6 + import + pom + diff --git a/pce/src/main/java/org/opendaylight/transportpce/pce/gnpy/consumer/RequestMessageBodyWriter.java b/pce/src/main/java/org/opendaylight/transportpce/pce/gnpy/consumer/RequestMessageBodyWriter.java index 619744849..ea4560c79 100644 --- a/pce/src/main/java/org/opendaylight/transportpce/pce/gnpy/consumer/RequestMessageBodyWriter.java +++ b/pce/src/main/java/org/opendaylight/transportpce/pce/gnpy/consumer/RequestMessageBodyWriter.java @@ -35,10 +35,10 @@ public class RequestMessageBodyWriter implements MessageBodyWriter { @Override @SuppressWarnings("java:S1872") public boolean isWriteable(Class type, Type genericType, Annotation[] annotations, MediaType mediaType) { - return "org.opendaylight.yang.gen.v1.gnpy.gnpy.api.rev220221.Request$$$codecImpl" + return "org.opendaylight.yang.rt.v1.obj.gnpy.gnpy.api.rev220221.Request" .equals(type.getName()) - || "org.opendaylight.yang.gen.v1.gnpy.gnpy.api.rev220221.RequestBuilder$RequestImpl" - .equals(type.getName()); + || "org.opendaylight.yang.gen.v1.gnpy.gnpy.api.rev220221.RequestBuilder$RequestImpl" + .equals(type.getName()); } @Override diff --git a/pom.xml b/pom.xml index ff99dd648..42989bb5f 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 - 11.0.4 + 12.0.2 diff --git a/renderer/pom.xml b/renderer/pom.xml index 84ae3a64a..b7be0d8ac 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 - 10.0.6 + 11.0.6 @@ -23,7 +23,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html bundle - 17.2.0 + 18.0.0-SNAPSHOT diff --git a/servicehandler/pom.xml b/servicehandler/pom.xml index e4e304f51..68c67ce39 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 - 10.0.6 + 11.0.6 @@ -25,7 +25,7 @@ Author: Martial Coulibaly on behalf of Orange bundle - 17.2.0 + 18.0.0-SNAPSHOT diff --git a/tapi/pom.xml b/tapi/pom.xml index 494d26001..755bc8caa 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 - 10.0.6 + 11.0.6 @@ -25,7 +25,7 @@ Author: Martial Coulibaly on behalf of Orange bundle - 17.2.0 + 18.0.0-SNAPSHOT @@ -40,7 +40,7 @@ Author: Martial Coulibaly on behalf of Orange org.opendaylight.netconf netconf-artifacts - 4.0.5 + 5.0.2 import pom @@ -154,6 +154,10 @@ Author: Martial Coulibaly on behalf of Orange com.google.guava guava + + org.opendaylight.netconf + netconf-topology + org.opendaylight.netconf sal-netconf-connector diff --git a/tapi/src/main/java/org/opendaylight/transportpce/tapi/listeners/TapiNetworkModelListenerImpl.java b/tapi/src/main/java/org/opendaylight/transportpce/tapi/listeners/TapiNetworkModelListenerImpl.java index 2d92919b9..9464a5ed7 100644 --- a/tapi/src/main/java/org/opendaylight/transportpce/tapi/listeners/TapiNetworkModelListenerImpl.java +++ b/tapi/src/main/java/org/opendaylight/transportpce/tapi/listeners/TapiNetworkModelListenerImpl.java @@ -66,7 +66,7 @@ import org.opendaylight.yang.gen.v1.urn.onf.otcc.yang.tapi.topology.rev181210.to import org.opendaylight.yang.gen.v1.urn.onf.otcc.yang.tapi.topology.rev181210.topology.NodeKey; import org.opendaylight.yang.gen.v1.urn.onf.otcc.yang.tapi.topology.rev181210.topology.context.Topology; import org.opendaylight.yang.gen.v1.urn.onf.otcc.yang.tapi.topology.rev181210.topology.context.TopologyKey; -import org.opendaylight.yangtools.yang.binding.Enumeration; +import org.opendaylight.yangtools.yang.binding.EnumTypeObject; import org.opendaylight.yangtools.yang.binding.InstanceIdentifier; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -181,7 +181,7 @@ public class TapiNetworkModelListenerImpl implements TapiNotificationListener { return; } ConnectivityContext connContext = optConnContext.get(); - Map states = new HashMap<>(); + Map states = new HashMap<>(); if (connContext.getConnectivityService() == null) { return; } @@ -226,12 +226,13 @@ public class TapiNetworkModelListenerImpl implements TapiNotificationListener { } } - private Enumeration[] getStates(ConnectivityService connService) throws InterruptedException, ExecutionException { + private EnumTypeObject[] getStates(ConnectivityService connService) + throws InterruptedException, ExecutionException { OperationalState operState = OperationalState.ENABLED; AdministrativeState adminState = AdministrativeState.UNLOCKED; if (connService.getConnection() == null) { LOG.info("No connections on service = {}", connService); - return new Enumeration[]{null, null}; + return new EnumTypeObject[]{null, null}; } for (org.opendaylight.yang.gen.v1.urn.onf.otcc.yang.tapi.connectivity.rev181210 .connectivity.service.Connection connection : connService.getConnection().values()) { @@ -254,7 +255,7 @@ public class TapiNetworkModelListenerImpl implements TapiNotificationListener { operState = OperationalState.DISABLED; } } - return new Enumeration[]{adminState, operState}; + return new EnumTypeObject[]{adminState, operState}; } private void updateConnections(List changedOneps, List onepStates) { diff --git a/tapi/src/main/java/org/opendaylight/transportpce/tapi/topology/TapiNetconfTopologyListener.java b/tapi/src/main/java/org/opendaylight/transportpce/tapi/topology/TapiNetconfTopologyListener.java index 85c3e0a4d..a7f1e29f1 100644 --- a/tapi/src/main/java/org/opendaylight/transportpce/tapi/topology/TapiNetconfTopologyListener.java +++ b/tapi/src/main/java/org/opendaylight/transportpce/tapi/topology/TapiNetconfTopologyListener.java @@ -14,9 +14,9 @@ import org.opendaylight.mdsal.binding.api.DataObjectModification; import org.opendaylight.mdsal.binding.api.DataTreeChangeListener; import org.opendaylight.mdsal.binding.api.DataTreeModification; import org.opendaylight.transportpce.common.StringConstants; -import org.opendaylight.yang.gen.v1.urn.opendaylight.netconf.node.topology.rev150114.NetconfNode; -import org.opendaylight.yang.gen.v1.urn.opendaylight.netconf.node.topology.rev150114.NetconfNodeConnectionStatus.ConnectionStatus; -import org.opendaylight.yang.gen.v1.urn.opendaylight.netconf.node.topology.rev150114.netconf.node.connection.status.available.capabilities.AvailableCapability; +import org.opendaylight.yang.gen.v1.urn.opendaylight.netconf.device.rev221225.ConnectionOper.ConnectionStatus; +import org.opendaylight.yang.gen.v1.urn.opendaylight.netconf.device.rev221225.connection.oper.available.capabilities.AvailableCapability; +import org.opendaylight.yang.gen.v1.urn.opendaylight.netconf.node.topology.rev221225.NetconfNode; import org.opendaylight.yang.gen.v1.urn.tbd.params.xml.ns.yang.network.topology.rev131021.network.topology.topology.Node; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/test-common/pom.xml b/test-common/pom.xml index 9dd64c602..583940ded 100644 --- a/test-common/pom.xml +++ b/test-common/pom.xml @@ -12,7 +12,7 @@ org.opendaylight.mdsal binding-parent - 10.0.6 + 11.0.6 @@ -22,7 +22,7 @@ bundle - 17.2.0 + 18.0.0-SNAPSHOT @@ -37,7 +37,7 @@ org.opendaylight.netconf netconf-artifacts - 4.0.5 + 5.0.2 import pom diff --git a/tests/transportpce_tests/common/test_utils.py b/tests/transportpce_tests/common/test_utils.py index 3ff03545c..2f92031bc 100644 --- a/tests/transportpce_tests/common/test_utils.py +++ b/tests/transportpce_tests/common/test_utils.py @@ -29,7 +29,8 @@ import simulators SIMS = simulators.SIMS HONEYNODE_OK_START_MSG = 'Netconf SSH endpoint started successfully at 0.0.0.0' -KARAF_OK_START_MSG = "Blueprint container for bundle org.opendaylight.netconf.restconf.* was successfully created" +KARAF_OK_START_MSG = "Blueprint container for bundle org.opendaylight.transportpce.servicehandler.+" \ + "was successfully created" LIGHTY_OK_START_MSG = re.escape("lighty.io and RESTCONF-NETCONF started") ODL_LOGIN = 'admin' @@ -163,7 +164,7 @@ def start_tpce(): else: process = start_karaf() start_msg = KARAF_OK_START_MSG - if wait_until_log_contains(TPCE_LOG, start_msg, time_to_wait=300): + if wait_until_log_contains(TPCE_LOG, start_msg, time_to_wait=100): print('OpenDaylight started !') else: print('OpenDaylight failed to start !') -- 2.36.6