From e458fb786a55cfdfe85e25a2083b67e9d38e21a9 Mon Sep 17 00:00:00 2001 From: Gilles Thouenon Date: Mon, 19 Jul 2021 15:58:00 +0200 Subject: [PATCH] Phosphorus migration Bump upstreams dependencies to: - odlparent: 9.0.5 - mdsal: 8.0.4 - netconf: 2.0.3 Perform some code adaptations in all modules to allow project building. - remove number of useless calls to .toString() - fix issue regarding Tp Name in PCE now that Tp resource is correctly recognized as a TpId instead of an Object (thanks to an improvement of leafref management in mdsal) Remove few useless dependencies. Disable lighty.io runtime for functional tests (no lighty version compatible with phosphorus dependencies yet) Adapt GNPy UT resource file. JIRA: TRNSPRTPCE-435 Signed-off-by: Gilles Thouenon Change-Id: Icedf25d2158f35902ff13dce4d137c6eb0a9cd8c --- api/pom.xml | 2 +- common/pom.xml | 19 +++------- .../common/mapping/PortMappingImpl.java | 2 +- .../common/mapping/PortMappingVersion121.java | 14 +++---- .../common/mapping/PortMappingVersion221.java | 14 +++---- .../common/mapping/PortMappingVersion710.java | 14 +++---- .../converter/JsonStringConverterTest.java | 3 +- .../common/mapping/MappingUtilsImplTest.java | 3 +- .../src/test/resources/expected_string.json | 2 +- dmaap-client/pom.xml | 2 +- .../odl-transportpce-dmaap-client/pom.xml | 2 +- features/odl-transportpce-inventory/pom.xml | 2 +- .../odl-transportpce-nbinotifications/pom.xml | 2 +- features/odl-transportpce-tapi/pom.xml | 2 +- features/odl-transportpce/pom.xml | 4 +- features/pom.xml | 2 +- inventory/pom.xml | 2 +- .../transportpce/inventory/INode121.java | 16 ++++---- .../transportpce/inventory/INode221.java | 14 +++---- karaf/pom.xml | 2 +- nbinotifications/pom.xml | 2 +- networkmodel/pom.xml | 4 +- .../service/NetworkModelServiceImpl.java | 37 +++++++++---------- .../util/OpenRoadmOtnTopology.java | 26 ++++++------- .../networkmodel/util/OpenRoadmTopology.java | 5 ++- .../networkmodel/util/TopologyUtils.java | 12 +++--- .../service/FrequenciesServiceTest.java | 3 +- .../util/OpenRoadmOtnTopologyTest.java | 2 +- .../util/OpenRoadmTopologyTest.java | 14 ++++--- .../networkmodel/util/test/JsonUtil.java | 2 +- .../util/test/NetworkmodelTestUtil.java | 12 +++--- olm/pom.xml | 2 +- .../olm/service/OlmPowerServiceImpl.java | 12 +++--- .../olm/util/OlmTransactionUtils.java | 13 +++++-- .../olm/util/TransactionUtils.java | 25 +++++++------ ordmodels/common/pom.xml | 2 +- ordmodels/device/pom.xml | 4 +- ordmodels/network/pom.xml | 2 +- ordmodels/pom.xml | 2 +- ordmodels/service/pom.xml | 2 +- pce/pom.xml | 2 +- .../transportpce/pce/PcePathDescription.java | 8 ++-- .../pce/graph/PostAlgoPathValidator.java | 8 ++-- .../pce/networkanalyzer/PceCalculation.java | 22 +++++------ .../pce/networkanalyzer/PceLink.java | 24 +++--------- .../pce/networkanalyzer/PceLinkTest.java | 4 +- .../transportpce/pce/utils/JsonUtil.java | 2 +- .../transportpce/pce/utils/NodeUtils.java | 8 ++-- .../transportpce/pce/utils/PceTestUtils.java | 9 ++--- .../pce/utils/TransactionUtils.java | 7 ++-- pom.xml | 2 +- renderer/pom.xml | 2 +- .../servicepath/ServiceListTopology.java | 4 +- servicehandler/pom.xml | 2 +- tapi/pom.xml | 14 +------ .../topology/ConvertORTopoToTapiFullTopo.java | 12 +++--- .../topology/ConvertORTopoToTapiTopo.java | 4 +- .../tapi/topology/TapiTopologyImpl.java | 12 +++--- tapimodels/pom.xml | 2 +- test-common/pom.xml | 6 +-- .../transportpce/test/DeviceWrapper.java | 5 +-- .../AbstractDataObjectConverter.java | 12 +++--- .../test/converter/DataObjectConverter.java | 15 ++++---- .../converter/JSONDataObjectConverter.java | 15 ++++---- .../converter/XMLDataObjectConverter.java | 27 ++++++++------ .../test/utils/TopologyDataUtils.java | 4 +- .../7.1/test01_portmapping.py | 29 +++++++-------- tox.ini | 16 ++++---- 68 files changed, 275 insertions(+), 308 deletions(-) diff --git a/api/pom.xml b/api/pom.xml index 4f47296d9..a357270cc 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 - 7.0.9 + 8.0.4 diff --git a/common/pom.xml b/common/pom.xml index 0f8742cc6..f43e28508 100644 --- a/common/pom.xml +++ b/common/pom.xml @@ -10,7 +10,7 @@ org.opendaylight.mdsal binding-parent - 7.0.9 + 8.0.4 @@ -24,14 +24,7 @@ org.opendaylight.netconf netconf-artifacts - 1.13.4 - import - pom - - - org.opendaylight.mdsal - mdsal-artifacts - 7.0.9 + 2.0.3 import pom @@ -58,14 +51,14 @@ mdsal-binding-dom-adapter - + + org.opendaylight.transportpce test-common diff --git a/common/src/main/java/org/opendaylight/transportpce/common/mapping/PortMappingImpl.java b/common/src/main/java/org/opendaylight/transportpce/common/mapping/PortMappingImpl.java index c19848d4c..e0346ccbb 100644 --- a/common/src/main/java/org/opendaylight/transportpce/common/mapping/PortMappingImpl.java +++ b/common/src/main/java/org/opendaylight/transportpce/common/mapping/PortMappingImpl.java @@ -132,7 +132,7 @@ public class PortMappingImpl implements PortMapping { LOG.info("Found MC-cap for {} - {}. Mapping: {}", nodeId, mcLcp, mcCap.toString()); return mcCap; } - LOG.warn("Could not find mapping for logical connection point {} for nodeId {}", mcLcp, nodeId); + LOG.warn("Could not find mc-capabilities for logical connection point {} for nodeId {}", mcLcp, nodeId); } catch (InterruptedException | ExecutionException ex) { LOG.error("Unable to read mapping for logical connection point : {} for nodeId {}", mcLcp, nodeId, ex); diff --git a/common/src/main/java/org/opendaylight/transportpce/common/mapping/PortMappingVersion121.java b/common/src/main/java/org/opendaylight/transportpce/common/mapping/PortMappingVersion121.java index 71dd97130..0ac3a428c 100644 --- a/common/src/main/java/org/opendaylight/transportpce/common/mapping/PortMappingVersion121.java +++ b/common/src/main/java/org/opendaylight/transportpce/common/mapping/PortMappingVersion121.java @@ -376,7 +376,7 @@ public class PortMappingVersion121 { InstanceIdentifier port2ID = InstanceIdentifier.create(OrgOpenroadmDevice.class) .child(CircuitPacks.class, new CircuitPacksKey(port.getPartnerPort().getCircuitPackName())) - .child(Ports.class, new PortsKey(port.getPartnerPort().getPortName().toString())); + .child(Ports.class, new PortsKey(port.getPartnerPort().getPortName())); Optional port2Object = this.deviceTransactionManager .getDataFromDevice(nodeId, LogicalDatastoreType.OPERATIONAL, port2ID, Timeouts.DEVICE_READ_TIMEOUT, Timeouts.DEVICE_READ_TIMEOUT_UNIT); @@ -384,7 +384,7 @@ public class PortMappingVersion121 { || port2Object.get().getPortQual().getIntValue() != Port.PortQual.RoadmExternal.getIntValue()) { LOG.error("{} : port {} on {} - error getting partner", - nodeId, port.getPartnerPort().getPortName().toString(), + nodeId, port.getPartnerPort().getPortName(), port.getPartnerPort().getCircuitPackName()); continue; } @@ -695,7 +695,7 @@ public class PortMappingVersion121 { return null; } Optional poOpt = cpOpt.get().nonnullPorts().values().stream() - .filter(p -> p.getPortName().equals(port.getPartnerPort().getPortName().toString())) + .filter(p -> p.getPortName().equals(port.getPartnerPort().getPortName())) .findFirst(); if (!poOpt.isPresent()) { LOG.error("{} : Error fetching port {} on {}", @@ -824,7 +824,7 @@ public class PortMappingVersion121 { .child(CircuitPacks.class, new CircuitPacksKey(connectionPortMap.get(cpMapEntry.getKey()).get(0).getCircuitPackName())) .child(Ports.class, - new PortsKey(connectionPortMap.get(cpMapEntry.getKey()).get(0).getPortName().toString())); + new PortsKey(connectionPortMap.get(cpMapEntry.getKey()).get(0).getPortName())); LOG.debug("{} : Fetching connection-port {} at circuit pack {}", nodeId, connectionPortMap.get(cpMapEntry.getKey()).get(0).getPortName(), @@ -870,7 +870,7 @@ public class PortMappingVersion121 { InstanceIdentifier port1ID = InstanceIdentifier.create(OrgOpenroadmDevice.class) .child(CircuitPacks.class, new CircuitPacksKey(cp1Name)) .child(Ports.class, - new PortsKey(connectionPortMap.get(cpMapEntry.getKey()).get(0).getPortName().toString())); + new PortsKey(connectionPortMap.get(cpMapEntry.getKey()).get(0).getPortName())); LOG.debug("{} : Fetching connection-port {} at circuit pack {}", nodeId, connectionPortMap.get(cpMapEntry.getKey()).get(0).getPortName(), cp1Name); Optional port1Object = this.deviceTransactionManager.getDataFromDevice(nodeId, @@ -879,7 +879,7 @@ public class PortMappingVersion121 { InstanceIdentifier port2ID = InstanceIdentifier.create(OrgOpenroadmDevice.class) .child(CircuitPacks.class, new CircuitPacksKey(cp2Name)) .child(Ports.class, - new PortsKey(connectionPortMap.get(cpMapEntry.getKey()).get(1).getPortName().toString())); + new PortsKey(connectionPortMap.get(cpMapEntry.getKey()).get(1).getPortName())); LOG.debug("{} : Fetching connection-port {} at circuit pack {}", nodeId, connectionPortMap.get(cpMapEntry.getKey()).get(1).getPortName(), cp2Name); Optional port2Object = this.deviceTransactionManager.getDataFromDevice(nodeId, @@ -887,7 +887,7 @@ public class PortMappingVersion121 { Timeouts.DEVICE_READ_TIMEOUT_UNIT); if (!port1Object.isPresent() || !port2Object.isPresent()) { LOG.error("No port {} on circuit pack {} for node {}", - connectionPortMap.get(cpMapEntry.getKey()).get(0).getPortName().toString(), + connectionPortMap.get(cpMapEntry.getKey()).get(0).getPortName(), connectionPortMap.get(cpMapEntry.getKey()).get(0).getCircuitPackName(), nodeId); return false; } diff --git a/common/src/main/java/org/opendaylight/transportpce/common/mapping/PortMappingVersion221.java b/common/src/main/java/org/opendaylight/transportpce/common/mapping/PortMappingVersion221.java index 41a9b939c..4ea548638 100644 --- a/common/src/main/java/org/opendaylight/transportpce/common/mapping/PortMappingVersion221.java +++ b/common/src/main/java/org/opendaylight/transportpce/common/mapping/PortMappingVersion221.java @@ -259,7 +259,7 @@ public class PortMappingVersion221 { for (XpdrPort xpdrPort : xponder.nonnullXpdrPort().values().stream() .sorted((xp1, xp2) -> xp1.getIndex().compareTo(xp2.getIndex())).collect(Collectors.toList())) { String circuitPackName = xpdrPort.getCircuitPackName(); - String portName = xpdrPort.getPortName().toString(); + String portName = xpdrPort.getPortName(); // If there xponder-subtree has missing circuit-packs or ports, // This gives a null-pointer expection, if (device.nonnullCircuitPacks().values().stream() @@ -481,7 +481,7 @@ public class PortMappingVersion221 { InstanceIdentifier port2ID = InstanceIdentifier.create(OrgOpenroadmDevice.class) .child(CircuitPacks.class, new CircuitPacksKey(port.getPartnerPort().getCircuitPackName())) - .child(Ports.class, new PortsKey(port.getPartnerPort().getPortName().toString())); + .child(Ports.class, new PortsKey(port.getPartnerPort().getPortName())); Optional port2Object = this.deviceTransactionManager .getDataFromDevice(nodeId, LogicalDatastoreType.OPERATIONAL, port2ID, Timeouts.DEVICE_READ_TIMEOUT, Timeouts.DEVICE_READ_TIMEOUT_UNIT); @@ -489,7 +489,7 @@ public class PortMappingVersion221 { || port2Object.get().getPortQual().getIntValue() != PortQual.RoadmExternal.getIntValue()) { LOG.error("{} : port {} on {} - error getting partner", - nodeId, port.getPartnerPort().getPortName().toString(), + nodeId, port.getPartnerPort().getPortName(), port.getPartnerPort().getCircuitPackName()); continue; } @@ -908,7 +908,7 @@ public class PortMappingVersion221 { return null; } Optional poOpt = cpOpt.get().nonnullPorts().values().stream() - .filter(p -> p.getPortName().equals(port.getPartnerPort().getPortName().toString())) + .filter(p -> p.getPortName().equals(port.getPartnerPort().getPortName())) .findFirst(); if (!poOpt.isPresent()) { LOG.error("{} : Error fetching port {} on {}", @@ -1046,7 +1046,7 @@ public class PortMappingVersion221 { .child(CircuitPacks.class, new CircuitPacksKey(connectionPortMap.get(cpMapEntry.getKey()).get(0).getCircuitPackName())) .child(Ports.class, - new PortsKey(connectionPortMap.get(cpMapEntry.getKey()).get(0).getPortName().toString())); + new PortsKey(connectionPortMap.get(cpMapEntry.getKey()).get(0).getPortName())); LOG.debug("{} : Fetching connection-port {} at circuit pack {}", nodeId, connectionPortMap.get(cpMapEntry.getKey()).get(0).getPortName(), @@ -1092,7 +1092,7 @@ public class PortMappingVersion221 { InstanceIdentifier port1ID = InstanceIdentifier.create(OrgOpenroadmDevice.class) .child(CircuitPacks.class, new CircuitPacksKey(cp1Name)) .child(Ports.class, - new PortsKey(connectionPortMap.get(cpMapEntry.getKey()).get(0).getPortName().toString())); + new PortsKey(connectionPortMap.get(cpMapEntry.getKey()).get(0).getPortName())); LOG.debug("{} : Fetching connection-port {} at circuit pack {}", nodeId, connectionPortMap.get(cpMapEntry.getKey()).get(0).getPortName(), cp1Name); Optional port1Object = this.deviceTransactionManager.getDataFromDevice(nodeId, @@ -1101,7 +1101,7 @@ public class PortMappingVersion221 { InstanceIdentifier port2ID = InstanceIdentifier.create(OrgOpenroadmDevice.class) .child(CircuitPacks.class, new CircuitPacksKey(cp2Name)) .child(Ports.class, - new PortsKey(connectionPortMap.get(cpMapEntry.getKey()).get(1).getPortName().toString())); + new PortsKey(connectionPortMap.get(cpMapEntry.getKey()).get(1).getPortName())); LOG.debug("{} : Fetching connection-port {} at circuit pack {}", nodeId, connectionPortMap.get(cpMapEntry.getKey()).get(1).getPortName(), cp2Name); Optional port2Object = this.deviceTransactionManager.getDataFromDevice(nodeId, diff --git a/common/src/main/java/org/opendaylight/transportpce/common/mapping/PortMappingVersion710.java b/common/src/main/java/org/opendaylight/transportpce/common/mapping/PortMappingVersion710.java index 92af655eb..f7991a00d 100644 --- a/common/src/main/java/org/opendaylight/transportpce/common/mapping/PortMappingVersion710.java +++ b/common/src/main/java/org/opendaylight/transportpce/common/mapping/PortMappingVersion710.java @@ -353,7 +353,7 @@ public class PortMappingVersion710 { for (XpdrPort xpdrPort : xponder.nonnullXpdrPort().values().stream() .sorted((xp1, xp2) -> xp1.getIndex().compareTo(xp2.getIndex())).collect(Collectors.toList())) { String circuitPackName = xpdrPort.getCircuitPackName(); - String portName = xpdrPort.getPortName().toString(); + String portName = xpdrPort.getPortName(); // If there xponder-subtree has missing circuit-packs or ports, // This gives a null-pointer expection, if (device.nonnullCircuitPacks().values().stream() @@ -576,7 +576,7 @@ public class PortMappingVersion710 { InstanceIdentifier port2ID = InstanceIdentifier.create(OrgOpenroadmDevice.class) .child(CircuitPacks.class, new CircuitPacksKey(port.getPartnerPort().getCircuitPackName())) - .child(Ports.class, new PortsKey(port.getPartnerPort().getPortName().toString())); + .child(Ports.class, new PortsKey(port.getPartnerPort().getPortName())); Optional port2Object = this.deviceTransactionManager .getDataFromDevice(nodeId, LogicalDatastoreType.OPERATIONAL, port2ID, Timeouts.DEVICE_READ_TIMEOUT, Timeouts.DEVICE_READ_TIMEOUT_UNIT); @@ -584,7 +584,7 @@ public class PortMappingVersion710 { || port2Object.get().getPortQual().getIntValue() != PortQual.RoadmExternal.getIntValue()) { LOG.error("{} : port {} on {} - error getting partner", - nodeId, port.getPartnerPort().getPortName().toString(), + nodeId, port.getPartnerPort().getPortName(), port.getPartnerPort().getCircuitPackName()); continue; } @@ -1106,7 +1106,7 @@ public class PortMappingVersion710 { return null; } Optional poOpt = cpOpt.get().nonnullPorts().values().stream() - .filter(p -> p.getPortName().equals(port.getPartnerPort().getPortName().toString())) + .filter(p -> p.getPortName().equals(port.getPartnerPort().getPortName())) .findFirst(); if (!poOpt.isPresent()) { LOG.error("{} : Error fetching port {} on {}", @@ -1269,7 +1269,7 @@ public class PortMappingVersion710 { .child(CircuitPacks.class, new CircuitPacksKey(connectionPortMap.get(cpMapEntry.getKey()).get(0).getCircuitPackName())) .child(Ports.class, - new PortsKey(connectionPortMap.get(cpMapEntry.getKey()).get(0).getPortName().toString())); + new PortsKey(connectionPortMap.get(cpMapEntry.getKey()).get(0).getPortName())); LOG.debug("{} : Fetching connection-port {} at circuit pack {}", nodeId, connectionPortMap.get(cpMapEntry.getKey()).get(0).getPortName(), @@ -1315,7 +1315,7 @@ public class PortMappingVersion710 { InstanceIdentifier port1ID = InstanceIdentifier.create(OrgOpenroadmDevice.class) .child(CircuitPacks.class, new CircuitPacksKey(cp1Name)) .child(Ports.class, - new PortsKey(connectionPortMap.get(cpMapEntry.getKey()).get(0).getPortName().toString())); + new PortsKey(connectionPortMap.get(cpMapEntry.getKey()).get(0).getPortName())); LOG.debug("{} : Fetching connection-port {} at circuit pack {}", nodeId, connectionPortMap.get(cpMapEntry.getKey()).get(0).getPortName(), cp1Name); Optional port1Object = this.deviceTransactionManager.getDataFromDevice(nodeId, @@ -1324,7 +1324,7 @@ public class PortMappingVersion710 { InstanceIdentifier port2ID = InstanceIdentifier.create(OrgOpenroadmDevice.class) .child(CircuitPacks.class, new CircuitPacksKey(cp2Name)) .child(Ports.class, - new PortsKey(connectionPortMap.get(cpMapEntry.getKey()).get(1).getPortName().toString())); + new PortsKey(connectionPortMap.get(cpMapEntry.getKey()).get(1).getPortName())); LOG.debug("{} : Fetching connection-port {} at circuit pack {}", nodeId, connectionPortMap.get(cpMapEntry.getKey()).get(1).getPortName(), cp2Name); Optional port2Object = this.deviceTransactionManager.getDataFromDevice(nodeId, diff --git a/common/src/test/java/org/opendaylight/transportpce/common/converter/JsonStringConverterTest.java b/common/src/test/java/org/opendaylight/transportpce/common/converter/JsonStringConverterTest.java index 4ab67162d..eeb972371 100644 --- a/common/src/test/java/org/opendaylight/transportpce/common/converter/JsonStringConverterTest.java +++ b/common/src/test/java/org/opendaylight/transportpce/common/converter/JsonStringConverterTest.java @@ -24,7 +24,6 @@ import org.opendaylight.transportpce.test.converter.JSONDataObjectConverter; import org.opendaylight.yang.gen.v1.gnpy.gnpy.api.rev190103.GnpyApi; import org.opendaylight.yangtools.yang.binding.InstanceIdentifier; import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier; -import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier.PathArgument; import org.opendaylight.yangtools.yang.data.api.schema.NormalizedNode; import org.opendaylight.yangtools.yang.data.codec.gson.JSONCodecFactorySupplier; @@ -35,7 +34,7 @@ public class JsonStringConverterTest extends AbstractTest { DataObjectConverter dataObjectConverter = JSONDataObjectConverter .createWithDataStoreUtil(getDataStoreContextUtil()); try (Reader reader = new FileReader("src/test/resources/gnpy_request.json", StandardCharsets.UTF_8)) { - NormalizedNode normalizedNode = dataObjectConverter + NormalizedNode normalizedNode = dataObjectConverter .transformIntoNormalizedNode(reader).get(); GnpyApi gnpyRequest = (GnpyApi) getDataStoreContextUtil().getBindingDOMCodecServices() .fromNormalizedNode(YangInstanceIdentifier.of(GnpyApi.QNAME), normalizedNode).getValue(); diff --git a/common/src/test/java/org/opendaylight/transportpce/common/mapping/MappingUtilsImplTest.java b/common/src/test/java/org/opendaylight/transportpce/common/mapping/MappingUtilsImplTest.java index e3ca0db15..96c557998 100644 --- a/common/src/test/java/org/opendaylight/transportpce/common/mapping/MappingUtilsImplTest.java +++ b/common/src/test/java/org/opendaylight/transportpce/common/mapping/MappingUtilsImplTest.java @@ -30,7 +30,6 @@ import org.opendaylight.transportpce.test.converter.JSONDataObjectConverter; import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev210426.Network; import org.opendaylight.yangtools.yang.binding.InstanceIdentifier; import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier; -import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier.PathArgument; import org.opendaylight.yangtools.yang.data.api.schema.NormalizedNode; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -44,7 +43,7 @@ public class MappingUtilsImplTest extends AbstractTest { DataObjectConverter dataObjectConverter = JSONDataObjectConverter .createWithDataStoreUtil(getDataStoreContextUtil()); try (Reader reader = new FileReader("src/test/resources/network.json", StandardCharsets.UTF_8)) { - NormalizedNode normalizedNode = dataObjectConverter + NormalizedNode normalizedNode = dataObjectConverter .transformIntoNormalizedNode(reader).get(); Network network = (Network) getDataStoreContextUtil() .getBindingDOMCodecServices().fromNormalizedNode(YangInstanceIdentifier diff --git a/common/src/test/resources/expected_string.json b/common/src/test/resources/expected_string.json index 9a7044d6c..12a2760ab 100644 --- a/common/src/test/resources/expected_string.json +++ b/common/src/test/resources/expected_string.json @@ -1 +1 @@ -{"gnpy-api":{"topology-file":{"elements":[{"uid":"127.0.0.31","metadata":{"location":{"latitude":0,"longitude":0,"region":"XPONDER-3"}},"type":"gnpy-network-topology:Transceiver"},{"uid":"127.0.0.30","metadata":{"location":{"latitude":0,"longitude":0,"region":"OpenROADM-3"}},"type":"gnpy-network-topology:Roadm","params":{"target_pch_out_db":-20}},{"uid":"127.0.0.51","metadata":{"location":{"latitude":0,"longitude":0,"region":"XPONDER-5"}},"type":"gnpy-network-topology:Transceiver"},{"uid":"127.0.0.50","metadata":{"location":{"latitude":0,"longitude":0,"region":"OpenROADM-5"}},"type":"gnpy-network-topology:Roadm","params":{"target_pch_out_db":-20}},{"uid":"127.0.0.11","metadata":{"location":{"latitude":0,"longitude":0,"region":"XPONDER-1"}},"type":"gnpy-network-topology:Transceiver"},{"uid":"127.0.0.10","metadata":{"location":{"latitude":0,"longitude":0,"region":"OpenROADM-1"}},"type":"gnpy-network-topology:Roadm","params":{"target_pch_out_db":-20}},{"uid":"243.0.0.10","metadata":{"location":{"latitude":0,"longitude":0,"city":"N/A","region":"N/A"}},"type":"gnpy-network-topology:Fiber","type_variety":"SSMF","params":{"con_in":0,"loss_coef":0.12,"con_out":0,"length":60,"att_in":0,"length_units":"gnpy-network-topology:km"}},{"uid":"243.0.0.12","metadata":{"location":{"latitude":0,"longitude":0,"city":"N/A","region":"N/A"}},"type":"gnpy-network-topology:Fiber","type_variety":"SSMF","params":{"con_in":0,"loss_coef":0.29,"con_out":0,"length":100,"att_in":0,"length_units":"gnpy-network-topology:km"}},{"uid":"243.0.0.11","metadata":{"location":{"latitude":0,"longitude":0,"city":"N/A","region":"N/A"}},"type":"gnpy-network-topology:Fiber","type_variety":"SSMF","params":{"con_in":0,"loss_coef":0.12,"con_out":0,"length":60,"att_in":0,"length_units":"gnpy-network-topology:km"}},{"uid":"243.0.0.14","metadata":{"location":{"latitude":0,"longitude":0,"city":"N/A","region":"N/A"}},"type":"gnpy-network-topology:Fiber","type_variety":"SSMF","params":{"con_in":0,"loss_coef":0.29,"con_out":0,"length":100,"att_in":0,"length_units":"gnpy-network-topology:km"}},{"uid":"243.0.0.13","metadata":{"location":{"latitude":0,"longitude":0,"city":"N/A","region":"N/A"}},"type":"gnpy-network-topology:Fiber","type_variety":"SSMF","params":{"con_in":0,"loss_coef":0.2127659574468085124099303584443987347185611724853515625,"con_out":0,"length":140,"att_in":0,"length_units":"gnpy-network-topology:km"}},{"uid":"243.0.0.8","metadata":{"location":{"latitude":0,"longitude":0,"city":"N/A","region":"N/A"}},"type":"gnpy-network-topology:Fiber","type_variety":"SSMF","params":{"con_in":0,"loss_coef":0.11999999999999999555910790149937383830547332763671875,"con_out":0,"length":100,"att_in":0,"length_units":"gnpy-network-topology:km"}},{"uid":"243.0.0.9","metadata":{"location":{"latitude":0,"longitude":0,"city":"N/A","region":"N/A"}},"type":"gnpy-network-topology:Fiber","type_variety":"SSMF","params":{"con_in":0,"loss_coef":0.29,"con_out":0,"length":100,"att_in":0,"length_units":"gnpy-network-topology:km"}},{"uid":"243.0.0.2","metadata":{"location":{"latitude":0,"longitude":0,"city":"N/A","region":"N/A"}},"type":"gnpy-network-topology:Fiber","type_variety":"SSMF","params":{"con_in":0,"loss_coef":0.29,"con_out":0,"length":100,"att_in":0,"length_units":"gnpy-network-topology:km"}},{"uid":"243.0.0.3","metadata":{"location":{"latitude":0,"longitude":0,"city":"N/A","region":"N/A"}},"type":"gnpy-network-topology:Fiber","type_variety":"SSMF","params":{"con_in":0,"loss_coef":0.12,"con_out":0,"length":60,"att_in":0,"length_units":"gnpy-network-topology:km"}},{"uid":"243.0.0.1","metadata":{"location":{"latitude":0,"longitude":0,"city":"N/A","region":"N/A"}},"type":"gnpy-network-topology:Fiber","type_variety":"SSMF","params":{"con_in":0,"loss_coef":0.11999999999999999555910790149937383830547332763671875,"con_out":0,"length":100,"att_in":0,"length_units":"gnpy-network-topology:km"}},{"uid":"243.0.0.6","metadata":{"location":{"latitude":0,"longitude":0,"city":"N/A","region":"N/A"}},"type":"gnpy-network-topology:Fiber","type_variety":"SSMF","params":{"con_in":0,"loss_coef":0.2127659574468085124099303584443987347185611724853515625,"con_out":0,"length":140,"att_in":0,"length_units":"gnpy-network-topology:km"}},{"uid":"243.0.0.7","metadata":{"location":{"latitude":0,"longitude":0,"city":"N/A","region":"N/A"}},"type":"gnpy-network-topology:Fiber","type_variety":"SSMF","params":{"con_in":0,"loss_coef":0.29,"con_out":0,"length":100,"att_in":0,"length_units":"gnpy-network-topology:km"}},{"uid":"243.0.0.4","metadata":{"location":{"latitude":0,"longitude":0,"city":"N/A","region":"N/A"}},"type":"gnpy-network-topology:Fiber","type_variety":"SSMF","params":{"con_in":0,"loss_coef":0.29,"con_out":0,"length":100,"att_in":0,"length_units":"gnpy-network-topology:km"}},{"uid":"243.0.0.5","metadata":{"location":{"latitude":0,"longitude":0,"city":"N/A","region":"N/A"}},"type":"gnpy-network-topology:Fiber","type_variety":"SSMF","params":{"con_in":0,"loss_coef":0.12,"con_out":0,"length":60,"att_in":0,"length_units":"gnpy-network-topology:km"}},{"uid":"127.0.0.20","metadata":{"location":{"latitude":0,"longitude":0,"region":"OpenROADM-2"}},"type":"gnpy-network-topology:Roadm","params":{"target_pch_out_db":-20}},{"uid":"127.0.0.41","metadata":{"location":{"latitude":0,"longitude":0,"region":"XPONDER-4"}},"type":"gnpy-network-topology:Transceiver"},{"uid":"127.0.0.40","metadata":{"location":{"latitude":0,"longitude":0,"region":"OpenROADM-4"}},"type":"gnpy-network-topology:Roadm","params":{"target_pch_out_db":-20}},{"uid":"127.0.0.21","metadata":{"location":{"latitude":0,"longitude":0,"region":"XPONDER-2"}},"type":"gnpy-network-topology:Transceiver"}],"connections":[{"from_node":"127.0.0.51","to_node":"127.0.0.50"},{"from_node":"127.0.0.30","to_node":"127.0.0.31"},{"from_node":"127.0.0.10","to_node":"243.0.0.1"},{"from_node":"243.0.0.1","to_node":"127.0.0.30"},{"from_node":"127.0.0.20","to_node":"127.0.0.21"},{"from_node":"127.0.0.20","to_node":"243.0.0.2"},{"from_node":"243.0.0.2","to_node":"127.0.0.10"},{"from_node":"127.0.0.20","to_node":"243.0.0.3"},{"from_node":"243.0.0.3","to_node":"127.0.0.50"},{"from_node":"127.0.0.40","to_node":"127.0.0.41"},{"from_node":"127.0.0.40","to_node":"243.0.0.4"},{"from_node":"243.0.0.4","to_node":"127.0.0.30"},{"from_node":"127.0.0.50","to_node":"243.0.0.5"},{"from_node":"243.0.0.5","to_node":"127.0.0.30"},{"from_node":"127.0.0.31","to_node":"127.0.0.30"},{"from_node":"127.0.0.50","to_node":"127.0.0.51"},{"from_node":"127.0.0.20","to_node":"243.0.0.6"},{"from_node":"243.0.0.6","to_node":"127.0.0.30"},{"from_node":"127.0.0.30","to_node":"243.0.0.7"},{"from_node":"243.0.0.7","to_node":"127.0.0.40"},{"from_node":"127.0.0.11","to_node":"127.0.0.10"},{"from_node":"127.0.0.30","to_node":"243.0.0.8"},{"from_node":"243.0.0.8","to_node":"127.0.0.10"},{"from_node":"127.0.0.40","to_node":"243.0.0.9"},{"from_node":"243.0.0.9","to_node":"127.0.0.50"},{"from_node":"127.0.0.30","to_node":"243.0.0.10"},{"from_node":"243.0.0.10","to_node":"127.0.0.50"},{"from_node":"127.0.0.50","to_node":"243.0.0.11"},{"from_node":"243.0.0.11","to_node":"127.0.0.20"},{"from_node":"127.0.0.50","to_node":"243.0.0.12"},{"from_node":"243.0.0.12","to_node":"127.0.0.40"},{"from_node":"127.0.0.21","to_node":"127.0.0.20"},{"from_node":"127.0.0.41","to_node":"127.0.0.40"},{"from_node":"127.0.0.30","to_node":"243.0.0.13"},{"from_node":"243.0.0.13","to_node":"127.0.0.20"},{"from_node":"127.0.0.10","to_node":"127.0.0.11"},{"from_node":"127.0.0.10","to_node":"243.0.0.14"},{"from_node":"243.0.0.14","to_node":"127.0.0.20"}]},"service-file":{"path-request":[{"request-id":2,"bidirectional":false,"dst-tp-id":"ZHN0VHBJZA\u003d\u003d","source":"127.0.0.11","explicit-route-objects":{"route-object-include-exclude":[{"num-unnum-hop":{"node-id":"127.0.0.20","link-tp-id":"1","hop-type":"STRICT"},"index":0,"explicit-route-usage":"gnpy-path-computation-simplified:route-include-ero"},{"num-unnum-hop":{"node-id":"127.0.0.30","link-tp-id":"1","hop-type":"STRICT"},"index":1,"explicit-route-usage":"gnpy-path-computation-simplified:route-include-ero"}]},"path-constraints":{"te-bandwidth":{"spacing":50000000000,"trx_mode":"W100G","trx_type":"openroadm-beta1","effective-freq-slot":[{"N":0,"M":4}],"technology":"flexi-grid","path_bandwidth":100}},"src-tp-id":"c3JjVHBJZA\u003d\u003d","destination":"127.0.0.41"}]}}} \ No newline at end of file +{"gnpy-api":{"service-file":{"path-request":[{"request-id":2,"src-tp-id":"c3JjVHBJZA\u003d\u003d","destination":"127.0.0.41","explicit-route-objects":{"route-object-include-exclude":[{"explicit-route-usage":"gnpy-path-computation-simplified:route-include-ero","num-unnum-hop":{"hop-type":"STRICT","link-tp-id":"1","node-id":"127.0.0.20"},"index":0},{"explicit-route-usage":"gnpy-path-computation-simplified:route-include-ero","num-unnum-hop":{"hop-type":"STRICT","link-tp-id":"1","node-id":"127.0.0.30"},"index":1}]},"bidirectional":false,"dst-tp-id":"ZHN0VHBJZA\u003d\u003d","path-constraints":{"te-bandwidth":{"technology":"flexi-grid","trx_mode":"W100G","spacing":50000000000,"trx_type":"openroadm-beta1","path_bandwidth":100,"effective-freq-slot":[{"N":0,"M":4}]}},"source":"127.0.0.11"}]},"topology-file":{"elements":[{"uid":"243.0.0.10","type":"gnpy-network-topology:Fiber","type_variety":"SSMF","params":{"loss_coef":0.12,"att_in":0,"con_out":0,"con_in":0,"length":60,"length_units":"gnpy-network-topology:km"},"metadata":{"location":{"city":"N/A","region":"N/A","latitude":0,"longitude":0}}},{"uid":"243.0.0.11","type":"gnpy-network-topology:Fiber","type_variety":"SSMF","params":{"loss_coef":0.12,"att_in":0,"con_out":0,"con_in":0,"length":60,"length_units":"gnpy-network-topology:km"},"metadata":{"location":{"city":"N/A","region":"N/A","latitude":0,"longitude":0}}},{"uid":"243.0.0.12","type":"gnpy-network-topology:Fiber","type_variety":"SSMF","params":{"loss_coef":0.29,"att_in":0,"con_out":0,"con_in":0,"length":100,"length_units":"gnpy-network-topology:km"},"metadata":{"location":{"city":"N/A","region":"N/A","latitude":0,"longitude":0}}},{"uid":"243.0.0.13","type":"gnpy-network-topology:Fiber","type_variety":"SSMF","params":{"loss_coef":0.2127659574468085124099303584443987347185611724853515625,"att_in":0,"con_out":0,"con_in":0,"length":140,"length_units":"gnpy-network-topology:km"},"metadata":{"location":{"city":"N/A","region":"N/A","latitude":0,"longitude":0}}},{"uid":"243.0.0.14","type":"gnpy-network-topology:Fiber","type_variety":"SSMF","params":{"loss_coef":0.29,"att_in":0,"con_out":0,"con_in":0,"length":100,"length_units":"gnpy-network-topology:km"},"metadata":{"location":{"city":"N/A","region":"N/A","latitude":0,"longitude":0}}},{"uid":"127.0.0.20","type":"gnpy-network-topology:Roadm","params":{"target_pch_out_db":-20},"metadata":{"location":{"region":"OpenROADM-2","latitude":0,"longitude":0}}},{"uid":"127.0.0.41","type":"gnpy-network-topology:Transceiver","metadata":{"location":{"region":"XPONDER-4","latitude":0,"longitude":0}}},{"uid":"127.0.0.40","type":"gnpy-network-topology:Roadm","params":{"target_pch_out_db":-20},"metadata":{"location":{"region":"OpenROADM-4","latitude":0,"longitude":0}}},{"uid":"127.0.0.21","type":"gnpy-network-topology:Transceiver","metadata":{"location":{"region":"XPONDER-2","latitude":0,"longitude":0}}},{"uid":"243.0.0.1","type":"gnpy-network-topology:Fiber","type_variety":"SSMF","params":{"loss_coef":0.11999999999999999555910790149937383830547332763671875,"att_in":0,"con_out":0,"con_in":0,"length":100,"length_units":"gnpy-network-topology:km"},"metadata":{"location":{"city":"N/A","region":"N/A","latitude":0,"longitude":0}}},{"uid":"243.0.0.3","type":"gnpy-network-topology:Fiber","type_variety":"SSMF","params":{"loss_coef":0.12,"att_in":0,"con_out":0,"con_in":0,"length":60,"length_units":"gnpy-network-topology:km"},"metadata":{"location":{"city":"N/A","region":"N/A","latitude":0,"longitude":0}}},{"uid":"243.0.0.2","type":"gnpy-network-topology:Fiber","type_variety":"SSMF","params":{"loss_coef":0.29,"att_in":0,"con_out":0,"con_in":0,"length":100,"length_units":"gnpy-network-topology:km"},"metadata":{"location":{"city":"N/A","region":"N/A","latitude":0,"longitude":0}}},{"uid":"243.0.0.5","type":"gnpy-network-topology:Fiber","type_variety":"SSMF","params":{"loss_coef":0.12,"att_in":0,"con_out":0,"con_in":0,"length":60,"length_units":"gnpy-network-topology:km"},"metadata":{"location":{"city":"N/A","region":"N/A","latitude":0,"longitude":0}}},{"uid":"243.0.0.4","type":"gnpy-network-topology:Fiber","type_variety":"SSMF","params":{"loss_coef":0.29,"att_in":0,"con_out":0,"con_in":0,"length":100,"length_units":"gnpy-network-topology:km"},"metadata":{"location":{"city":"N/A","region":"N/A","latitude":0,"longitude":0}}},{"uid":"243.0.0.7","type":"gnpy-network-topology:Fiber","type_variety":"SSMF","params":{"loss_coef":0.29,"att_in":0,"con_out":0,"con_in":0,"length":100,"length_units":"gnpy-network-topology:km"},"metadata":{"location":{"city":"N/A","region":"N/A","latitude":0,"longitude":0}}},{"uid":"243.0.0.6","type":"gnpy-network-topology:Fiber","type_variety":"SSMF","params":{"loss_coef":0.2127659574468085124099303584443987347185611724853515625,"att_in":0,"con_out":0,"con_in":0,"length":140,"length_units":"gnpy-network-topology:km"},"metadata":{"location":{"city":"N/A","region":"N/A","latitude":0,"longitude":0}}},{"uid":"243.0.0.9","type":"gnpy-network-topology:Fiber","type_variety":"SSMF","params":{"loss_coef":0.29,"att_in":0,"con_out":0,"con_in":0,"length":100,"length_units":"gnpy-network-topology:km"},"metadata":{"location":{"city":"N/A","region":"N/A","latitude":0,"longitude":0}}},{"uid":"243.0.0.8","type":"gnpy-network-topology:Fiber","type_variety":"SSMF","params":{"loss_coef":0.11999999999999999555910790149937383830547332763671875,"att_in":0,"con_out":0,"con_in":0,"length":100,"length_units":"gnpy-network-topology:km"},"metadata":{"location":{"city":"N/A","region":"N/A","latitude":0,"longitude":0}}},{"uid":"127.0.0.31","type":"gnpy-network-topology:Transceiver","metadata":{"location":{"region":"XPONDER-3","latitude":0,"longitude":0}}},{"uid":"127.0.0.30","type":"gnpy-network-topology:Roadm","params":{"target_pch_out_db":-20},"metadata":{"location":{"region":"OpenROADM-3","latitude":0,"longitude":0}}},{"uid":"127.0.0.51","type":"gnpy-network-topology:Transceiver","metadata":{"location":{"region":"XPONDER-5","latitude":0,"longitude":0}}},{"uid":"127.0.0.50","type":"gnpy-network-topology:Roadm","params":{"target_pch_out_db":-20},"metadata":{"location":{"region":"OpenROADM-5","latitude":0,"longitude":0}}},{"uid":"127.0.0.11","type":"gnpy-network-topology:Transceiver","metadata":{"location":{"region":"XPONDER-1","latitude":0,"longitude":0}}},{"uid":"127.0.0.10","type":"gnpy-network-topology:Roadm","params":{"target_pch_out_db":-20},"metadata":{"location":{"region":"OpenROADM-1","latitude":0,"longitude":0}}}],"connections":[{"from_node":"127.0.0.51","to_node":"127.0.0.50"},{"from_node":"127.0.0.30","to_node":"127.0.0.31"},{"from_node":"127.0.0.10","to_node":"243.0.0.1"},{"from_node":"243.0.0.1","to_node":"127.0.0.30"},{"from_node":"127.0.0.20","to_node":"127.0.0.21"},{"from_node":"127.0.0.20","to_node":"243.0.0.2"},{"from_node":"243.0.0.2","to_node":"127.0.0.10"},{"from_node":"127.0.0.20","to_node":"243.0.0.3"},{"from_node":"243.0.0.3","to_node":"127.0.0.50"},{"from_node":"127.0.0.40","to_node":"127.0.0.41"},{"from_node":"127.0.0.40","to_node":"243.0.0.4"},{"from_node":"243.0.0.4","to_node":"127.0.0.30"},{"from_node":"127.0.0.50","to_node":"243.0.0.5"},{"from_node":"243.0.0.5","to_node":"127.0.0.30"},{"from_node":"127.0.0.31","to_node":"127.0.0.30"},{"from_node":"127.0.0.50","to_node":"127.0.0.51"},{"from_node":"127.0.0.20","to_node":"243.0.0.6"},{"from_node":"243.0.0.6","to_node":"127.0.0.30"},{"from_node":"127.0.0.30","to_node":"243.0.0.7"},{"from_node":"243.0.0.7","to_node":"127.0.0.40"},{"from_node":"127.0.0.11","to_node":"127.0.0.10"},{"from_node":"127.0.0.30","to_node":"243.0.0.8"},{"from_node":"243.0.0.8","to_node":"127.0.0.10"},{"from_node":"127.0.0.40","to_node":"243.0.0.9"},{"from_node":"243.0.0.9","to_node":"127.0.0.50"},{"from_node":"127.0.0.30","to_node":"243.0.0.10"},{"from_node":"243.0.0.10","to_node":"127.0.0.50"},{"from_node":"127.0.0.50","to_node":"243.0.0.11"},{"from_node":"243.0.0.11","to_node":"127.0.0.20"},{"from_node":"127.0.0.50","to_node":"243.0.0.12"},{"from_node":"243.0.0.12","to_node":"127.0.0.40"},{"from_node":"127.0.0.21","to_node":"127.0.0.20"},{"from_node":"127.0.0.41","to_node":"127.0.0.40"},{"from_node":"127.0.0.30","to_node":"243.0.0.13"},{"from_node":"243.0.0.13","to_node":"127.0.0.20"},{"from_node":"127.0.0.10","to_node":"127.0.0.11"},{"from_node":"127.0.0.10","to_node":"243.0.0.14"},{"from_node":"243.0.0.14","to_node":"127.0.0.20"}]}}} \ No newline at end of file diff --git a/dmaap-client/pom.xml b/dmaap-client/pom.xml index 68ec82771..5e2316616 100644 --- a/dmaap-client/pom.xml +++ b/dmaap-client/pom.xml @@ -9,7 +9,7 @@ org.opendaylight.mdsal binding-parent - 7.0.9 + 8.0.4 org.opendaylight.transportpce diff --git a/features/odl-transportpce-dmaap-client/pom.xml b/features/odl-transportpce-dmaap-client/pom.xml index e7bdfe387..30672a30b 100644 --- a/features/odl-transportpce-dmaap-client/pom.xml +++ b/features/odl-transportpce-dmaap-client/pom.xml @@ -10,7 +10,7 @@ org.opendaylight.odlparent single-feature-parent - 8.1.3 + 9.0.5 org.opendaylight.transportpce diff --git a/features/odl-transportpce-inventory/pom.xml b/features/odl-transportpce-inventory/pom.xml index 9d52696b9..2a5294f54 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 - 8.1.3 + 9.0.5 diff --git a/features/odl-transportpce-nbinotifications/pom.xml b/features/odl-transportpce-nbinotifications/pom.xml index 580160fdb..1f6cc9af0 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 - 8.1.3 + 9.0.5 diff --git a/features/odl-transportpce-tapi/pom.xml b/features/odl-transportpce-tapi/pom.xml index a94973d80..58fbba94d 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 - 8.1.3 + 9.0.5 diff --git a/features/odl-transportpce/pom.xml b/features/odl-transportpce/pom.xml index be6a7ef7c..a50855e78 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 - 8.1.3 + 9.0.5 @@ -24,7 +24,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html INTERNAL OpenDaylight :: transportpce - 1.13.4 + 2.0.3 etc/opendaylight/karaf diff --git a/features/pom.xml b/features/pom.xml index 62b26751b..982ec15b2 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 - 8.1.3 + 9.0.5 diff --git a/inventory/pom.xml b/inventory/pom.xml index 1781f599a..8e5316b21 100644 --- a/inventory/pom.xml +++ b/inventory/pom.xml @@ -10,7 +10,7 @@ org.opendaylight.mdsal binding-parent - 7.0.9 + 8.0.4 diff --git a/inventory/src/main/java/org/opendaylight/transportpce/inventory/INode121.java b/inventory/src/main/java/org/opendaylight/transportpce/inventory/INode121.java index 78e6b9a2e..e5ba1d833 100644 --- a/inventory/src/main/java/org/opendaylight/transportpce/inventory/INode121.java +++ b/inventory/src/main/java/org/opendaylight/transportpce/inventory/INode121.java @@ -497,7 +497,7 @@ public class INode121 { String parentPortCircuitPackName = (cpPort.getPartnerPort() == null ? "" : (cpPort.getPartnerPort().getCircuitPackName() == null ? "" : cpPort.getPartnerPort().getCircuitPackName())); String partnerPortPortName = (cpPort.getPartnerPort() == null ? "" : - (cpPort.getPartnerPort().getPortName() == null ? "" : cpPort.getPartnerPort().getPortName().toString())); + (cpPort.getPartnerPort().getPortName() == null ? "" : cpPort.getPartnerPort().getPortName())); String partnerPortCircuitPackName = (cpPort.getParentPort() == null ? "" : (cpPort.getParentPort().getCircuitPackName() == null ? "" : cpPort.getParentPort().getCircuitPackName())); String parentPortPortName = (cpPort.getParentPort() == null ? "" : @@ -728,7 +728,7 @@ public class INode121 { String circuitId = deviceInterface.getCircuitId(); String supportingInterface = deviceInterface.getSupportingInterface(); String supportingCircuitPackName = deviceInterface.getSupportingCircuitPackName(); - String supportingPort = deviceInterface.getSupportingPort().toString(); + String supportingPort = deviceInterface.getSupportingPort(); switch (deviceInterface.getType().toString()) { @@ -1225,9 +1225,9 @@ public class INode121 { InternalLink internalLink = internalLinkEntry.getValue(); String internalLinkName = internalLink.getInternalLinkName(); String sourceCircuitPackName = internalLink.getSource().getCircuitPackName(); - String sourcePortName = internalLink.getSource().getPortName().toString(); + String sourcePortName = internalLink.getSource().getPortName(); String destinationCircuitPackName = internalLink.getDestination().getCircuitPackName(); - String destinationPortName = internalLink.getDestination().getPortName().toString(); + String destinationPortName = internalLink.getDestination().getPortName(); Object[] parameters = { nodeId, internalLinkName, sourceCircuitPackName, sourcePortName, destinationCircuitPackName, destinationPortName, startTimestamp, startTimestamp }; @@ -1325,9 +1325,9 @@ public class INode121 { PhysicalLink physicalLink = physicalLinkEntry.getValue(); String physicalLinkName = physicalLink.getPhysicalLinkName(); String sourceCircuitPackName = physicalLink.getSource().getCircuitPackName(); - String sourcePortName = physicalLink.getSource().getPortName().toString(); + String sourcePortName = physicalLink.getSource().getPortName(); String destinationCircuitPackName = physicalLink.getDestination().getCircuitPackName(); - String destinationPortName = physicalLink.getDestination().getPortName().toString(); + String destinationPortName = physicalLink.getDestination().getPortName(); Object[] parameters = {nodeId, physicalLinkName, @@ -1381,7 +1381,7 @@ public class INode121 { String otdrPortCircuitPackName = (degree.getOtdrPort() == null ? "" : degree.getOtdrPort().getCircuitPackName()); String otdrPortPortName = - (degree.getOtdrPort() == null ? "" : degree.getOtdrPort().getPortName().toString()); + (degree.getOtdrPort() == null ? "" : degree.getOtdrPort().getPortName()); // String mcCapabilitiesSlotWidthGranularity = ""; // String mcCapabilitiesCenterFreqGranularity = ""; // String mcCapabilitiesMinSlots = "-1"; @@ -1458,7 +1458,7 @@ public class INode121 { for (Map.Entry portEntry : connectionPortsMap.entrySet()) { String connectionPortIndex = portEntry.getValue().getIndex().toString(); String circuitPackName = portEntry.getValue().getCircuitPackName(); - String portName = portEntry.getValue().getPortName().toString(); + String portName = portEntry.getValue().getPortName(); Object[] parameters = {nodeId, degreeNumber, diff --git a/inventory/src/main/java/org/opendaylight/transportpce/inventory/INode221.java b/inventory/src/main/java/org/opendaylight/transportpce/inventory/INode221.java index 24c6d45a9..eef0289b1 100644 --- a/inventory/src/main/java/org/opendaylight/transportpce/inventory/INode221.java +++ b/inventory/src/main/java/org/opendaylight/transportpce/inventory/INode221.java @@ -538,7 +538,7 @@ public class INode221 { String circuitId = deviceInterface.getCircuitId(); String supportingInterface = deviceInterface.getSupportingInterface(); String supportingCircuitPackName = deviceInterface.getSupportingCircuitPackName(); - String supportingPort = deviceInterface.getSupportingPort().toString(); + String supportingPort = deviceInterface.getSupportingPort(); String ethernetSpeed = ""; String ethernetFec = ""; String ethernetMtu = ""; @@ -1107,9 +1107,9 @@ public class INode221 { InternalLink internalLink = entry.getValue(); String internalLinkName = internalLink.getInternalLinkName(); String sourceCircuitPackName = internalLink.getSource().getCircuitPackName(); - String sourcePortName = internalLink.getSource().getPortName().toString(); + String sourcePortName = internalLink.getSource().getPortName(); String destinationCircuitPackName = internalLink.getDestination().getCircuitPackName(); - String destinationPortName = internalLink.getDestination().getPortName().toString(); + String destinationPortName = internalLink.getDestination().getPortName(); Object[] parameters = {nodeId, internalLinkName, @@ -1205,9 +1205,9 @@ public class INode221 { PhysicalLink physicalLink = entry.getValue(); String physicalLinkName = physicalLink.getPhysicalLinkName(); String sourceCircuitPackName = physicalLink.getSource().getCircuitPackName(); - String sourcePortName = physicalLink.getSource().getPortName().toString(); + String sourcePortName = physicalLink.getSource().getPortName(); String destinationCircuitPackName = physicalLink.getDestination().getCircuitPackName(); - String destinationPortName = physicalLink.getDestination().getPortName().toString(); + String destinationPortName = physicalLink.getDestination().getPortName(); Object[] parameters = {nodeId, physicalLinkName, @@ -1252,7 +1252,7 @@ public class INode221 { String degreeNumber = degree.getDegreeNumber().toString(); String maxWavelengths = degree.getMaxWavelengths().toString(); String otdrPortCircuitPackName = degree.getOtdrPort().getCircuitPackName(); - String otdrPortPortName = degree.getOtdrPort().getPortName().toString(); + String otdrPortPortName = degree.getOtdrPort().getPortName(); persistDevDegreeCircuitPack(nodeId, degree, degreeNumber, connection); persistDevDegreeConnectionPort(nodeId, degree, degreeNumber, connection); //String mcCapabilitiesSlotWidthGranularity = ""; @@ -1339,7 +1339,7 @@ public class INode221 { ConnectionPorts connectionPorts = entry.getValue(); String connectionPortIndex = connectionPorts.getIndex().toString(); String circuitPackName = connectionPorts.getCircuitPackName(); - String portName = connectionPorts.getPortName().toString(); + String portName = connectionPorts.getPortName(); Object[] parameters = {nodeId, degreeNumber, diff --git a/karaf/pom.xml b/karaf/pom.xml index 93a4f8e75..3b9b33295 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 - 8.1.3 + 9.0.5 diff --git a/nbinotifications/pom.xml b/nbinotifications/pom.xml index 8626b640a..1e04e3539 100644 --- a/nbinotifications/pom.xml +++ b/nbinotifications/pom.xml @@ -11,7 +11,7 @@ org.opendaylight.mdsal binding-parent - 7.0.9 + 8.0.4 diff --git a/networkmodel/pom.xml b/networkmodel/pom.xml index 0d06d525b..5753273a2 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 - 8.1.3 + 9.0.5 @@ -27,7 +27,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html org.opendaylight.mdsal mdsal-artifacts - 7.0.9 + 8.0.4 import pom 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 867f341e6..542ca1885 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 @@ -764,28 +764,27 @@ public class NetworkModelServiceImpl implements NetworkModelService { .stream().filter(lk -> lk.getLinkId().getValue().startsWith("ODTU4")) .collect(Collectors.toList()); } + if (odu4links == null) { + return null; + } List links = new ArrayList<>(); - if (odu4links != null) { - for (LinkTp linkTp : nodesTopoTps) { - String tp = linkTp.getTpId(); - String nodeId = new StringBuilder(linkTp.getNodeId()).append("-") - .append(tp.split("-")[0]).toString(); - Link slink = odu4links.stream().filter(lk -> lk.getSource().getSourceNode().getValue() - .equals(nodeId) && lk.getSource().getSourceTp().toString().equals(tp)).findFirst().get(); - if (!links.contains(slink)) { - links.add(slink); - } - Link dlink = odu4links.stream().filter(lk -> lk.getDestination().getDestNode().getValue() - .equals(nodeId) && lk.getDestination().getDestTp().toString().equals(tp)).findFirst().get(); - if (!links.contains(dlink)) { - links.add(dlink); - } + for (LinkTp linkTp : nodesTopoTps) { + String tp = linkTp.getTpId(); + String nodeId = new StringBuilder(linkTp.getNodeId()).append("-") + .append(tp.split("-")[0]).toString(); + Link slink = odu4links.stream().filter(lk -> lk.getSource().getSourceNode().getValue() + .equals(nodeId) && lk.getSource().getSourceTp().getValue().equals(tp)).findFirst().get(); + if (!links.contains(slink)) { + links.add(slink); + } + Link dlink = odu4links.stream().filter(lk -> lk.getDestination().getDestNode().getValue() + .equals(nodeId) && lk.getDestination().getDestTp().getValue().equals(tp)).findFirst().get(); + if (!links.contains(dlink)) { + links.add(dlink); } - LOG.debug("odu4links = {}", links.toString()); - return links; - } else { - return null; } + LOG.debug("odu4links = {}", links.toString()); + return links; } private void createOpenRoadmOtnNode(String nodeId) { diff --git a/networkmodel/src/main/java/org/opendaylight/transportpce/networkmodel/util/OpenRoadmOtnTopology.java b/networkmodel/src/main/java/org/opendaylight/transportpce/networkmodel/util/OpenRoadmOtnTopology.java index 649852dba..dd5325563 100644 --- a/networkmodel/src/main/java/org/opendaylight/transportpce/networkmodel/util/OpenRoadmOtnTopology.java +++ b/networkmodel/src/main/java/org/opendaylight/transportpce/networkmodel/util/OpenRoadmOtnTopology.java @@ -146,9 +146,9 @@ public final class OpenRoadmOtnTopology { } if (links.size() == 2) { links.addAll(initialiseOtnLinks(suppOtuLinks.get(0).getSource().getSourceNode().getValue(), - suppOtuLinks.get(0).getSource().getSourceTp().toString(), + suppOtuLinks.get(0).getSource().getSourceTp().getValue(), suppOtuLinks.get(0).getDestination().getDestNode().getValue(), - suppOtuLinks.get(0).getDestination().getDestTp().toString(), + suppOtuLinks.get(0).getDestination().getDestTp().getValue(), linkType)); } List tps = new ArrayList<>(); @@ -671,7 +671,7 @@ public final class OpenRoadmOtnTopology { SupportingTerminationPoint stp = new SupportingTerminationPointBuilder() .setNetworkRef(new NetworkId(NetworkUtils.OVERLAY_NETWORK_ID)) .setNodeRef(new NodeId(node.getNodeId() + XPDR + node.getXpdrNb())) - .setTpRef(tpId.getValue()) + .setTpRef(tpId) .build(); TerminationPoint ietfTpNw = buildIetfTp(tpceTp1Bldr, otnTp1, tpType, tpId, Map.of(stp.key(), stp), mapping); @@ -752,20 +752,16 @@ public final class OpenRoadmOtnTopology { .setOperationalState(TopologyUtils.setNetworkOperState(mapping.getPortOperState())) .build(); - ietfTpBldr.setTpId(tpId) - .withKey(new TerminationPointKey(tpId)) - .addAugmentation(otnTp1) - .addAugmentation(ocnTp); - return ietfTpBldr.build(); + return ietfTpBldr.setTpId(tpId) + .withKey(new TerminationPointKey(tpId)) + .addAugmentation(otnTp1) + .addAugmentation(ocnTp) + .build(); } private static String formatNodeName(String nodeName, String tpName) { - String newNodeName = null; - if (nodeName.contains(XPDR)) { - newNodeName = nodeName; - } else { - newNodeName = new StringBuilder(nodeName).append("-").append(tpName.split("-")[0]).toString(); - } - return newNodeName; + return nodeName.contains(XPDR) + ? nodeName + : new StringBuilder(nodeName).append("-").append(tpName.split("-")[0]).toString(); } } diff --git a/networkmodel/src/main/java/org/opendaylight/transportpce/networkmodel/util/OpenRoadmTopology.java b/networkmodel/src/main/java/org/opendaylight/transportpce/networkmodel/util/OpenRoadmTopology.java index 37142a1f6..e2c49929e 100644 --- a/networkmodel/src/main/java/org/opendaylight/transportpce/networkmodel/util/OpenRoadmTopology.java +++ b/networkmodel/src/main/java/org/opendaylight/transportpce/networkmodel/util/OpenRoadmTopology.java @@ -408,10 +408,11 @@ public final class OpenRoadmTopology { private static LinkBuilder createLink(String srcNode, String destNode, String srcTp, String destTp) { //create source link - SourceBuilder ietfSrcLinkBldr = new SourceBuilder().setSourceNode(new NodeId(srcNode)).setSourceTp(srcTp); + SourceBuilder ietfSrcLinkBldr = new SourceBuilder().setSourceNode(new NodeId(srcNode)) + .setSourceTp(new TpId(srcTp)); //create destination link DestinationBuilder ietfDestLinkBldr = new DestinationBuilder().setDestNode(new NodeId(destNode)) - .setDestTp(destTp); + .setDestTp(new TpId(destTp)); LinkId linkId = LinkIdUtil.buildLinkId(srcNode, srcTp, destNode, destTp); return new LinkBuilder() .setSource(ietfSrcLinkBldr.build()) diff --git a/networkmodel/src/main/java/org/opendaylight/transportpce/networkmodel/util/TopologyUtils.java b/networkmodel/src/main/java/org/opendaylight/transportpce/networkmodel/util/TopologyUtils.java index eaa73adba..0b9a974d7 100644 --- a/networkmodel/src/main/java/org/opendaylight/transportpce/networkmodel/util/TopologyUtils.java +++ b/networkmodel/src/main/java/org/opendaylight/transportpce/networkmodel/util/TopologyUtils.java @@ -61,13 +61,13 @@ public final class TopologyUtils { // Create Destination for link DestinationBuilder dstNodeBldr = new DestinationBuilder() - .setDestTp(destTp) + .setDestTp(new TpId(destTp)) .setDestNode(new NodeId(dstNode)); // Create Source for the link SourceBuilder srcNodeBldr = new SourceBuilder() .setSourceNode(new NodeId(srcNode)) - .setSourceTp(srcTp); + .setSourceTp(new TpId(srcTp)); LinkId linkId; LinkId oppositeLinkId; @@ -190,9 +190,9 @@ public final class TopologyUtils { // update links terminating on the given termination-point List filteredTopoLinks = links.values().stream() .filter(l1 -> (l1.getSource().getSourceNode().getValue().equals(abstractNodeid) - && l1.getSource().getSourceTp().toString().equals(tpId)) + && l1.getSource().getSourceTp().getValue().equals(tpId)) || (l1.getDestination().getDestNode().getValue().equals(abstractNodeid) - && l1.getDestination().getDestTp().toString().equals(tpId))) + && l1.getDestination().getDestTp().getValue().equals(tpId))) .collect(Collectors.toList()); List topoLinks = new ArrayList<>(); for (Link link : filteredTopoLinks) { @@ -202,13 +202,13 @@ public final class TopologyUtils { .get(new NodeKey(new NodeId(link.getDestination().getDestNode().getValue()))) .augmentation(Node1.class) .getTerminationPoint() - .get(new TerminationPointKey(new TpId(link.getDestination().getDestTp().toString()))); + .get(new TerminationPointKey(new TpId(link.getDestination().getDestTp().getValue()))); } else { otherLinkTp = nodes .get(new NodeKey(new NodeId(link.getSource().getSourceNode().getValue()))) .augmentation(Node1.class) .getTerminationPoint() - .get(new TerminationPointKey(new TpId(link.getSource().getSourceTp().toString()))); + .get(new TerminationPointKey(new TpId(link.getSource().getSourceTp().getValue()))); } Link1Builder link1Bldr = new Link1Builder(link.augmentation(Link1.class)); if (tpBldr.augmentation(TerminationPoint1.class).getAdministrativeState().equals(AdminStates.InService) diff --git a/networkmodel/src/test/java/org/opendaylight/transportpce/networkmodel/service/FrequenciesServiceTest.java b/networkmodel/src/test/java/org/opendaylight/transportpce/networkmodel/service/FrequenciesServiceTest.java index a50c4975c..59e6810c4 100644 --- a/networkmodel/src/test/java/org/opendaylight/transportpce/networkmodel/service/FrequenciesServiceTest.java +++ b/networkmodel/src/test/java/org/opendaylight/transportpce/networkmodel/service/FrequenciesServiceTest.java @@ -41,7 +41,6 @@ import org.opendaylight.yang.gen.v1.http.org.openroadm.network.types.rev200529.a import org.opendaylight.yang.gen.v1.pathdescription.stub.rev201211.PathDescription; import org.opendaylight.yangtools.yang.binding.InstanceIdentifier; import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier; -import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier.PathArgument; import org.opendaylight.yangtools.yang.data.api.schema.NormalizedNode; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -63,7 +62,7 @@ public class FrequenciesServiceTest extends AbstractTest { DataObjectConverter dataObjectConverter = JSONDataObjectConverter .createWithDataStoreUtil(getDataStoreContextUtil()); try (Reader reader = new FileReader(PATH_DESCRIPTION_FILE, StandardCharsets.UTF_8)) { - NormalizedNode normalizedNode = dataObjectConverter + NormalizedNode normalizedNode = dataObjectConverter .transformIntoNormalizedNode(reader).get(); pathDescription = (PathDescription) getDataStoreContextUtil() .getBindingDOMCodecServices().fromNormalizedNode(YangInstanceIdentifier diff --git a/networkmodel/src/test/java/org/opendaylight/transportpce/networkmodel/util/OpenRoadmOtnTopologyTest.java b/networkmodel/src/test/java/org/opendaylight/transportpce/networkmodel/util/OpenRoadmOtnTopologyTest.java index 5a186b52b..7f0ba490d 100644 --- a/networkmodel/src/test/java/org/opendaylight/transportpce/networkmodel/util/OpenRoadmOtnTopologyTest.java +++ b/networkmodel/src/test/java/org/opendaylight/transportpce/networkmodel/util/OpenRoadmOtnTopologyTest.java @@ -916,7 +916,7 @@ public class OpenRoadmOtnTopologyTest { assertEquals( "XPDR" + xpdrNb + "-NETWORK1", tpList.get(4).getSupportingTerminationPoint().values().stream().findFirst() - .get().getTpRef().toString()); + .get().getTpRef().getValue()); if (xpdrNb.equals(Uint16.valueOf(1))) { assertEquals("should contain 5 TPs", 5, tpList.size()); assertEquals("XPDR1-CLIENT1", tpList.get(0).getTpId().getValue()); diff --git a/networkmodel/src/test/java/org/opendaylight/transportpce/networkmodel/util/OpenRoadmTopologyTest.java b/networkmodel/src/test/java/org/opendaylight/transportpce/networkmodel/util/OpenRoadmTopologyTest.java index f998b5471..d7c9e8ef3 100644 --- a/networkmodel/src/test/java/org/opendaylight/transportpce/networkmodel/util/OpenRoadmTopologyTest.java +++ b/networkmodel/src/test/java/org/opendaylight/transportpce/networkmodel/util/OpenRoadmTopologyTest.java @@ -61,6 +61,7 @@ import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.network.rev import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.network.rev180226.networks.network.node.SupportingNode; import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.network.topology.rev180226.LinkId; import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.network.topology.rev180226.Network1; +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.Link; import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.network.topology.rev180226.networks.network.LinkBuilder; import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.network.topology.rev180226.networks.network.LinkKey; @@ -97,14 +98,14 @@ public class OpenRoadmTopologyTest { assertEquals("Should contain 2 express links", 2, links.size()); assertEquals("ROADMA01-DEG1-DEG1-CTP-TXRXtoROADMA01-DEG2-DEG2-CTP-TXRX", links.get(0).getLinkId().getValue()); assertEquals("ROADMA01-DEG1", links.get(0).getSource().getSourceNode().getValue()); - assertEquals("DEG1-CTP-TXRX", links.get(0).getSource().getSourceTp()); + assertEquals("DEG1-CTP-TXRX", links.get(0).getSource().getSourceTp().getValue()); assertEquals("ROADMA01-DEG2", links.get(0).getDestination().getDestNode().getValue()); - assertEquals("DEG2-CTP-TXRX", links.get(0).getDestination().getDestTp()); + assertEquals("DEG2-CTP-TXRX", links.get(0).getDestination().getDestTp().getValue()); assertEquals("ROADMA01-DEG2-DEG2-CTP-TXRXtoROADMA01-DEG1-DEG1-CTP-TXRX", links.get(1).getLinkId().getValue()); assertEquals("ROADMA01-DEG2", links.get(1).getSource().getSourceNode().getValue()); - assertEquals("DEG2-CTP-TXRX", links.get(1).getSource().getSourceTp()); + assertEquals("DEG2-CTP-TXRX", links.get(1).getSource().getSourceTp().getValue()); assertEquals("ROADMA01-DEG1", links.get(1).getDestination().getDestNode().getValue()); - assertEquals("DEG1-CTP-TXRX", links.get(1).getDestination().getDestTp()); + assertEquals("DEG1-CTP-TXRX", links.get(1).getDestination().getDestTp().getValue()); } @Test @@ -197,8 +198,9 @@ public class OpenRoadmTopologyTest { new Link1Builder().build(); Link link = new LinkBuilder() .setLinkId(linkId) - .setSource(new SourceBuilder().setSourceNode(new NodeId(srcNode)).setSourceTp(srcTp).build()) - .setDestination(new DestinationBuilder().setDestNode(new NodeId(dstNode)).setDestTp(destTp).build()) + .setSource(new SourceBuilder().setSourceNode(new NodeId(srcNode)).setSourceTp(new TpId(srcTp)).build()) + .setDestination(new DestinationBuilder().setDestNode(new NodeId(dstNode)).setDestTp(new TpId(destTp)) + .build()) .addAugmentation(link1) .build(); InstanceIdentifier linkIID = InstanceIdentifier.builder(Networks.class).child(Network.class, diff --git a/networkmodel/src/test/java/org/opendaylight/transportpce/networkmodel/util/test/JsonUtil.java b/networkmodel/src/test/java/org/opendaylight/transportpce/networkmodel/util/test/JsonUtil.java index 4b29f2912..77d2a45f7 100644 --- a/networkmodel/src/test/java/org/opendaylight/transportpce/networkmodel/util/test/JsonUtil.java +++ b/networkmodel/src/test/java/org/opendaylight/transportpce/networkmodel/util/test/JsonUtil.java @@ -68,7 +68,7 @@ public final class JsonUtil { NormalizedNodeResult result = new NormalizedNodeResult(); try (NormalizedNodeStreamWriter streamWriter = ImmutableNormalizedNodeStreamWriter.from(result); JsonParserStream jsonParser = JsonParserStream.create(streamWriter, - JSONCodecFactorySupplier.RFC7951.getShared(schemaCtx), schemaCtx);) { + JSONCodecFactorySupplier.RFC7951.getShared(schemaCtx));) { jsonParser.parse(reader); YangInstanceIdentifier yangId = YangInstanceIdentifier.of(pathQname); if (codecRegistry.fromNormalizedNode(yangId, result.getResult()) != null) { diff --git a/networkmodel/src/test/java/org/opendaylight/transportpce/networkmodel/util/test/NetworkmodelTestUtil.java b/networkmodel/src/test/java/org/opendaylight/transportpce/networkmodel/util/test/NetworkmodelTestUtil.java index 6bafebb88..4b90333e5 100644 --- a/networkmodel/src/test/java/org/opendaylight/transportpce/networkmodel/util/test/NetworkmodelTestUtil.java +++ b/networkmodel/src/test/java/org/opendaylight/transportpce/networkmodel/util/test/NetworkmodelTestUtil.java @@ -91,10 +91,10 @@ public final class NetworkmodelTestUtil { .setLinkId(new LinkId(type.getName() + "-SPDRA-XPDR1-XPDR1-NETWORK1toSPDRZ-XPDR1-XPDR1-NETWORK1")) .setSource(new SourceBuilder() .setSourceNode(new NodeId("SPDRA-XPDR1")) - .setSourceTp("XPDR1-NETWORK1").build()) + .setSourceTp(new TpId("XPDR1-NETWORK1")).build()) .setDestination(new DestinationBuilder() .setDestNode(new NodeId("SPDRZ-XPDR1")) - .setDestTp("XPDR1-NETWORK1").build()) + .setDestTp(new TpId("XPDR1-NETWORK1")).build()) .addAugmentation( new Link1Builder() .setLinkType(OpenroadmLinkType.OTNLINK) @@ -115,10 +115,10 @@ public final class NetworkmodelTestUtil { .setLinkId(new LinkId(type.getName() + "-SPDRZ-XPDR1-XPDR1-NETWORK1toSPDRA-XPDR1-XPDR1-NETWORK1")) .setSource(new SourceBuilder() .setSourceNode(new NodeId("SPDRZ-XPDR1")) - .setSourceTp("XPDR1-NETWORK1").build()) + .setSourceTp(new TpId("XPDR1-NETWORK1")).build()) .setDestination(new DestinationBuilder() .setDestNode(new NodeId("SPDRA-XPDR1")) - .setDestTp("XPDR1-NETWORK1").build()) + .setDestTp(new TpId("XPDR1-NETWORK1")).build()) .addAugmentation( new Link1Builder() .setLinkType(OpenroadmLinkType.OTNLINK) @@ -175,7 +175,7 @@ public final class NetworkmodelTestUtil { SupportingTerminationPoint supTermPointA = new SupportingTerminationPointBuilder() .setNetworkRef(new NetworkId(NetworkUtils.OVERLAY_NETWORK_ID)) .setNodeRef(new NodeId("SPDRA-XPDR1")) - .setTpRef("XPDR1-NETWORK1") + .setTpRef(new TpId("XPDR1-NETWORK1")) .build(); Map supTermPointMapA = Map.of(supTermPointA.key(), supTermPointA); @@ -191,7 +191,7 @@ public final class NetworkmodelTestUtil { SupportingTerminationPoint supTermPointZ = new SupportingTerminationPointBuilder() .setNetworkRef(new NetworkId(NetworkUtils.OVERLAY_NETWORK_ID)) .setNodeRef(new NodeId("SPDRZ-XPDR1")) - .setTpRef("XPDR1-NETWORK1") + .setTpRef(new TpId("XPDR1-NETWORK1")) .build(); Map supTermPointMapZ = Map.of(supTermPointZ.key(), supTermPointZ); diff --git a/olm/pom.xml b/olm/pom.xml index f80a0f251..3f3c2456c 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 - 7.0.9 + 8.0.4 diff --git a/olm/src/main/java/org/opendaylight/transportpce/olm/service/OlmPowerServiceImpl.java b/olm/src/main/java/org/opendaylight/transportpce/olm/service/OlmPowerServiceImpl.java index aa72dfee0..4db9a6102 100644 --- a/olm/src/main/java/org/opendaylight/transportpce/olm/service/OlmPowerServiceImpl.java +++ b/olm/src/main/java/org/opendaylight/transportpce/olm/service/OlmPowerServiceImpl.java @@ -187,9 +187,9 @@ public class OlmPowerServiceImpl implements OlmPowerService { if (inputLink != null) { RoadmLinks roadmLink = new RoadmLinks(); roadmLink.setSrcNodeId(inputLink.getSource().getSourceNode().getValue()); - roadmLink.setSrcTpId(inputLink.getSource().getSourceTp().toString()); + roadmLink.setSrcTpId(inputLink.getSource().getSourceTp().getValue()); roadmLink.setDestNodeId(inputLink.getDestination().getDestNode().getValue()); - roadmLink.setDestTpid(inputLink.getDestination().getDestTp().toString()); + roadmLink.setDestTpid(inputLink.getDestination().getDestTp().getValue()); roadmLink.setLinkId(inputLink.getLinkId()); roadmLinks.add(roadmLink); spanLossResult = getLinkSpanloss(roadmLinks); @@ -214,9 +214,9 @@ public class OlmPowerServiceImpl implements OlmPowerService { // Only calculate spanloss for Roadm-to-Roadm links RoadmLinks roadmLink = new RoadmLinks(); roadmLink.setSrcNodeId(link.getSource().getSourceNode().getValue()); - roadmLink.setSrcTpId(link.getSource().getSourceTp().toString()); + roadmLink.setSrcTpId(link.getSource().getSourceTp().getValue()); roadmLink.setDestNodeId(link.getDestination().getDestNode().getValue()); - roadmLink.setDestTpid(link.getDestination().getDestTp().toString()); + roadmLink.setDestTpid(link.getDestination().getDestTp().getValue()); roadmLink.setLinkId(link.getLinkId()); roadmLinks.add(roadmLink); } @@ -271,9 +271,9 @@ public class OlmPowerServiceImpl implements OlmPowerService { // Only calculate spanloss for Roadm-to-Roadm links RoadmLinks roadmLink = new RoadmLinks(); roadmLink.setSrcNodeId(link.getSource().getSourceNode().getValue()); - roadmLink.setSrcTpId(link.getSource().getSourceTp().toString()); + roadmLink.setSrcTpId(link.getSource().getSourceTp().getValue()); roadmLink.setDestNodeId(link.getDestination().getDestNode().getValue()); - roadmLink.setDestTpid(link.getDestination().getDestTp().toString()); + roadmLink.setDestTpid(link.getDestination().getDestTp().getValue()); roadmLinks.add(roadmLink); } } diff --git a/olm/src/test/java/org/opendaylight/transportpce/olm/util/OlmTransactionUtils.java b/olm/src/test/java/org/opendaylight/transportpce/olm/util/OlmTransactionUtils.java index 19ed0b363..90c35afa5 100644 --- a/olm/src/test/java/org/opendaylight/transportpce/olm/util/OlmTransactionUtils.java +++ b/olm/src/test/java/org/opendaylight/transportpce/olm/util/OlmTransactionUtils.java @@ -64,6 +64,7 @@ import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.network.rev import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.network.topology.rev180226.LinkId; import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.network.topology.rev180226.Network1; import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.network.topology.rev180226.Network1Builder; +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.Link; import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.network.topology.rev180226.networks.network.LinkBuilder; import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.network.topology.rev180226.networks.network.link.DestinationBuilder; @@ -200,10 +201,14 @@ public final class OlmTransactionUtils { .setLinkType(OpenroadmLinkType.ROADMTOROADM).build(); // create the roadm-to-roadm link to be measured Link roadm2roadmLink = new LinkBuilder().setLinkId(new LinkId("ROADM-A1-to-ROADM-C1")) - .setSource(new SourceBuilder().setSourceNode(ietfNodeA.getNodeId()).setSourceTp("DEG2-TTP-TXRX") + .setSource(new SourceBuilder() + .setSourceNode(ietfNodeA.getNodeId()) + .setSourceTp(new TpId("DEG2-TTP-TXRX")) + .build()) + .setDestination(new DestinationBuilder() + .setDestNode(ietfNodeC.getNodeId()) + .setDestTp(new TpId("DEG1-TTP-TXRX")) .build()) - .setDestination( - new DestinationBuilder().setDestNode(ietfNodeC.getNodeId()).setDestTp("DEG1-TTP-TXRX").build()) .addAugmentation(aug11) .addAugmentation(aug12) .addAugmentation(aug21) @@ -288,4 +293,4 @@ public final class OlmTransactionUtils { return Optional.of(new CurrentPmListBuilder() .setCurrentPmEntry(Map.of(currentPmEntryC.key(),currentPmEntryC)).build()); } -} \ No newline at end of file +} diff --git a/olm/src/test/java/org/opendaylight/transportpce/olm/util/TransactionUtils.java b/olm/src/test/java/org/opendaylight/transportpce/olm/util/TransactionUtils.java index 014a97da4..d924cac0d 100644 --- a/olm/src/test/java/org/opendaylight/transportpce/olm/util/TransactionUtils.java +++ b/olm/src/test/java/org/opendaylight/transportpce/olm/util/TransactionUtils.java @@ -54,6 +54,7 @@ import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.network.rev import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.network.topology.rev180226.LinkId; import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.network.topology.rev180226.Network1; import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.network.topology.rev180226.Network1Builder; +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.Link; import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.network.topology.rev180226.networks.network.LinkBuilder; import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.network.topology.rev180226.networks.network.LinkKey; @@ -178,11 +179,11 @@ public final class TransactionUtils { public static Network1 getNetwork() { Map supportingLinks = new HashMap<>(); SupportingLink supportingLink1 = new SupportingLinkBuilder() - .setLinkRef("ref1") + .setLinkRef(new LinkId("ref1")) .setNetworkRef(new NetworkId("net1")) .build(); SupportingLink supportingLink2 = new SupportingLinkBuilder() - .setLinkRef("ref2") + .setLinkRef(new LinkId("ref2")) .setNetworkRef(new NetworkId("net2")) .build(); supportingLinks.put(supportingLink1.key(),supportingLink1); @@ -193,11 +194,11 @@ public final class TransactionUtils { .setDestination( new DestinationBuilder() .setDestNode(new NodeId("node 1")) - .setDestTp("dest tp").build()) + .setDestTp(new TpId("dest tp")).build()) .setSource( new SourceBuilder() .setSourceNode(new NodeId("node 2")) - .setSourceTp("src tp") + .setSourceTp(new TpId("src tp")) .build()) .setSupportingLink(supportingLinks) .build(); @@ -207,12 +208,12 @@ public final class TransactionUtils { .setDestination( new DestinationBuilder() .setDestNode(new NodeId("node 3")) - .setDestTp("dest tp") + .setDestTp(new TpId("dest tp")) .build()) .setSource( new SourceBuilder() .setSourceNode(new NodeId("node 4")) - .setSourceTp("src tp") + .setSourceTp(new TpId("src tp")) .build()) .setSupportingLink(supportingLinks) .build(); @@ -294,27 +295,27 @@ public final class TransactionUtils { .build(); Map supportingLinks = new HashMap<>(); - SupportingLink supportingLink = new SupportingLinkBuilder().setLinkRef("ref1") + SupportingLink supportingLink = new SupportingLinkBuilder().setLinkRef(new LinkId("ref1")) .setNetworkRef(new NetworkId("net1")).build(); - SupportingLink supportingLink2 = new SupportingLinkBuilder().setLinkRef("ref2") + SupportingLink supportingLink2 = new SupportingLinkBuilder().setLinkRef(new LinkId("ref2")) .setNetworkRef(new NetworkId("net1")).build(); supportingLinks.put(supportingLink.key(),supportingLink); supportingLinks.put(supportingLink2.key(),supportingLink2); Map links = new HashMap<>(); Link link1 = new LinkBuilder().setLinkId(new LinkId("link 1")) .setDestination(new DestinationBuilder().setDestNode(new NodeId("node 1")) - .setDestTp("dest tp").build()) + .setDestTp(new TpId("dest tp")).build()) .setSource(new SourceBuilder().setSourceNode(new NodeId("node 2")) - .setSourceTp("src tp").build()) + .setSourceTp(new TpId("src tp")).build()) .setSupportingLink(supportingLinks) .addAugmentation(aug1) .addAugmentation(aug2).build(); Link link2 = new LinkBuilder().setLinkId(new LinkId("link 2")) .setDestination(new DestinationBuilder().setDestNode(new NodeId("node 3")) - .setDestTp("dest tp").build()) + .setDestTp(new TpId("dest tp")).build()) .setSource(new SourceBuilder().setSourceNode(new NodeId("node 4")) - .setSourceTp("src tp").build()) + .setSourceTp(new TpId("src tp")).build()) .setSupportingLink(supportingLinks).build(); links.put(link1.key(),link1); links.put(link2.key(),link2); diff --git a/ordmodels/common/pom.xml b/ordmodels/common/pom.xml index 4852f2ef8..5f53553a4 100644 --- a/ordmodels/common/pom.xml +++ b/ordmodels/common/pom.xml @@ -12,7 +12,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html org.opendaylight.mdsal binding-parent - 7.0.9 + 8.0.4 diff --git a/ordmodels/device/pom.xml b/ordmodels/device/pom.xml index c46270acd..169d93346 100644 --- a/ordmodels/device/pom.xml +++ b/ordmodels/device/pom.xml @@ -12,7 +12,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html org.opendaylight.mdsal binding-parent - 7.0.9 + 8.0.4 @@ -26,7 +26,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html org.opendaylight.netconf netconf-artifacts - 1.13.4 + 2.0.3 import pom diff --git a/ordmodels/network/pom.xml b/ordmodels/network/pom.xml index 7e68a9382..41a21e8cc 100644 --- a/ordmodels/network/pom.xml +++ b/ordmodels/network/pom.xml @@ -12,7 +12,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html org.opendaylight.mdsal binding-parent - 7.0.9 + 8.0.4 diff --git a/ordmodels/pom.xml b/ordmodels/pom.xml index cfd273bab..429650f2e 100644 --- a/ordmodels/pom.xml +++ b/ordmodels/pom.xml @@ -12,7 +12,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html org.opendaylight.mdsal binding-parent - 7.0.9 + 8.0.4 diff --git a/ordmodels/service/pom.xml b/ordmodels/service/pom.xml index 9e06402b0..349e89a4e 100644 --- a/ordmodels/service/pom.xml +++ b/ordmodels/service/pom.xml @@ -12,7 +12,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html org.opendaylight.mdsal binding-parent - 7.0.9 + 8.0.4 diff --git a/pce/pom.xml b/pce/pom.xml index 14dd85c74..26b1c31b6 100644 --- a/pce/pom.xml +++ b/pce/pom.xml @@ -14,7 +14,7 @@ org.opendaylight.mdsal binding-parent - 7.0.9 + 8.0.4 diff --git a/pce/src/main/java/org/opendaylight/transportpce/pce/PcePathDescription.java b/pce/src/main/java/org/opendaylight/transportpce/pce/PcePathDescription.java index 4125c13a5..3e6f154d7 100644 --- a/pce/src/main/java/org/opendaylight/transportpce/pce/PcePathDescription.java +++ b/pce/src/main/java/org/opendaylight/transportpce/pce/PcePathDescription.java @@ -198,7 +198,7 @@ public class PcePathDescription { atozMap.put(srcResource.key(),srcResource); // source TP - tpName = pcelink.getSourceTP().toString(); + tpName = pcelink.getSourceTP().getValue(); stp = new TerminationPointBuilder() .setTpNodeId(srcName).setTpId(tpName) .build(); @@ -226,7 +226,7 @@ public class PcePathDescription { String destName = pcelink.getDestId().getValue(); // target TP - tpName = pcelink.getDestTP().toString(); + tpName = pcelink.getDestTP().getValue(); TerminationPoint dtp = new TerminationPointBuilder() .setTpNodeId(destName).setTpId(tpName) .build(); @@ -311,7 +311,7 @@ public class PcePathDescription { ztoaList.put(srcResource.key(),srcResource); // source TP - tpName = pcelink.getSourceTP().toString(); + tpName = pcelink.getSourceTP().getValue(); stp = new TerminationPointBuilder() .setTpNodeId(srcName).setTpId(tpName) .build(); @@ -338,7 +338,7 @@ public class PcePathDescription { String destName = pcelink.getDestId().getValue(); // target TP - tpName = pcelink.getDestTP().toString(); + tpName = pcelink.getDestTP().getValue(); TerminationPoint ttp = new TerminationPointBuilder() .setTpNodeId(destName).setTpId(tpName).build(); diff --git a/pce/src/main/java/org/opendaylight/transportpce/pce/graph/PostAlgoPathValidator.java b/pce/src/main/java/org/opendaylight/transportpce/pce/graph/PostAlgoPathValidator.java index 0ec32575c..39e278e93 100644 --- a/pce/src/main/java/org/opendaylight/transportpce/pce/graph/PostAlgoPathValidator.java +++ b/pce/src/main/java/org/opendaylight/transportpce/pce/graph/PostAlgoPathValidator.java @@ -281,9 +281,9 @@ public class PostAlgoPathValidator { for (PceGraphEdge edge : path.getEdgeList()) { NodeId linkSrcNode = edge.link().getSourceId(); - String linkSrcTp = edge.link().getSourceTP().toString(); + String linkSrcTp = edge.link().getSourceTP().getValue(); NodeId linkDestNode = edge.link().getDestId(); - String linkDestTp = edge.link().getDestTP().toString(); + String linkDestTp = edge.link().getDestTP().getValue(); PceNode pceOtnNodeSrc = allPceNodes.get(linkSrcNode); PceNode pceOtnNodeDest = allPceNodes.get(linkDestNode); List srcTpnPool = pceOtnNodeSrc.getAvailableTribPorts().get(linkSrcTp); @@ -316,9 +316,9 @@ public class PostAlgoPathValidator { for (PceGraphEdge edge : path.getEdgeList()) { NodeId linkSrcNode = edge.link().getSourceId(); - String linkSrcTp = edge.link().getSourceTP().toString(); + String linkSrcTp = edge.link().getSourceTP().getValue(); NodeId linkDestNode = edge.link().getDestId(); - String linkDestTp = edge.link().getDestTP().toString(); + String linkDestTp = edge.link().getDestTP().getValue(); PceNode pceOtnNodeSrc = allPceNodes.get(linkSrcNode); PceNode pceOtnNodeDest = allPceNodes.get(linkDestNode); List srcTsPool = pceOtnNodeSrc.getAvailableTribSlots().get(linkSrcTp); diff --git a/pce/src/main/java/org/opendaylight/transportpce/pce/networkanalyzer/PceCalculation.java b/pce/src/main/java/org/opendaylight/transportpce/pce/networkanalyzer/PceCalculation.java index e7d7a6c56..19774901d 100644 --- a/pce/src/main/java/org/opendaylight/transportpce/pce/networkanalyzer/PceCalculation.java +++ b/pce/src/main/java/org/opendaylight/transportpce/pce/networkanalyzer/PceCalculation.java @@ -210,7 +210,7 @@ public class PceCalculation { LOG.warn("no otn links in otn-topology"); } else { allLinks = nw1.nonnullLink().values().stream().sorted((l1, l2) - -> l1.getSource().getSourceTp().toString().compareTo(l2.getSource().getSourceTp().toString())) + -> l1.getSource().getSourceTp().getValue().compareTo(l2.getSource().getSourceTp().getValue())) .collect(Collectors.toList()); } if (allNodes == null || allNodes.isEmpty()) { @@ -591,12 +591,12 @@ public class PceCalculation { pcelink.getlinkType(), pcelink); break; case ADDLINK: - pcelink.setClient(source.getRdmSrgClient(pcelink.getSourceTP().toString())); + pcelink.setClient(source.getRdmSrgClient(pcelink.getSourceTP().getValue())); addLinks.add(pcelink); LOG.debug("validateLink: ADD-LINK saved {}", pcelink); break; case DROPLINK: - pcelink.setClient(dest.getRdmSrgClient(pcelink.getDestTP().toString())); + pcelink.setClient(dest.getRdmSrgClient(pcelink.getDestTP().getValue())); dropLinks.add(pcelink); LOG.debug("validateLink: DROP-LINK saved {}", pcelink); break; @@ -604,13 +604,13 @@ public class PceCalculation { // store separately all SRG links directly azSrgs.add(sourceId); // connected to A/Z - if (!dest.checkTP(pcelink.getDestTP().toString())) { + if (!dest.checkTP(pcelink.getDestTP().getValue())) { LOG.debug( "validateLink: XPONDER-INPUT is rejected as NW port is busy - {} ", pcelink); return false; } - if (dest.getXpdrClient(pcelink.getDestTP().toString()) != null) { - pcelink.setClient(dest.getXpdrClient(pcelink.getDestTP().toString())); + if (dest.getXpdrClient(pcelink.getDestTP().getValue()) != null) { + pcelink.setClient(dest.getXpdrClient(pcelink.getDestTP().getValue())); } allPceLinks.put(linkId, pcelink); source.addOutgoingLink(pcelink); @@ -621,13 +621,13 @@ public class PceCalculation { // store separately all SRG links directly azSrgs.add(destId); // connected to A/Z - if (!source.checkTP(pcelink.getSourceTP().toString())) { + if (!source.checkTP(pcelink.getSourceTP().getValue())) { LOG.debug( "validateLink: XPONDER-OUTPUT is rejected as NW port is busy - {} ", pcelink); return false; } - if (source.getXpdrClient(pcelink.getSourceTP().toString()) != null) { - pcelink.setClient(source.getXpdrClient(pcelink.getSourceTP().toString())); + if (source.getXpdrClient(pcelink.getSourceTP().getValue()) != null) { + pcelink.setClient(source.getXpdrClient(pcelink.getSourceTP().getValue())); } allPceLinks.put(linkId, pcelink); source.addOutgoingLink(pcelink); @@ -657,8 +657,8 @@ public class PceCalculation { switch (pceOtnLink.getlinkType()) { case OTNLINK: - if (dest.getXpdrClient(pceOtnLink.getDestTP().toString()) != null) { - pceOtnLink.setClient(dest.getXpdrClient(pceOtnLink.getDestTP().toString())); + if (dest.getXpdrClient(pceOtnLink.getDestTP().getValue()) != null) { + pceOtnLink.setClient(dest.getXpdrClient(pceOtnLink.getDestTP().getValue())); } allPceLinks.put(linkId, pceOtnLink); diff --git a/pce/src/main/java/org/opendaylight/transportpce/pce/networkanalyzer/PceLink.java b/pce/src/main/java/org/opendaylight/transportpce/pce/networkanalyzer/PceLink.java index 807b4baac..028849f3f 100644 --- a/pce/src/main/java/org/opendaylight/transportpce/pce/networkanalyzer/PceLink.java +++ b/pce/src/main/java/org/opendaylight/transportpce/pce/networkanalyzer/PceLink.java @@ -8,9 +8,6 @@ package org.opendaylight.transportpce.pce.networkanalyzer; -import java.io.IOException; -import java.io.ObjectInputStream; -import java.io.ObjectOutputStream; import java.io.Serializable; import java.util.Collection; import java.util.Iterator; @@ -27,6 +24,7 @@ import org.opendaylight.yang.gen.v1.http.org.openroadm.network.types.rev200529.O import org.opendaylight.yang.gen.v1.http.transportpce.topology.rev210511.OtnLinkType; import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.network.rev180226.NodeId; import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.network.topology.rev180226.LinkId; +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.Link; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -53,8 +51,8 @@ public class PceLink implements Serializable { private final OpenroadmLinkType linkType; private final NodeId sourceId; private final NodeId destId; - private transient Object sourceTP; - private transient Object destTP; + private final TpId sourceTP; + private final TpId destTP; private final String sourceNetworkSupNodeId; private final String destNetworkSupNodeId; private final String sourceCLLI; @@ -225,11 +223,11 @@ public class PceLink implements Serializable { return state; } - public Object getSourceTP() { + public TpId getSourceTP() { return sourceTP; } - public Object getDestTP() { + public TpId getDestTP() { return destTP; } @@ -409,16 +407,4 @@ public class PceLink implements Serializable { public String toString() { return "PceLink type=" + linkType + " ID=" + linkId.getValue() + " latency=" + latency; } - - private void writeObject(ObjectOutputStream out) throws IOException { - out.defaultWriteObject(); - out.writeObject(this.sourceTP); - out.writeObject(this.destTP); - } - - private void readObject(ObjectInputStream in) throws IOException,ClassNotFoundException { - in.defaultReadObject(); - this.sourceTP = in.readObject(); - this.destTP = in.readObject(); - } } diff --git a/pce/src/test/java/org/opendaylight/transportpce/pce/networkanalyzer/PceLinkTest.java b/pce/src/test/java/org/opendaylight/transportpce/pce/networkanalyzer/PceLinkTest.java index 101e940e1..e17183fa4 100644 --- a/pce/src/test/java/org/opendaylight/transportpce/pce/networkanalyzer/PceLinkTest.java +++ b/pce/src/test/java/org/opendaylight/transportpce/pce/networkanalyzer/PceLinkTest.java @@ -203,11 +203,11 @@ public class PceLinkTest extends AbstractTest { private static LinkBuilder createLinkBuilder( String srcNode, String destNode, String srcTp, String destTp, Link1Builder link1Builder) { SourceBuilder ietfSrcLinkBldr = - new SourceBuilder().setSourceNode(new NodeId(srcNode)).setSourceTp(srcTp); + new SourceBuilder().setSourceNode(new NodeId(srcNode)).setSourceTp(new TpId(srcTp)); //create destination link DestinationBuilder ietfDestLinkBldr = new DestinationBuilder().setDestNode(new NodeId(destNode)) - .setDestTp(destTp); + .setDestTp(new TpId(destTp)); LinkId linkId = new LinkId(String.format(LINK_ID_FORMAT, srcNode, srcTp, destNode, destTp)); //For setting up attributes for openRoadm augment diff --git a/pce/src/test/java/org/opendaylight/transportpce/pce/utils/JsonUtil.java b/pce/src/test/java/org/opendaylight/transportpce/pce/utils/JsonUtil.java index b729a534b..0c54e6316 100644 --- a/pce/src/test/java/org/opendaylight/transportpce/pce/utils/JsonUtil.java +++ b/pce/src/test/java/org/opendaylight/transportpce/pce/utils/JsonUtil.java @@ -62,7 +62,7 @@ public final class JsonUtil { NormalizedNodeResult result = new NormalizedNodeResult(); try (NormalizedNodeStreamWriter streamWriter = ImmutableNormalizedNodeStreamWriter.from(result); JsonParserStream jsonParser = JsonParserStream.create(streamWriter, - JSONCodecFactorySupplier.RFC7951.getShared(schemaCtx), schemaCtx);) { + JSONCodecFactorySupplier.RFC7951.getShared(schemaCtx));) { jsonParser.parse(reader); YangInstanceIdentifier yangId = YangInstanceIdentifier.of(pathQname); if (bindingDOMCodecServices.fromNormalizedNode(yangId, result.getResult()) != null) { diff --git a/pce/src/test/java/org/opendaylight/transportpce/pce/utils/NodeUtils.java b/pce/src/test/java/org/opendaylight/transportpce/pce/utils/NodeUtils.java index ef47c7963..ab3198204 100644 --- a/pce/src/test/java/org/opendaylight/transportpce/pce/utils/NodeUtils.java +++ b/pce/src/test/java/org/opendaylight/transportpce/pce/utils/NodeUtils.java @@ -84,10 +84,10 @@ public class NodeUtils { public static LinkBuilder createLinkBuilder( String srcNode, String destNode, String srcTp, String destTp, Link1Builder link1Builder) { SourceBuilder ietfSrcLinkBldr = - new SourceBuilder().setSourceNode(new NodeId(srcNode)).setSourceTp(srcTp); + new SourceBuilder().setSourceNode(new NodeId(srcNode)).setSourceTp(new TpId(srcTp)); //create destination link DestinationBuilder ietfDestLinkBldr = - new DestinationBuilder().setDestNode(new NodeId(destNode)).setDestTp(destTp); + new DestinationBuilder().setDestNode(new NodeId(destNode)).setDestTp(new TpId(destTp)); LinkId linkId = new LinkId(String.format(LINK_ID_FORMAT, srcNode, srcTp, destNode, destTp)); LinkId oppositeLinkId = new LinkId("OpenROADM-3-2-DEG1-to-OpenROADM-3-1-DEG1"); @@ -255,11 +255,11 @@ public class NodeUtils { .setSource( new SourceBuilder() .setSourceNode(new NodeId("OpenROADM-3-2-DEG1")) - .setSourceTp("DEG1-TTP-TX").build()) + .setSourceTp(new TpId("DEG1-TTP-TX")).build()) .setDestination( new DestinationBuilder() .setDestNode(new NodeId("OpenROADM-3-1-DEG1")) - .setDestTp("DEG1-TTP-RX").build()) + .setDestTp(new TpId("DEG1-TTP-RX")).build()) .addAugmentation(aug11) .addAugmentation(aug111) .build(); diff --git a/pce/src/test/java/org/opendaylight/transportpce/pce/utils/PceTestUtils.java b/pce/src/test/java/org/opendaylight/transportpce/pce/utils/PceTestUtils.java index 4b0405c97..a9dca163b 100644 --- a/pce/src/test/java/org/opendaylight/transportpce/pce/utils/PceTestUtils.java +++ b/pce/src/test/java/org/opendaylight/transportpce/pce/utils/PceTestUtils.java @@ -40,7 +40,6 @@ import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.network.rev import org.opendaylight.yangtools.yang.binding.DataObject; import org.opendaylight.yangtools.yang.binding.InstanceIdentifier; import org.opendaylight.yangtools.yang.common.QName; -import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier; import org.opendaylight.yangtools.yang.data.api.schema.ContainerNode; import org.opendaylight.yangtools.yang.data.api.schema.DataContainerChild; import org.opendaylight.yangtools.yang.data.api.schema.MapEntryNode; @@ -62,11 +61,11 @@ public final class PceTestUtils { DataObjectConverter dataObjectConverter = XMLDataObjectConverter.createWithDataStoreUtil(dataStoreContext); InputStream resourceAsStream = PceTestUtils.class.getClassLoader().getResourceAsStream(topologyDataPath); - Optional> normalizedNode + Optional normalizedNode = dataObjectConverter.transformIntoNormalizedNode(resourceAsStream); - DataContainerChild next - = ((ContainerNode) normalizedNode.get()).getValue().iterator().next(); - MapEntryNode mapNode = ((MapNode) next).getValue().iterator().next(); + DataContainerChild next + = ((ContainerNode) normalizedNode.get()).body().iterator().next(); + MapEntryNode mapNode = ((MapNode) next).body().iterator().next(); Optional dataObject = dataObjectConverter.getDataObject(mapNode, Network.QNAME); InstanceIdentifier nwInstanceIdentifier = InstanceIdentifier.builder(Networks.class) .child(Network.class, new NetworkKey(new NetworkId(NetworkUtils.OVERLAY_NETWORK_ID))) diff --git a/pce/src/test/java/org/opendaylight/transportpce/pce/utils/TransactionUtils.java b/pce/src/test/java/org/opendaylight/transportpce/pce/utils/TransactionUtils.java index 6998a020d..e88bb9826 100644 --- a/pce/src/test/java/org/opendaylight/transportpce/pce/utils/TransactionUtils.java +++ b/pce/src/test/java/org/opendaylight/transportpce/pce/utils/TransactionUtils.java @@ -67,6 +67,7 @@ import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.network.rev import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.network.topology.rev180226.LinkId; import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.network.topology.rev180226.Network1; import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.network.topology.rev180226.Network1Builder; +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.Link; import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.network.topology.rev180226.networks.network.LinkBuilder; import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.network.topology.rev180226.networks.network.link.DestinationBuilder; @@ -203,9 +204,9 @@ public final class TransactionUtils { // create the roadm-to-roadm link to be measured Link roadm2roadmLink = new LinkBuilder().setLinkId(new LinkId("ROADM-A1-to-ROADM-C1")) .setSource(new SourceBuilder().setSourceNode(ietfNodeA.getNodeId()) - .setSourceTp("DEG2-TTP-TXRX").build()) - .setDestination( - new DestinationBuilder().setDestNode(ietfNodeC.getNodeId()).setDestTp("DEG1-TTP-TXRX").build()) + .setSourceTp(new TpId("DEG2-TTP-TXRX")).build()) + .setDestination(new DestinationBuilder().setDestNode(ietfNodeC.getNodeId()) + .setDestTp(new TpId("DEG1-TTP-TXRX")).build()) .addAugmentation(aug11) .addAugmentation(aug12) .addAugmentation(aug21) diff --git a/pom.xml b/pom.xml index 873ffe20a..9f2f2356c 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 - 8.1.3 + 9.0.5 diff --git a/renderer/pom.xml b/renderer/pom.xml index b3d9ac200..facb28c59 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 - 7.0.9 + 8.0.4 diff --git a/renderer/src/main/java/org/opendaylight/transportpce/renderer/provisiondevice/servicepath/ServiceListTopology.java b/renderer/src/main/java/org/opendaylight/transportpce/renderer/provisiondevice/servicepath/ServiceListTopology.java index 3bebbb0e3..31245fcec 100644 --- a/renderer/src/main/java/org/opendaylight/transportpce/renderer/provisiondevice/servicepath/ServiceListTopology.java +++ b/renderer/src/main/java/org/opendaylight/transportpce/renderer/provisiondevice/servicepath/ServiceListTopology.java @@ -53,7 +53,7 @@ public class ServiceListTopology { circuitPackName = port.getCircuitPackName(); //Get port name - portName = port.getPortName().toString(); + portName = port.getPortName(); AToZBuilder a2zBldr = new AToZBuilder(); @@ -113,7 +113,7 @@ public class ServiceListTopology { circuitPackName = port.getCircuitPackName(); //Get port name - portName = port.getPortName().toString(); + portName = port.getPortName(); ZToABuilder z2aBldr = new ZToABuilder(); diff --git a/servicehandler/pom.xml b/servicehandler/pom.xml index c6d67e4fa..f4eec6738 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 - 7.0.9 + 8.0.4 diff --git a/tapi/pom.xml b/tapi/pom.xml index c8b183509..bab36e539 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 - 7.0.9 + 8.0.4 @@ -24,18 +24,6 @@ Author: Martial Coulibaly on behalf of Orange 4.0.0-SNAPSHOT bundle - - - - org.opendaylight.mdsal - mdsal-artifacts - 7.0.9 - import - pom - - - - ${project.groupId} diff --git a/tapi/src/main/java/org/opendaylight/transportpce/tapi/topology/ConvertORTopoToTapiFullTopo.java b/tapi/src/main/java/org/opendaylight/transportpce/tapi/topology/ConvertORTopoToTapiFullTopo.java index ac07c7582..c84089fd1 100644 --- a/tapi/src/main/java/org/opendaylight/transportpce/tapi/topology/ConvertORTopoToTapiFullTopo.java +++ b/tapi/src/main/java/org/opendaylight/transportpce/tapi/topology/ConvertORTopoToTapiFullTopo.java @@ -1092,9 +1092,9 @@ public class ConvertORTopoToTapiFullTopo { .ietf.network.topology.rev180226.networks.network.Link oppositeLink) { String prefix = link.getLinkId().getValue().split("-")[0]; String sourceNode = link.getSource().getSourceNode().getValue(); - String sourceTp = link.getSource().getSourceTp().toString(); + String sourceTp = link.getSource().getSourceTp().getValue(); String destNode = link.getDestination().getDestNode().getValue(); - String destTp = link.getDestination().getDestTp().toString(); + String destTp = link.getDestination().getDestTp().getValue(); LOG.info("prefix = {}, sourceNode = {}, sourceTp = {}, destNode = {}, destTp = {}", prefix, sourceNode, sourceTp, destNode, destTp); Map nepList = new HashMap<>(); @@ -1264,9 +1264,9 @@ public class ConvertORTopoToTapiFullTopo { private Link createTapiOmsLink(org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang .ietf.network.topology.rev180226.networks.network.Link link) { String sourceNode = getIdBasedOnModelVersion(link.getSource().getSourceNode().getValue()); - String sourceTp = link.getSource().getSourceTp().toString(); + String sourceTp = link.getSource().getSourceTp().getValue(); String destNode = getIdBasedOnModelVersion(link.getDestination().getDestNode().getValue()); - String destTp = link.getDestination().getDestTp().toString(); + String destTp = link.getDestination().getDestTp().getValue(); Map nepList = new HashMap<>(); Uuid sourceUuidNode = new Uuid(UUID.nameUUIDFromBytes((String.join("+", sourceNode, PHTNC_MEDIA)).getBytes(Charset.forName("UTF-8"))).toString()); @@ -1358,11 +1358,11 @@ public class ConvertORTopoToTapiFullTopo { String sourceNode = (link.getSource().getSourceNode().getValue().contains("ROADM")) ? getIdBasedOnModelVersion(link.getSource().getSourceNode().getValue()) : link.getSource().getSourceNode().getValue(); - String sourceTp = link.getSource().getSourceTp().toString(); + String sourceTp = link.getSource().getSourceTp().getValue(); String destNode = (link.getDestination().getDestNode().getValue().contains("ROADM")) ? getIdBasedOnModelVersion(link.getDestination().getDestNode().getValue()) : link.getDestination().getDestNode().getValue(); - String destTp = link.getDestination().getDestTp().toString(); + String destTp = link.getDestination().getDestTp().getValue(); Map nepList = new HashMap<>(); Uuid sourceUuidNode = (sourceNode.contains("ROADM")) ? new Uuid(UUID.nameUUIDFromBytes(( String.join("+", sourceNode, PHTNC_MEDIA)).getBytes(Charset.forName("UTF-8"))).toString()) diff --git a/tapi/src/main/java/org/opendaylight/transportpce/tapi/topology/ConvertORTopoToTapiTopo.java b/tapi/src/main/java/org/opendaylight/transportpce/tapi/topology/ConvertORTopoToTapiTopo.java index 6abf9471c..0abf75a6a 100644 --- a/tapi/src/main/java/org/opendaylight/transportpce/tapi/topology/ConvertORTopoToTapiTopo.java +++ b/tapi/src/main/java/org/opendaylight/transportpce/tapi/topology/ConvertORTopoToTapiTopo.java @@ -724,9 +724,9 @@ public class ConvertORTopoToTapiTopo { .ietf.network.topology.rev180226.networks.network.Link oppositeLink) { String prefix = link.getLinkId().getValue().split("-")[0]; String sourceNode = link.getSource().getSourceNode().getValue(); - String sourceTp = link.getSource().getSourceTp().toString(); + String sourceTp = link.getSource().getSourceTp().getValue(); String destNode = link.getDestination().getDestNode().getValue(); - String destTp = link.getDestination().getDestTp().toString(); + String destTp = link.getDestination().getDestTp().getValue(); Map nepList = new HashMap<>(); Uuid sourceUuidTp; Uuid sourceUuidNode; diff --git a/tapi/src/main/java/org/opendaylight/transportpce/tapi/topology/TapiTopologyImpl.java b/tapi/src/main/java/org/opendaylight/transportpce/tapi/topology/TapiTopologyImpl.java index 6688a9a65..aa47df702 100644 --- a/tapi/src/main/java/org/opendaylight/transportpce/tapi/topology/TapiTopologyImpl.java +++ b/tapi/src/main/java/org/opendaylight/transportpce/tapi/topology/TapiTopologyImpl.java @@ -428,9 +428,9 @@ public class TapiTopologyImpl implements TapiTopologyService, TapiCommonService switch (networkPortDirection) { case "bidirectional": count += xpdOut.stream().filter(lk -> lk.getSource().getSourceNode().getValue().equals(nodeIdTopo) - && lk.getSource().getSourceTp().equals(networkLcp)).count(); + && lk.getSource().getSourceTp().getValue().equals(networkLcp)).count(); count += xpdIn.stream().filter(lk -> lk.getDestination().getDestNode().getValue().equals(nodeIdTopo) - && lk.getDestination().getDestTp().equals(networkLcp)).count(); + && lk.getDestination().getDestTp().getValue().equals(networkLcp)).count(); return (count == 2); case "tx": case "rx": @@ -438,15 +438,15 @@ public class TapiTopologyImpl implements TapiTopologyService, TapiCommonService String partnerLcp = mapping.getPartnerLcp(); if (mapping.getPortQual().equals("tx")) { count += xpdOut.stream().filter(lk -> lk.getSource().getSourceNode().getValue().equals(nodeIdTopo) - && lk.getSource().getSourceTp().equals(networkLcp)).count(); + && lk.getSource().getSourceTp().getValue().equals(networkLcp)).count(); count += xpdIn.stream().filter(lk -> lk.getDestination().getDestNode().getValue().equals(nodeIdTopo) - && lk.getDestination().getDestTp().equals(partnerLcp)).count(); + && lk.getDestination().getDestTp().getValue().equals(partnerLcp)).count(); } if (mapping.getPortQual().equals("rx")) { count += xpdIn.stream().filter(lk -> lk.getDestination().getDestNode().getValue().equals(nodeIdTopo) - && lk.getDestination().getDestTp().equals(networkLcp)).count(); + && lk.getDestination().getDestTp().getValue().equals(networkLcp)).count(); count += xpdOut.stream().filter(lk -> lk.getSource().getSourceNode().getValue().equals(nodeIdTopo) - && lk.getSource().getSourceTp().equals(partnerLcp)).count(); + && lk.getSource().getSourceTp().getValue().equals(partnerLcp)).count(); } return (count == 2); default: diff --git a/tapimodels/pom.xml b/tapimodels/pom.xml index 0650e300f..e1c7ee114 100644 --- a/tapimodels/pom.xml +++ b/tapimodels/pom.xml @@ -12,7 +12,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html org.opendaylight.mdsal binding-parent - 7.0.9 + 8.0.4 diff --git a/test-common/pom.xml b/test-common/pom.xml index 8cbb237ca..a7c7bba02 100644 --- a/test-common/pom.xml +++ b/test-common/pom.xml @@ -12,7 +12,7 @@ org.opendaylight.mdsal binding-parent - 7.0.9 + 8.0.4 @@ -25,7 +25,7 @@ org.opendaylight.netconf netconf-artifacts - 1.13.4 + 2.0.3 import pom @@ -57,7 +57,7 @@ org.opendaylight.mdsal - mdsal-binding-generator-impl + mdsal-binding-generator diff --git a/test-common/src/main/java/org/opendaylight/transportpce/test/DeviceWrapper.java b/test-common/src/main/java/org/opendaylight/transportpce/test/DeviceWrapper.java index 3cfd96a59..98b52ea97 100644 --- a/test-common/src/main/java/org/opendaylight/transportpce/test/DeviceWrapper.java +++ b/test-common/src/main/java/org/opendaylight/transportpce/test/DeviceWrapper.java @@ -26,7 +26,6 @@ import org.opendaylight.mdsal.dom.api.DOMDataTreeWriteTransaction; import org.opendaylight.transportpce.test.converter.XMLDataObjectConverter; import org.opendaylight.yangtools.yang.common.QName; import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier; -import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier.PathArgument; import org.opendaylight.yangtools.yang.data.api.schema.NormalizedNode; import org.opendaylight.yangtools.yang.data.api.schema.NormalizedNodes; import org.slf4j.Logger; @@ -125,7 +124,7 @@ public final class DeviceWrapper { private static void insertDataIntoDS(XMLDataObjectConverter xmlConverter, InputStream xmlDataInputStream, QName dataQName, DOMDataBroker domDataBroker) { - Optional> initialDataNormalizedNodes = + Optional initialDataNormalizedNodes = xmlConverter.transformIntoNormalizedNode(xmlDataInputStream); Preconditions.checkArgument(initialDataNormalizedNodes.isPresent(), "Initial data could not be converted to normalized nodes"); @@ -133,7 +132,7 @@ public final class DeviceWrapper { YangInstanceIdentifier initialDataIi = YangInstanceIdentifier.of(dataQName); LOG.debug("Searching for {} inside {}", initialDataIi, initialDataNormalizedNodes.get()); - Optional> dataNormalizedNodes = + Optional dataNormalizedNodes = NormalizedNodes.findNode(initialDataNormalizedNodes.get(), initialDataIi); Preconditions.checkArgument(dataNormalizedNodes.isPresent()); LOG.info("Initial data was successfully stored into ds"); diff --git a/test-common/src/main/java/org/opendaylight/transportpce/test/converter/AbstractDataObjectConverter.java b/test-common/src/main/java/org/opendaylight/transportpce/test/converter/AbstractDataObjectConverter.java index 984c7af7d..83de9e9e8 100644 --- a/test-common/src/main/java/org/opendaylight/transportpce/test/converter/AbstractDataObjectConverter.java +++ b/test-common/src/main/java/org/opendaylight/transportpce/test/converter/AbstractDataObjectConverter.java @@ -75,13 +75,13 @@ public abstract class AbstractDataObjectConverter implements DataObjectConverter @Override @SuppressWarnings("unchecked") public Optional getDataObject( - @Nonnull NormalizedNode normalizedNode, + @Nonnull NormalizedNode normalizedNode, @Nonnull QName rootNode) { //Preconditions.checkNotNull(normalizedNode); if (normalizedNode instanceof ContainerNode) { YangInstanceIdentifier.PathArgument directChildIdentifier = YangInstanceIdentifier.of(rootNode).getLastPathArgument(); - Optional> directChild = + Optional directChild = NormalizedNodes.getDirectChild(normalizedNode, directChildIdentifier); if (!directChild.isPresent()) { throw new IllegalStateException(String.format("Could not get the direct child of %s", rootNode)); @@ -101,7 +101,7 @@ public abstract class AbstractDataObjectConverter implements DataObjectConverter @Override @SuppressWarnings("unchecked") public Optional getDataObjectFromRpc( - @Nonnull NormalizedNode normalizedNode, + @Nonnull NormalizedNode normalizedNode, @Nonnull SchemaPath rpcSchemaPath) { if (! (normalizedNode instanceof ContainerNode)) { @@ -117,9 +117,9 @@ public abstract class AbstractDataObjectConverter implements DataObjectConverter } @Override - public Optional> toNormalizedNodes(@Nonnull T object, + public Optional toNormalizedNodes(@Nonnull T object, Class dataObjectClass) { - Entry> normalizedNode = + Entry normalizedNode = codecRegistry.toNormalizedNode(InstanceIdentifier.create(dataObjectClass), object); return Optional.ofNullable(normalizedNode.getValue()); } @@ -127,7 +127,7 @@ public abstract class AbstractDataObjectConverter implements DataObjectConverter @Override public ConvertType dataContainer() { return (object, objectClass) -> { - NormalizedNode value = + NormalizedNode value = getCodecRegistry().toNormalizedNode(InstanceIdentifier.create(objectClass), object).getValue(); return Optional.ofNullable(value); }; diff --git a/test-common/src/main/java/org/opendaylight/transportpce/test/converter/DataObjectConverter.java b/test-common/src/main/java/org/opendaylight/transportpce/test/converter/DataObjectConverter.java index f724e5d47..e45866ad5 100644 --- a/test-common/src/main/java/org/opendaylight/transportpce/test/converter/DataObjectConverter.java +++ b/test-common/src/main/java/org/opendaylight/transportpce/test/converter/DataObjectConverter.java @@ -16,7 +16,6 @@ import org.opendaylight.yangtools.yang.binding.DataContainer; import org.opendaylight.yangtools.yang.binding.DataObject; import org.opendaylight.yangtools.yang.binding.Notification; import org.opendaylight.yangtools.yang.common.QName; -import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier; import org.opendaylight.yangtools.yang.data.api.schema.NormalizedNode; import org.opendaylight.yangtools.yang.model.api.SchemaNode; import org.opendaylight.yangtools.yang.model.api.SchemaPath; @@ -24,20 +23,20 @@ import org.opendaylight.yangtools.yang.model.api.SchemaPath; public interface DataObjectConverter { Optional getDataObject( - @Nonnull NormalizedNode normalizedNode, + @Nonnull NormalizedNode normalizedNode, @Nonnull QName rootNode); Optional getDataObjectFromRpc( - @Nonnull NormalizedNode normalizedNode, + @Nonnull NormalizedNode normalizedNode, @Nonnull SchemaPath rpcSchemaPath); - Optional> transformIntoNormalizedNode( + Optional transformIntoNormalizedNode( @Nonnull InputStream inputStream); - Optional> transformIntoNormalizedNode( + Optional transformIntoNormalizedNode( @Nonnull Reader inputReader, SchemaNode parentSchema); - Optional> transformIntoNormalizedNode( + Optional transformIntoNormalizedNode( @Nonnull Reader inputReader); Writer writerFromDataObject(@Nonnull DataObject object, Class dataObjectClass, @@ -46,11 +45,11 @@ public interface DataObjectConverter { Writer writerFromRpcDataObject(@Nonnull DataObject object, Class dataObjectClass, ConvertType convertType, QName rpcOutputQName, String rpcName); - Optional> toNormalizedNodes(@Nonnull T object, + Optional toNormalizedNodes(@Nonnull T object, Class dataObjectClass); public interface ConvertType { - Optional> toNormalizedNodes(T object, Class clazz); + Optional toNormalizedNodes(T object, Class clazz); } /** diff --git a/test-common/src/main/java/org/opendaylight/transportpce/test/converter/JSONDataObjectConverter.java b/test-common/src/main/java/org/opendaylight/transportpce/test/converter/JSONDataObjectConverter.java index 7693c8ff9..1e33514fa 100644 --- a/test-common/src/main/java/org/opendaylight/transportpce/test/converter/JSONDataObjectConverter.java +++ b/test-common/src/main/java/org/opendaylight/transportpce/test/converter/JSONDataObjectConverter.java @@ -22,7 +22,6 @@ import org.opendaylight.mdsal.binding.dom.codec.api.BindingNormalizedNodeSeriali import org.opendaylight.transportpce.test.DataStoreContext; import org.opendaylight.yangtools.yang.binding.DataObject; import org.opendaylight.yangtools.yang.common.QName; -import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier; import org.opendaylight.yangtools.yang.data.api.schema.NormalizedNode; import org.opendaylight.yangtools.yang.data.api.schema.stream.NormalizedNodeStreamWriter; import org.opendaylight.yangtools.yang.data.api.schema.stream.NormalizedNodeWriter; @@ -34,6 +33,7 @@ import org.opendaylight.yangtools.yang.data.impl.schema.ImmutableNormalizedNodeS import org.opendaylight.yangtools.yang.data.impl.schema.NormalizedNodeResult; import org.opendaylight.yangtools.yang.model.api.EffectiveModelContext; import org.opendaylight.yangtools.yang.model.api.SchemaNode; +import org.opendaylight.yangtools.yang.model.api.SchemaPath; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -76,20 +76,20 @@ public final class JSONDataObjectConverter extends AbstractDataObjectConverter { * @return {@link Optional} instance of {@link NormalizedNode}. */ @Override - public Optional> transformIntoNormalizedNode( + public Optional transformIntoNormalizedNode( @Nonnull InputStream inputStream) { JsonReader reader = new JsonReader(new InputStreamReader(inputStream, StandardCharsets.UTF_8)); return parseInputJSON(reader); } @Override - public Optional> transformIntoNormalizedNode( + public Optional transformIntoNormalizedNode( @Nonnull Reader inputReader, SchemaNode parentSchema) { throw new UnsupportedOperationException("Not Implemented yet"); } @Override - public Optional> transformIntoNormalizedNode( + public Optional transformIntoNormalizedNode( @Nonnull Reader inputReader) { JsonReader reader = new JsonReader(inputReader); return parseInputJSON(reader); @@ -104,7 +104,7 @@ public final class JSONDataObjectConverter extends AbstractDataObjectConverter { JSONCodecFactorySupplier.DRAFT_LHOTKA_NETMOD_YANG_JSON_02.createLazy(getSchemaContext()); NormalizedNodeStreamWriter create = JSONNormalizedNodeStreamWriter.createExclusiveWriter(jsonCodecFactory, - (org.opendaylight.yangtools.yang.model.api.DataNodeContainer)null, null, jsonWriter); + (SchemaPath)null, null, jsonWriter); try (NormalizedNodeWriter normalizedNodeWriter = NormalizedNodeWriter.forStreamWriter(create);) { normalizedNodeWriter @@ -127,13 +127,12 @@ public final class JSONDataObjectConverter extends AbstractDataObjectConverter { * @param reader of the given JSON * */ - private Optional> parseInputJSON( + private Optional parseInputJSON( JsonReader reader) { NormalizedNodeResult result = new NormalizedNodeResult(); try (NormalizedNodeStreamWriter streamWriter = ImmutableNormalizedNodeStreamWriter.from(result); JsonParserStream jsonParser = JsonParserStream.create(streamWriter, - JSONCodecFactorySupplier.RFC7951.getShared(getSchemaContext()), - getSchemaContext())) { + JSONCodecFactorySupplier.RFC7951.getShared(getSchemaContext()))) { jsonParser.parse(reader); } catch (IOException e) { LOG.warn("An error occured during parsing Json input stream", e); diff --git a/test-common/src/main/java/org/opendaylight/transportpce/test/converter/XMLDataObjectConverter.java b/test-common/src/main/java/org/opendaylight/transportpce/test/converter/XMLDataObjectConverter.java index fefafd181..7583e21ba 100644 --- a/test-common/src/main/java/org/opendaylight/transportpce/test/converter/XMLDataObjectConverter.java +++ b/test-common/src/main/java/org/opendaylight/transportpce/test/converter/XMLDataObjectConverter.java @@ -26,19 +26,19 @@ import org.opendaylight.mdsal.binding.dom.codec.api.BindingNormalizedNodeSeriali import org.opendaylight.transportpce.test.DataStoreContext; import org.opendaylight.yangtools.yang.binding.DataObject; import org.opendaylight.yangtools.yang.common.QName; -import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier; import org.opendaylight.yangtools.yang.data.api.schema.ContainerNode; import org.opendaylight.yangtools.yang.data.api.schema.NormalizedNode; import org.opendaylight.yangtools.yang.data.api.schema.stream.NormalizedNodeStreamWriter; import org.opendaylight.yangtools.yang.data.api.schema.stream.NormalizedNodeWriter; import org.opendaylight.yangtools.yang.data.codec.xml.XMLStreamNormalizedNodeStreamWriter; -import org.opendaylight.yangtools.yang.data.codec.xml.XmlCodecFactory; import org.opendaylight.yangtools.yang.data.codec.xml.XmlParserStream; import org.opendaylight.yangtools.yang.data.impl.schema.ImmutableNormalizedNodeStreamWriter; import org.opendaylight.yangtools.yang.data.impl.schema.NormalizedNodeResult; import org.opendaylight.yangtools.yang.model.api.EffectiveModelContext; +import org.opendaylight.yangtools.yang.model.api.EffectiveStatementInference; import org.opendaylight.yangtools.yang.model.api.SchemaNode; import org.opendaylight.yangtools.yang.model.api.SchemaPath; +import org.opendaylight.yangtools.yang.model.util.SchemaInferenceStack; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.xml.sax.SAXException; @@ -95,7 +95,7 @@ public final class XMLDataObjectConverter extends AbstractDataObjectConverter { * @return {@link Optional} instance of {@link NormalizedNode}. */ @Override - public Optional> transformIntoNormalizedNode( + public Optional transformIntoNormalizedNode( @Nonnull InputStream inputStream) { try { XMLStreamReader reader = this.xmlInputFactory.createXMLStreamReader(inputStream); @@ -106,7 +106,7 @@ public final class XMLDataObjectConverter extends AbstractDataObjectConverter { } } - public Optional> transformIntoNormalizedNode( + public Optional transformIntoNormalizedNode( @Nonnull Reader inputReader, SchemaNode parentSchema) { try { XMLStreamReader reader = this.xmlInputFactory.createXMLStreamReader(inputReader); @@ -124,7 +124,7 @@ public final class XMLDataObjectConverter extends AbstractDataObjectConverter { * @return {@link Optional} instance of {@link NormalizedNode}. */ @Override - public Optional> transformIntoNormalizedNode( + public Optional transformIntoNormalizedNode( @Nonnull Reader inputReader) { try { XMLStreamReader reader = this.xmlInputFactory.createXMLStreamReader(inputReader); @@ -147,9 +147,9 @@ public final class XMLDataObjectConverter extends AbstractDataObjectConverter { xmlStreamWriter.writeStartElement(XMLConstants.DEFAULT_NS_PREFIX, rpcOutputQName.getLocalName(), rpcOutputQName.getNamespace().toString()); xmlStreamWriter.writeDefaultNamespace(rpcOutputQName.getNamespace().toString()); - NormalizedNode rpcOutputNormalizedNode = convertType.toNormalizedNodes(dataObjectClass.cast(object), + NormalizedNode rpcOutputNormalizedNode = convertType.toNormalizedNodes(dataObjectClass.cast(object), dataObjectClass).get(); - for (final NormalizedNode child : ((ContainerNode)rpcOutputNormalizedNode).getValue()) { + for (final NormalizedNode child : ((ContainerNode)rpcOutputNormalizedNode).body()) { normalizedNodeWriter.write(child); } normalizedNodeWriter.flush(); @@ -184,17 +184,20 @@ public final class XMLDataObjectConverter extends AbstractDataObjectConverter { return writer; } - private Optional> parseInputXML( + private Optional parseInputXML( XMLStreamReader reader) { return parseInputXML(reader, getSchemaContext()); } - private Optional> parseInputXML( - XMLStreamReader reader, SchemaNode parentSchemaNode) { + private Optional parseInputXML(XMLStreamReader reader, SchemaNode parentSchemaNode) { NormalizedNodeResult result = new NormalizedNodeResult(); + EffectiveStatementInference schema = SchemaInferenceStack.ofSchemaPath(getSchemaContext(), + parentSchemaNode.getPath()).toInference(); try (NormalizedNodeStreamWriter streamWriter = ImmutableNormalizedNodeStreamWriter.from(result); - XmlParserStream xmlParser = XmlParserStream - .create(streamWriter, XmlCodecFactory.create(getSchemaContext()), parentSchemaNode)) { + XmlParserStream xmlParser = XmlParserStream + .create(streamWriter, schema)) { +// XmlParserStream xmlParser = XmlParserStream +// .create(streamWriter, XmlCodecFactory.create(getSchemaContext()), parentSchemaNode)) { xmlParser.parse(reader); } catch (XMLStreamException | URISyntaxException | IOException | SAXException e) { LOG.warn("An error occured during parsing XML input stream", e); diff --git a/test-common/src/main/java/org/opendaylight/transportpce/test/utils/TopologyDataUtils.java b/test-common/src/main/java/org/opendaylight/transportpce/test/utils/TopologyDataUtils.java index 10045ec79..c3576ee57 100644 --- a/test-common/src/main/java/org/opendaylight/transportpce/test/utils/TopologyDataUtils.java +++ b/test-common/src/main/java/org/opendaylight/transportpce/test/utils/TopologyDataUtils.java @@ -39,7 +39,7 @@ public final class TopologyDataUtils { if (topoFile.exists()) { String fileName = topoFile.getName(); try (InputStream targetStream = new FileInputStream(topoFile)) { - Optional> transformIntoNormalizedNode = XMLDataObjectConverter + Optional transformIntoNormalizedNode = XMLDataObjectConverter .createWithDataStoreUtil(dataStoreContextUtil).transformIntoNormalizedNode(targetStream); if (!transformIntoNormalizedNode.isPresent()) { throw new IllegalStateException(String.format( @@ -82,7 +82,7 @@ public final class TopologyDataUtils { if (portmappingFile.exists()) { String fileName = portmappingFile.getName(); try (InputStream targetStream = new FileInputStream(portmappingFile)) { - Optional> transformIntoNormalizedNode = null; + Optional transformIntoNormalizedNode = null; transformIntoNormalizedNode = XMLDataObjectConverter.createWithDataStoreUtil(dataStoreContextUtil) .transformIntoNormalizedNode(targetStream); if (!transformIntoNormalizedNode.isPresent()) { diff --git a/tests/transportpce_tests/7.1/test01_portmapping.py b/tests/transportpce_tests/7.1/test01_portmapping.py index 00b6414db..22d121dae 100644 --- a/tests/transportpce_tests/7.1/test01_portmapping.py +++ b/tests/transportpce_tests/7.1/test01_portmapping.py @@ -130,23 +130,22 @@ class TransportPCE400GPortMappingTesting(unittest.TestCase): response = test_utils.portmapping_request("XPDR-A2/mapping/XPDR2-CLIENT1") self.assertEqual(response.status_code, requests.codes.ok) res = response.json() - self.assertIn( - {'supported-interface-capability': - ['org-openroadm-port-types:if-100GE-ODU4', - 'org-openroadm-port-types:if-OCH-OTU4-ODU4'], - 'supporting-port': 'C1', - 'supporting-circuit-pack-name': '1/2/1/1-PLUG-CLIENT', - 'logical-connection-point': 'XPDR2-CLIENT1', - 'port-direction': 'bidirectional', - 'port-qual': 'switch-client', - 'lcp-hash-val': 'AK+Cna4EclRH', - 'port-admin-state': 'InService', - 'port-oper-state': 'InService', - "mpdr-restrictions": { + self.assertIn('org-openroadm-port-types:if-100GE-ODU4', + res['mapping'][0]['supported-interface-capability']) + self.assertIn('org-openroadm-port-types:if-OCH-OTU4-ODU4', + res['mapping'][0]['supported-interface-capability']) + self.assertEqual('C1', res['mapping'][0]['supporting-port']) + self.assertEqual('1/2/1/1-PLUG-CLIENT', res['mapping'][0]['supporting-circuit-pack-name']) + self.assertEqual('XPDR2-CLIENT1', res['mapping'][0]['logical-connection-point']) + self.assertEqual('bidirectional', res['mapping'][0]['port-direction']) + self.assertEqual('switch-client', res['mapping'][0]['port-qual']) + self.assertEqual('AK+Cna4EclRH', res['mapping'][0]['lcp-hash-val']) + self.assertEqual('InService', res['mapping'][0]['port-admin-state']) + self.assertEqual('InService', res['mapping'][0]['port-oper-state']) + self.assertEqual({ "min-trib-slot": "1.1", "max-trib-slot": "1.20" - }}, - res['mapping']) + }, res['mapping'][0]['mpdr-restrictions']) # Added test to check mc-capability-profile for a transponder def test_08_check_mccapprofile(self): diff --git a/tox.ini b/tox.ini index 82315a4a6..e17c02dfc 100644 --- a/tox.ini +++ b/tox.ini @@ -11,8 +11,8 @@ setupdir = tests/ [testenv] passenv = USE_LIGHTY http_proxy HTTP_PROXY https_proxy HTTPS_PROXY no_proxy NO_PROXY -setenv = - USE_LIGHTY=True +#setenv = +# USE_LIGHTY=True usedevelop = true basepython = python3 deps = @@ -51,8 +51,8 @@ commands = depends = buildcontroller whitelist_externals = launch_tests.sh passenv = LAUNCHER USE_LIGHTY -setenv = - USE_LIGHTY=True +#setenv = +# USE_LIGHTY=True commands = ./launch_tests.sh pce {posargs:} @@ -62,7 +62,7 @@ depends = buildcontroller,sims121,testsPCE whitelist_externals = launch_tests.sh passenv = LAUNCHER USE_LIGHTY setenv = - USE_LIGHTY=True +# USE_LIGHTY=True USE_ODL_ALT_WEBSOCKET_PORT=8186 USE_ODL_ALT_AKKA_PORT=2551 USE_ODL_ALT_AKKA_MGT_PORT=8559 @@ -88,7 +88,7 @@ depends = buildcontroller,sims221,tests71 whitelist_externals = launch_tests.sh passenv = LAUNCHER USE_LIGHTY setenv = - USE_LIGHTY=True +# USE_LIGHTY=True USE_ODL_ALT_WEBSOCKET_PORT=8187 USE_ODL_ALT_AKKA_PORT=2552 USE_ODL_ALT_AKKA_MGT_PORT=8560 @@ -105,7 +105,7 @@ depends = buildcontroller,sims71 whitelist_externals = launch_tests.sh passenv = LAUNCHER USE_LIGHTY setenv = - USE_LIGHTY=True +# USE_LIGHTY=True USE_ODL_ALT_WEBSOCKET_PORT=8188 USE_ODL_ALT_AKKA_PORT=2553 USE_ODL_ALT_AKKA_MGT_PORT=8561 @@ -123,7 +123,7 @@ depends = buildcontroller,sims121,sims221,sims71,tests121,tests221,tests71 whitelist_externals = launch_tests.sh passenv = LAUNCHER USE_LIGHTY setenv = - USE_LIGHTY=True +# USE_LIGHTY=True USE_ODL_ALT_WEBSOCKET_PORT=8186 USE_ODL_ALT_AKKA_PORT=2551 USE_ODL_ALT_AKKA_MGT_PORT=8559 -- 2.36.6