From c6d45b1b0f3e823bf60a159250467625cbceb038 Mon Sep 17 00:00:00 2001 From: "guillaume.lambert" Date: Tue, 28 Jan 2020 15:13:58 +0100 Subject: [PATCH] Bump to Magnesium dependencies https://docs.opendaylight.org/projects/integration-distribution/en/latest/platform-versions.html - upgrade pom to use ODL Magnesium target dev dependecies https://wiki.opendaylight.org/view/Magnesium_platform_upgrade - force jsr305 version - disable SpotBugs enforcement in artifacts when needed - UintXX yangtools migration https://git.opendaylight.org/gerrit/c/mdsal/+/83960 - migrate class BindingStreamEventWriter from org.opendaylight.yangtools.yang.binding package to org.opendaylight.mdsal.binding.dom.codec.api - unforce maven-bundle-plugin version in api/pom.xml and ordmodels/device/pom.xml build sections - unfoce iana-afn-safi version in ordmodels/device/pom.xml dependencies TODO: for next changes to come in the release: - migrate Junit to yangtools UintXX - propose fixes to reactivate SpotBugs enforcement and get rid of "deprecated marked for removal" JIRA: TRNSPRTPCE-198 Signed-off-by: guillaume.lambert Change-Id: I20dfe87985a1273e3f0864e6a4d26880fc80d197 --- api/pom.xml | 4 +- common/pom.xml | 14 +++++-- .../common/DataStoreContextImpl.java | 4 +- .../common/mapping/PortMappingVersion121.java | 8 ++-- .../common/mapping/PortMappingVersion221.java | 10 ++--- features/odl-transportpce-api/pom.xml | 4 +- features/odl-transportpce-inventory/pom.xml | 2 +- features/odl-transportpce-ordmodels/pom.xml | 2 +- features/odl-transportpce/pom.xml | 8 ++-- features/pom.xml | 2 +- inventory/pom.xml | 9 +++- .../transportpce/inventory/INode121.java | 2 +- .../transportpce/inventory/INode221.java | 2 +- karaf/pom.xml | 2 +- networkmodel/pom.xml | 10 ++++- olm/pom.xml | 10 ++++- .../transportpce/olm/power/PowerMgmtImpl.java | 2 +- .../olm/OlmPowerServiceRpcImplTest.java | 4 +- ordmodels/common/pom.xml | 2 +- ordmodels/device/pom.xml | 9 ++-- ordmodels/network/pom.xml | 2 +- ordmodels/pom.xml | 2 +- ordmodels/service/pom.xml | 2 +- pce/pom.xml | 10 ++++- .../pce/constraints/PceConstraintsCalc.java | 2 +- .../pce/gnpy/GnpyServiceImpl.java | 30 ++++++++------ .../transportpce/pce/gnpy/GnpyTopoImpl.java | 2 +- .../pce/gnpy/GnpyUtilitiesImpl.java | 7 ++-- .../pce/graph/PostAlgoPathValidator.java | 41 ++++++++++--------- .../pce/networkanalyzer/MapUtils.java | 8 ++-- .../pce/networkanalyzer/PceCalculation.java | 4 +- .../pce/networkanalyzer/PceLink.java | 4 +- .../pce/networkanalyzer/PceNode.java | 6 +-- .../pce/networkanalyzer/PceOpticalNode.java | 9 ++-- .../pce/networkanalyzer/PceOtnNode.java | 15 +++---- .../pce/networkanalyzer/PceResult.java | 13 +++--- .../transportpce/pce/utils/PceTestUtils.java | 16 ++++---- pom.xml | 3 +- renderer/pom.xml | 10 ++++- .../renderer/ModelMappingUtils.java | 4 +- .../NetworkModelWavelengthServiceImpl.java | 16 ++++---- .../OpenRoadmOtnInterface221.java | 15 +++---- .../DeviceRendererServiceImpl.java | 4 +- .../otn/OtnDeviceOperationsImpl.java | 4 +- servicehandler/pom.xml | 9 +++- .../checks/ServicehandlerTxRxCheck.java | 2 +- tapi/pom.xml | 11 ++++- tapimodels/pom.xml | 2 +- test-common/pom.xml | 10 ++++- 49 files changed, 227 insertions(+), 146 deletions(-) diff --git a/api/pom.xml b/api/pom.xml index 429aa7558..c9564099b 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 - 4.0.11 + 5.0.9 @@ -49,7 +49,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html org.apache.felix maven-bundle-plugin - 3.0.1 + true diff --git a/common/pom.xml b/common/pom.xml index bd2e85d9f..5ebcac833 100644 --- a/common/pom.xml +++ b/common/pom.xml @@ -10,7 +10,7 @@ org.opendaylight.mdsal binding-parent - 4.0.11 + 5.0.9 @@ -24,14 +24,14 @@ org.opendaylight.netconf netconf-artifacts - 1.7.2-SNAPSHOT + 1.8.0-SNAPSHOT import pom org.opendaylight.mdsal mdsal-artifacts - 4.0.11 + 5.0.9 import pom @@ -62,6 +62,7 @@ com.google.code.findbugs jsr305 + 3.0.2 true @@ -79,4 +80,11 @@ + + + + + false + + diff --git a/common/src/main/java/org/opendaylight/transportpce/common/DataStoreContextImpl.java b/common/src/main/java/org/opendaylight/transportpce/common/DataStoreContextImpl.java index 6335ed85b..aed65339b 100644 --- a/common/src/main/java/org/opendaylight/transportpce/common/DataStoreContextImpl.java +++ b/common/src/main/java/org/opendaylight/transportpce/common/DataStoreContextImpl.java @@ -182,8 +182,8 @@ public class DataStoreContextImpl implements DataStoreContext { */ private SchemaContext getSchemaContext(List moduleInfos) { this.moduleInfoBackedCntxt.addModuleInfos(moduleInfos); - Optional tryToCreateSchemaContext = - this.moduleInfoBackedCntxt.tryToCreateSchemaContext(); + Optional tryToCreateSchemaContext = + this.moduleInfoBackedCntxt.tryToCreateSchemaContext(); if (!tryToCreateSchemaContext.isPresent()) { LOG.error("Could not create the initial schema context. Schema context is empty"); throw new IllegalStateException(); 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 00033933e..e4fc4a093 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 @@ -321,7 +321,7 @@ public class PortMappingVersion121 { // Get value for max Srg from info subtree, required for iteration // if not present assume to be 20 (temporary) if (ordmInfo.getMaxSrgs() != null) { - maxSrg = ordmInfo.getMaxSrgs(); + maxSrg = ordmInfo.getMaxSrgs().toJava(); } else { maxSrg = 20; } @@ -336,7 +336,7 @@ public class PortMappingVersion121 { Timeouts.DEVICE_READ_TIMEOUT, Timeouts.DEVICE_READ_TIMEOUT_UNIT); if (ordmSrgObject.isPresent()) { srgCps.addAll(ordmSrgObject.get().getCircuitPacks()); - cpPerSrg.put(ordmSrgObject.get().getSrgNumber(), srgCps); + cpPerSrg.put(ordmSrgObject.get().getSrgNumber().toJava(), srgCps); } } LOG.info("Device {} has {} Srg", deviceId, cpPerSrg.size()); @@ -468,7 +468,7 @@ public class PortMappingVersion121 { // Get value for max degree from info subtree, required for iteration // if not present assume to be 20 (temporary) if (ordmInfo.getMaxDegrees() != null) { - maxDegree = ordmInfo.getMaxDegrees(); + maxDegree = ordmInfo.getMaxDegrees().toJava(); } else { maxDegree = 20; } @@ -493,7 +493,7 @@ public class PortMappingVersion121 { Integer maxDegree; if (ordmInfo.getMaxDegrees() != null) { - maxDegree = ordmInfo.getMaxDegrees(); + maxDegree = ordmInfo.getMaxDegrees().toJava(); } else { maxDegree = 20; } 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 dd0cd8204..7f0604952 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 @@ -295,7 +295,7 @@ public class PortMappingVersion221 { for (Xponder xponder:deviceObject.get().getXponder()) { line = 1; client = 1; - Integer xponderNb = xponder.getXpdrNumber(); + Integer xponderNb = xponder.getXpdrNumber().toJava(); XpdrNodeTypes xponderType = xponder.getXpdrType(); for (XpdrPort xpdrPort : xponder.getXpdrPort()) { String circuitPackName = xpdrPort.getCircuitPackName(); @@ -474,7 +474,7 @@ public class PortMappingVersion221 { // Get value for max Srg from info subtree, required for iteration // if not present assume to be 20 (temporary) if (ordmInfo.getMaxSrgs() != null) { - maxSrg = ordmInfo.getMaxSrgs(); + maxSrg = ordmInfo.getMaxSrgs().toJava(); } else { maxSrg = 20; } @@ -489,7 +489,7 @@ public class PortMappingVersion221 { Timeouts.DEVICE_READ_TIMEOUT, Timeouts.DEVICE_READ_TIMEOUT_UNIT); if (ordmSrgObject.isPresent()) { srgCps.addAll(ordmSrgObject.get().getCircuitPacks()); - cpPerSrg.put(ordmSrgObject.get().getSrgNumber(), srgCps); + cpPerSrg.put(ordmSrgObject.get().getSrgNumber().toJava(), srgCps); } } LOG.info("Device {} has {} Srg", deviceId, cpPerSrg.size()); @@ -610,7 +610,7 @@ public class PortMappingVersion221 { // Get value for max degree from info subtree, required for iteration // if not present assume to be 20 (temporary) if (ordmInfo.getMaxDegrees() != null) { - maxDegree = ordmInfo.getMaxDegrees(); + maxDegree = ordmInfo.getMaxDegrees().toJava(); } else { maxDegree = 20; } @@ -635,7 +635,7 @@ public class PortMappingVersion221 { Integer maxDegree; if (ordmInfo.getMaxDegrees() != null) { - maxDegree = ordmInfo.getMaxDegrees(); + maxDegree = ordmInfo.getMaxDegrees().toJava(); } else { maxDegree = 20; } diff --git a/features/odl-transportpce-api/pom.xml b/features/odl-transportpce-api/pom.xml index 9697a9245..3ec2c6c65 100644 --- a/features/odl-transportpce-api/pom.xml +++ b/features/odl-transportpce-api/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 - 5.0.5 + 6.0.4 @@ -24,7 +24,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html INTERNAL OpenDaylight :: transportpce :: api - 1.7.2-SNAPSHOT + 1.8.0-SNAPSHOT etc/opendaylight/karaf diff --git a/features/odl-transportpce-inventory/pom.xml b/features/odl-transportpce-inventory/pom.xml index 3d5d8ddbc..bd5b8f17f 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 - 5.0.5 + 6.0.4 diff --git a/features/odl-transportpce-ordmodels/pom.xml b/features/odl-transportpce-ordmodels/pom.xml index 1cc5fdeaf..4f8e71a07 100644 --- a/features/odl-transportpce-ordmodels/pom.xml +++ b/features/odl-transportpce-ordmodels/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 - 5.0.5 + 6.0.4 diff --git a/features/odl-transportpce/pom.xml b/features/odl-transportpce/pom.xml index fae81d911..b4be4e8cd 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 - 5.0.5 + 6.0.4 @@ -24,9 +24,9 @@ and is available at http://www.eclipse.org/legal/epl-v10.html INTERNAL OpenDaylight :: transportpce - 1.10.2-SNAPSHOT - 1.7.2-SNAPSHOT - 1.10.2-SNAPSHOT + 1.11.0-SNAPSHOT + 1.8.0-SNAPSHOT + 1.11.0-SNAPSHOT etc/opendaylight/karaf diff --git a/features/pom.xml b/features/pom.xml index b6d4f45d5..8f802e3a5 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 - 5.0.5 + 6.0.4 diff --git a/inventory/pom.xml b/inventory/pom.xml index a1a179ee9..72c58dcf5 100644 --- a/inventory/pom.xml +++ b/inventory/pom.xml @@ -10,7 +10,7 @@ org.opendaylight.mdsal binding-parent - 4.0.11 + 5.0.9 @@ -26,4 +26,11 @@ ${project.version} + + + + + false + + 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 1ed0e1115..c4bc59011 100644 --- a/inventory/src/main/java/org/opendaylight/transportpce/inventory/INode121.java +++ b/inventory/src/main/java/org/opendaylight/transportpce/inventory/INode121.java @@ -341,7 +341,7 @@ public class INode121 { String startTimetampStr = getCurrentTimestamp(); String nodeId = prepareDashString(deviceInfo.getNodeId()); - Long nodeNumber = deviceInfo.getNodeNumber(); + Long nodeNumber = deviceInfo.getNodeNumber().toJava(); String nodeTypeEnu = deviceInfo.getNodeType().getName(); String clli = prepareDashString(deviceInfo.getClli()); String vendor = prepareDashString(deviceInfo.getVendor()); 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 4c5ed86e5..a4c33830a 100644 --- a/inventory/src/main/java/org/opendaylight/transportpce/inventory/INode221.java +++ b/inventory/src/main/java/org/opendaylight/transportpce/inventory/INode221.java @@ -342,7 +342,7 @@ public class INode221 { //String serialId = ""; String nodeId = prepareDashString(deviceInfo.getNodeId()); - Long nodeNumber = deviceInfo.getNodeNumber(); + Long nodeNumber = deviceInfo.getNodeNumber().toJava(); Integer nodeTypeEnu = deviceInfo.getNodeType().getIntValue(); String clli = prepareDashString(deviceInfo.getClli()); String vendor = prepareDashString(deviceInfo.getVendor()); diff --git a/karaf/pom.xml b/karaf/pom.xml index 2805cd15c..aedf6d325 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 - 5.0.5 + 6.0.4 diff --git a/networkmodel/pom.xml b/networkmodel/pom.xml index f2a19dbad..bc8c2972d 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 - 5.0.5 + 6.0.4 @@ -33,7 +33,15 @@ and is available at http://www.eclipse.org/legal/epl-v10.html com.google.code.findbugs jsr305 + 3.0.2 true + + + + + false + + diff --git a/olm/pom.xml b/olm/pom.xml index 9fe5218f0..806c0da88 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 - 4.0.11 + 5.0.9 @@ -59,7 +59,15 @@ and is available at http://www.eclipse.org/legal/epl-v10.html com.google.code.findbugs jsr305 + 3.0.2 true + + + + + false + + diff --git a/olm/src/main/java/org/opendaylight/transportpce/olm/power/PowerMgmtImpl.java b/olm/src/main/java/org/opendaylight/transportpce/olm/power/PowerMgmtImpl.java index e8fc629d9..094bf32c4 100644 --- a/olm/src/main/java/org/opendaylight/transportpce/olm/power/PowerMgmtImpl.java +++ b/olm/src/main/java/org/opendaylight/transportpce/olm/power/PowerMgmtImpl.java @@ -320,7 +320,7 @@ public class PowerMgmtImpl implements PowerMgmt { String nodeId = input.getNodes().get(i).getNodeId(); String srcTpId = input.getNodes().get(i).getSrcTp(); String destTpId = input.getNodes().get(i).getDestTp(); - Long wlNumber = input.getWaveNumber(); + Long wlNumber = input.getWaveNumber().toJava(); String connectionNumber = srcTpId + "-" + destTpId + "-" + wlNumber; if (destTpId.toLowerCase().contains("srg")) { crossConnect.setPowerLevel(nodeId, OpticalControlMode.Off, null, connectionNumber); diff --git a/olm/src/test/java/org/opendaylight/transportpce/olm/OlmPowerServiceRpcImplTest.java b/olm/src/test/java/org/opendaylight/transportpce/olm/OlmPowerServiceRpcImplTest.java index 800fbe193..719a477dc 100644 --- a/olm/src/test/java/org/opendaylight/transportpce/olm/OlmPowerServiceRpcImplTest.java +++ b/olm/src/test/java/org/opendaylight/transportpce/olm/OlmPowerServiceRpcImplTest.java @@ -9,7 +9,6 @@ package org.opendaylight.transportpce.olm; import com.google.common.util.concurrent.ListenableFuture; -import java.math.BigInteger; import java.util.ArrayList; import java.util.List; import java.util.Optional; @@ -72,6 +71,7 @@ import org.opendaylight.yang.gen.v1.http.org.openroadm.resource.rev161014.resour import org.opendaylight.yang.gen.v1.http.org.openroadm.resource.types.rev161014.ResourceTypeEnum; import org.opendaylight.yangtools.yang.common.RpcResult; import org.opendaylight.yangtools.yang.common.RpcResultBuilder; +import org.opendaylight.yangtools.yang.common.Uint64; public class OlmPowerServiceRpcImplTest extends AbstractTest { @@ -146,7 +146,7 @@ public class OlmPowerServiceRpcImplTest extends AbstractTest { .setPmParameterName(new PmParameterNameBuilder() .setExtension("123") .setType(PmNamesEnum.DefectSeconds).build()) - .setPmParameterValue(new PmDataType(BigInteger.valueOf(1234))).build()) + .setPmParameterValue(new PmDataType(Uint64.valueOf(1234))).build()) .build(); List measurementsList = new ArrayList(); measurementsList.add(measurements); diff --git a/ordmodels/common/pom.xml b/ordmodels/common/pom.xml index 6470edf53..286cafe17 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 - 4.0.11 + 5.0.9 diff --git a/ordmodels/device/pom.xml b/ordmodels/device/pom.xml index b1c612d4a..1173b131a 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 - 4.0.11 + 5.0.9 @@ -26,7 +26,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html org.opendaylight.netconf netconf-artifacts - 1.7.2-SNAPSHOT + 1.8.0-SNAPSHOT import pom @@ -49,7 +49,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html org.opendaylight.mdsal.model iana-afn-safi - 2013.07.04.16.3 + org.opendaylight.mdsal.binding.model.ietf @@ -66,7 +66,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html org.apache.felix maven-bundle-plugin - 3.0.1 + true @@ -89,4 +89,5 @@ and is available at http://www.eclipse.org/legal/epl-v10.html + diff --git a/ordmodels/network/pom.xml b/ordmodels/network/pom.xml index 510210f87..a5a069177 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 - 4.0.11 + 5.0.9 diff --git a/ordmodels/pom.xml b/ordmodels/pom.xml index e6ee66499..c9270358c 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 - 4.0.11 + 5.0.9 diff --git a/ordmodels/service/pom.xml b/ordmodels/service/pom.xml index c3002c4fe..6720ab880 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 - 4.0.11 + 5.0.9 diff --git a/pce/pom.xml b/pce/pom.xml index 6fc5d0ddc..4a7b2f578 100644 --- a/pce/pom.xml +++ b/pce/pom.xml @@ -17,7 +17,7 @@ Author: Martial Coulibaly on behalf of Orange org.opendaylight.mdsal binding-parent - 4.0.11 + 5.0.9 @@ -42,6 +42,7 @@ Author: Martial Coulibaly on behalf of Orange com.google.code.findbugs jsr305 + 3.0.2 true @@ -70,4 +71,11 @@ Author: Martial Coulibaly on behalf of Orange + + + + + false + + diff --git a/pce/src/main/java/org/opendaylight/transportpce/pce/constraints/PceConstraintsCalc.java b/pce/src/main/java/org/opendaylight/transportpce/pce/constraints/PceConstraintsCalc.java index f8c2ecb6a..e79aa84ca 100644 --- a/pce/src/main/java/org/opendaylight/transportpce/pce/constraints/PceConstraintsCalc.java +++ b/pce/src/main/java/org/opendaylight/transportpce/pce/constraints/PceConstraintsCalc.java @@ -130,7 +130,7 @@ public class PceConstraintsCalc { Latency latency = tmpGeneral.getLatency(); if (latency != null) { - constraints.setMaxLatency(latency.getMaxLatency()); + constraints.setMaxLatency(latency.getMaxLatency().toJava()); LOG.info("In readGeneralContrains: read latency {}", latency.toString()); } diff --git a/pce/src/main/java/org/opendaylight/transportpce/pce/gnpy/GnpyServiceImpl.java b/pce/src/main/java/org/opendaylight/transportpce/pce/gnpy/GnpyServiceImpl.java index 4c6beee8a..4bc475a98 100644 --- a/pce/src/main/java/org/opendaylight/transportpce/pce/gnpy/GnpyServiceImpl.java +++ b/pce/src/main/java/org/opendaylight/transportpce/pce/gnpy/GnpyServiceImpl.java @@ -50,6 +50,7 @@ import org.opendaylight.yang.gen.v1.http.org.transportpce.b.c._interface.pathdes import org.opendaylight.yang.gen.v1.http.org.transportpce.b.c._interface.pathdescription.rev171017.path.description.ztoa.direction.ZToA; import org.opendaylight.yang.gen.v1.http.org.transportpce.b.c._interface.pathdescription.rev171017.pce.resource.resource.Resource; import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev130715.IpAddress; +import org.opendaylight.yangtools.yang.common.Uint32; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -84,8 +85,8 @@ public class GnpyServiceImpl { /* * Construct the GnpyServiceImpl */ - public GnpyServiceImpl(PathComputationRequestInput input, AToZDirection atoz, Long requestId, GnpyTopoImpl gnpyTopo, - PceConstraints pceHardConstraints) throws GnpyException { + public GnpyServiceImpl(PathComputationRequestInput input, AToZDirection atoz, Uint32 requestId, + GnpyTopoImpl gnpyTopo, PceConstraints pceHardConstraints) throws GnpyException { this.elements = gnpyTopo.getElements(); this.mapDisgNodeRefNode = gnpyTopo.getMapDisgNodeRefNode(); this.mapNodeRefIp = gnpyTopo.getMapNodeRefIp(); @@ -93,15 +94,15 @@ public class GnpyServiceImpl { this.mapFiberIp = gnpyTopo.getMapFiberIp(); this.trxList = gnpyTopo.getTrxList(); try { - this.pathRequest = extractPathRequest(input, atoz, requestId, pceHardConstraints); + this.pathRequest = extractPathRequest(input, atoz, requestId.toJava(), pceHardConstraints); this.synchronization = extractSynchronization(requestId); } catch (NullPointerException e) { throw new GnpyException("In GnpyServiceImpl: one of the elements is null",e); } } - public GnpyServiceImpl(PathComputationRequestInput input, ZToADirection ztoa, Long requestId, GnpyTopoImpl gnpyTopo, - PceConstraints pceHardConstraints) throws GnpyException { + public GnpyServiceImpl(PathComputationRequestInput input, ZToADirection ztoa, Uint32 requestId, + GnpyTopoImpl gnpyTopo, PceConstraints pceHardConstraints) throws GnpyException { this.elements = gnpyTopo.getElements(); this.mapDisgNodeRefNode = gnpyTopo.getMapDisgNodeRefNode(); this.mapNodeRefIp = gnpyTopo.getMapNodeRefIp(); @@ -109,7 +110,7 @@ public class GnpyServiceImpl { this.mapFiberIp = gnpyTopo.getMapFiberIp(); this.trxList = gnpyTopo.getTrxList(); try { - pathRequest = extractPathRequest(input, ztoa, requestId, pceHardConstraints); + pathRequest = extractPathRequest(input, ztoa, requestId.toJava(), pceHardConstraints); synchronization = extractSynchronization(requestId); } catch (NullPointerException e) { throw new GnpyException("In GnpyServiceImpl: one of the elements of service is null",e); @@ -136,7 +137,8 @@ public class GnpyServiceImpl { ExplicitRouteObjects explicitRouteObjects = new ExplicitRouteObjectsBuilder() .setRouteObjectIncludeExclude(routeObjectIncludeExcludes).build(); //Create Path Constraint - PathConstraints pathConstraints = createPathConstraints(atoz.getRate(),atoz.getAToZWavelengthNumber()); + PathConstraints pathConstraints = + createPathConstraints(atoz.getRate().toJava(),atoz.getAToZWavelengthNumber().toJava()); // Create the path request List pathRequestList = new ArrayList<>(); @@ -265,7 +267,8 @@ public class GnpyServiceImpl { if (element.getUid().contains(ipAddress.getIpv4Address().getValue())) { if ((this.currentNodeIpAddress == null) || (this.currentNodeIpAddress != ipAddress)) { this.currentNodeIpAddress = ipAddress; - RouteObjectIncludeExclude routeObjectIncludeExclude = addRouteObjectIncludeExclude(ipAddress, 1); + RouteObjectIncludeExclude routeObjectIncludeExclude = + addRouteObjectIncludeExclude(ipAddress, Uint32.valueOf(1)); routeObjectIncludeExcludes.add(routeObjectIncludeExclude); index++; found = true; @@ -297,14 +300,15 @@ public class GnpyServiceImpl { throw new GnpyException(String.format("In gnpyServiceImpl addNodeRouteObject : fiberIp of %s is null", subLink)); } - RouteObjectIncludeExclude routeObjectIncludeExclude = addRouteObjectIncludeExclude(fiberIp, 1); + RouteObjectIncludeExclude routeObjectIncludeExclude = + addRouteObjectIncludeExclude(fiberIp, Uint32.valueOf(1)); routeObjectIncludeExcludes.add(routeObjectIncludeExclude); index++; } } // Add routeObjectIncludeExclude - private RouteObjectIncludeExclude addRouteObjectIncludeExclude(IpAddress ipAddress, long teTpValue) { + private RouteObjectIncludeExclude addRouteObjectIncludeExclude(IpAddress ipAddress, Uint32 teTpValue) { TeNodeId teNodeId = new TeNodeId(ipAddress); TeTpId teTpId = new TeTpId(teTpValue); NumUnnumHop numUnnumHop = new org.opendaylight.yang.gen.v1.gnpy.path.rev200202.explicit.route.hop.type.num @@ -340,9 +344,9 @@ public class GnpyServiceImpl { } //Create the synchronization - private List extractSynchronization(Long requestId) { + private List extractSynchronization(Uint32 requestId) { // Create RequestIdNumber - List requestIdNumber = new ArrayList<>(); + List requestIdNumber = new ArrayList<>(); requestIdNumber.add(requestId); // Create a synchronization Svec svec = new SvecBuilder().setRelaxable(true) @@ -371,4 +375,4 @@ public class GnpyServiceImpl { this.synchronization = synchronization; } -} \ No newline at end of file +} diff --git a/pce/src/main/java/org/opendaylight/transportpce/pce/gnpy/GnpyTopoImpl.java b/pce/src/main/java/org/opendaylight/transportpce/pce/gnpy/GnpyTopoImpl.java index 787fdb63b..1b3c41e92 100644 --- a/pce/src/main/java/org/opendaylight/transportpce/pce/gnpy/GnpyTopoImpl.java +++ b/pce/src/main/java/org/opendaylight/transportpce/pce/gnpy/GnpyTopoImpl.java @@ -334,7 +334,7 @@ public class GnpyTopoImpl { // Compute the length of the link List linkConcatenationList = span.getLinkConcatenation(); for (LinkConcatenation linkConcatenation : linkConcatenationList) { - double srlgLength = linkConcatenation.getSRLGLength(); + double srlgLength = linkConcatenation.getSRLGLength().toJava(); //convert to kilometer length += srlgLength / CONVERT_KM_M; } diff --git a/pce/src/main/java/org/opendaylight/transportpce/pce/gnpy/GnpyUtilitiesImpl.java b/pce/src/main/java/org/opendaylight/transportpce/pce/gnpy/GnpyUtilitiesImpl.java index a1cec9a59..744882f63 100644 --- a/pce/src/main/java/org/opendaylight/transportpce/pce/gnpy/GnpyUtilitiesImpl.java +++ b/pce/src/main/java/org/opendaylight/transportpce/pce/gnpy/GnpyUtilitiesImpl.java @@ -27,6 +27,7 @@ import org.opendaylight.yang.gen.v1.http.org.transportpce.b.c._interface.pathdes import org.opendaylight.yang.gen.v1.http.org.transportpce.b.c._interface.pathdescription.rev171017.path.description.ZToADirection; import org.opendaylight.yang.gen.v1.http.org.transportpce.b.c._interface.routing.constraints.rev171017.routing.constraints.sp.HardConstraints; import org.opendaylight.yangtools.yang.binding.InstanceIdentifier; +import org.opendaylight.yangtools.yang.common.Uint32; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -45,7 +46,7 @@ public class GnpyUtilitiesImpl { private GnpyTopoImpl gnpyTopo = null; private GnpyResult gnpyAtoZ; private GnpyResult gnpyZtoA; - private Long requestId; + private Uint32 requestId; public GnpyUtilitiesImpl(NetworkTransactionService networkTransaction, PathComputationRequestInput input) throws GnpyException { @@ -55,7 +56,7 @@ public class GnpyUtilitiesImpl { this.input = input; this.gnpyAtoZ = null; this.gnpyZtoA = null; - this.requestId = (long) 0; + this.requestId = Uint32.valueOf(0); } public boolean verifyComputationByGnpy(AToZDirection atoz, ZToADirection ztoa, PceConstraints pceHardConstraints) @@ -76,7 +77,7 @@ public class GnpyUtilitiesImpl { } public GnpyResult gnpyResponseOneDirection(GnpyServiceImpl gnpySvc) throws GnpyException, Exception { - requestId++; + requestId = Uint32.valueOf((requestId.toJava()) + 1); List pathRequestList = gnpySvc.getPathRequest(); List synchronizationList = gnpySvc.getSynchronization(); // Send the computed path to GNPY tool 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 cae5ca163..a0dd42d71 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 @@ -22,6 +22,7 @@ import org.opendaylight.transportpce.pce.networkanalyzer.PceNode; import org.opendaylight.transportpce.pce.networkanalyzer.PceResult; import org.opendaylight.yang.gen.v1.http.org.openroadm.network.types.rev181130.OpenroadmLinkType; import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.network.rev180226.NodeId; +import org.opendaylight.yangtools.yang.common.Uint16; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -99,8 +100,8 @@ public class PostAlgoPathValidator { case "1GE": pceResult.setRC(ResponseCodes.RESPONSE_FAILED); pceResult.setServiceType(serviceType); - Map tribPort = chooseTribPort(path, allPceNodes); - Map> tribSlot = chooseTribSlot(path, allPceNodes, tribSlotNb); + Map tribPort = chooseTribPort(path, allPceNodes); + Map> tribSlot = chooseTribSlot(path, allPceNodes, tribSlotNb); if (tribPort != null && tribSlot != null) { pceResult.setResultTribPort(tribPort); @@ -276,10 +277,10 @@ public class PostAlgoPathValidator { return listOfElements; } - private Map chooseTribPort(GraphPath chooseTribPort(GraphPath path, Map allPceNodes) { LOG.info("In choosetribPort: edgeList = {} ", path.getEdgeList().toString()); - Map tribPortMap = new HashMap<>(); + Map tribPortMap = new HashMap<>(); for (PceGraphEdge edge : path.getEdgeList()) { NodeId linkSrcNode = edge.link().getSourceId(); @@ -288,10 +289,10 @@ public class PostAlgoPathValidator { String linkDestTp = edge.link().getDestTP().toString(); PceNode pceOtnNodeSrc = allPceNodes.get(linkSrcNode); PceNode pceOtnNodeDest = allPceNodes.get(linkDestNode); - List srcTpnPool = pceOtnNodeSrc.getAvailableTribPorts().get(linkSrcTp); - List destTpnPool = pceOtnNodeDest.getAvailableTribPorts().get(linkDestTp); - List commonEdgeTpnPool = new ArrayList<>(); - for (Integer integer : srcTpnPool) { + List srcTpnPool = pceOtnNodeSrc.getAvailableTribPorts().get(linkSrcTp); + List destTpnPool = pceOtnNodeDest.getAvailableTribPorts().get(linkDestTp); + List commonEdgeTpnPool = new ArrayList<>(); + for (Uint16 integer : srcTpnPool) { if (destTpnPool.contains(integer)) { commonEdgeTpnPool.add(integer); } @@ -305,10 +306,10 @@ public class PostAlgoPathValidator { return tribPortMap; } - private Map> chooseTribSlot(GraphPath> chooseTribSlot(GraphPath path, Map allPceNodes, int nbSlot) { LOG.info("In choosetribSlot2: edgeList = {} ", path.getEdgeList().toString()); - Map> tribSlotMap = new HashMap<>(); + Map> tribSlotMap = new HashMap<>(); for (PceGraphEdge edge : path.getEdgeList()) { NodeId linkSrcNode = edge.link().getSourceId(); @@ -317,11 +318,11 @@ public class PostAlgoPathValidator { String linkDestTp = edge.link().getDestTP().toString(); PceNode pceOtnNodeSrc = allPceNodes.get(linkSrcNode); PceNode pceOtnNodeDest = allPceNodes.get(linkDestNode); - List srcTsPool = pceOtnNodeSrc.getAvailableTribSlots().get(linkSrcTp); - List destTsPool = pceOtnNodeDest.getAvailableTribSlots().get(linkDestTp); - List commonEdgeTsPool = new ArrayList<>(); - List tribSlotList = new ArrayList<>(); - for (Integer integer : srcTsPool) { + List srcTsPool = pceOtnNodeSrc.getAvailableTribSlots().get(linkSrcTp); + List destTsPool = pceOtnNodeDest.getAvailableTribSlots().get(linkDestTp); + List commonEdgeTsPool = new ArrayList<>(); + List tribSlotList = new ArrayList<>(); + for (Uint16 integer : srcTsPool) { if (destTsPool.contains(integer)) { commonEdgeTsPool.add(integer); } @@ -331,7 +332,7 @@ public class PostAlgoPathValidator { int index = 0; while (discontinue && (commonEdgeTsPool.size() - index >= nbSlot)) { discontinue = false; - Integer val = commonEdgeTsPool.get(index); + Integer val = commonEdgeTsPool.get(index).toJava(); for (int i = 0; i < nbSlot; i++) { if (commonEdgeTsPool.get(index + i).equals(val + i)) { tribSlotList.add(commonEdgeTsPool.get(index + i)); @@ -349,9 +350,9 @@ public class PostAlgoPathValidator { return tribSlotMap; } - private List> chooseTribSlot3(GraphPath path, + private List> chooseTribSlot3(GraphPath path, Map allPceNodes) { - List> tribSlot = new ArrayList<>(); + List> tribSlot = new ArrayList<>(); boolean statusOK = true; boolean check = false; Object nodeClass = allPceNodes.getClass(); @@ -368,8 +369,8 @@ public class PostAlgoPathValidator { Object tpd = allPceNodes.get(edge.link().getDestTP()); if ((pceNode.getAvailableTribSlots().containsKey(tps.toString())) && (pceNode.getAvailableTribSlots().containsKey(tpd.toString()))) { - List tribSlotEdgeSourceN = new ArrayList<>(); - List tribSlotEdgeDestN = new ArrayList<>(); + List tribSlotEdgeSourceN = new ArrayList<>(); + List tribSlotEdgeDestN = new ArrayList<>(); tribSlotEdgeSourceN = pceNode.getAvailableTribSlots().get(tps.toString()); tribSlotEdgeDestN = pceNode.getAvailableTribSlots().get(tps.toString()); check = false; diff --git a/pce/src/main/java/org/opendaylight/transportpce/pce/networkanalyzer/MapUtils.java b/pce/src/main/java/org/opendaylight/transportpce/pce/networkanalyzer/MapUtils.java index 4db6dbb5b..8949d0a1c 100644 --- a/pce/src/main/java/org/opendaylight/transportpce/pce/networkanalyzer/MapUtils.java +++ b/pce/src/main/java/org/opendaylight/transportpce/pce/networkanalyzer/MapUtils.java @@ -84,7 +84,7 @@ public final class MapUtils { try { List linkList = getOmsAttributesSpan(link).getLinkConcatenation(); for (LinkConcatenation lc : linkList) { - srlgList.add(lc.getSRLGId()); + srlgList.add(lc.getSRLGId().toJava()); } } catch (NullPointerException e) { LOG.debug("No concatenation for this link"); @@ -107,7 +107,7 @@ public final class MapUtils { for (org.opendaylight.yang.gen.v1.http.org.openroadm.common.network.rev181130.networks.network.link .LinkConcatenation lc : linkConcatenation) { - srlgList.add(lc.getSRLGId()); + srlgList.add(lc.getSRLGId().toJava()); } } catch (NullPointerException e) { LOG.debug("No concatenation for this link"); @@ -168,7 +168,7 @@ public final class MapUtils { && link.augmentation(org.opendaylight.yang.gen.v1.http.org.openroadm.otn.network.topology.rev181130 .Link1.class).getAvailableBandwidth() != null) { return link.augmentation(org.opendaylight.yang.gen.v1.http.org.openroadm.otn.network.topology.rev181130 - .Link1.class).getAvailableBandwidth(); + .Link1.class).getAvailableBandwidth().toJava(); } else { LOG.warn("MapUtils: no Available Bandwidth available for link {}", link.getLinkId()); return 0L; @@ -181,7 +181,7 @@ public final class MapUtils { && link.augmentation(org.opendaylight.yang.gen.v1.http.org.openroadm.otn.network.topology.rev181130 .Link1.class).getUsedBandwidth() != null) { return link.augmentation(org.opendaylight.yang.gen.v1.http.org.openroadm.otn.network.topology.rev181130 - .Link1.class).getUsedBandwidth(); + .Link1.class).getUsedBandwidth().toJava(); } else { LOG.warn("MapUtils: no Available Bandwidth available for link {}", link.getLinkId()); return 0L; 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 c6158756f..d8c2caf77 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 @@ -121,7 +121,7 @@ public class PceCalculation { } serviceFormatA = input.getServiceAEnd().getServiceFormat().getName(); serviceFormatZ = input.getServiceZEnd().getServiceFormat().getName(); - serviceRate = input.getServiceAEnd().getServiceRate(); + serviceRate = input.getServiceAEnd().getServiceRate().toJava(); LOG.info("parseInput: A and Z :[{}] and [{}]", anodeId, znodeId); if (!(serviceFormatA.equals(serviceFormatZ))) { @@ -161,7 +161,7 @@ public class PceCalculation { serviceFormatA, String.valueOf(serviceRate)); } - returnStructure.setRate(input.getServiceAEnd().getServiceRate()); + returnStructure.setRate(input.getServiceAEnd().getServiceRate().toJava()); returnStructure.setServiceFormat(input.getServiceAEnd().getServiceFormat()); return true; } 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 92b483d65..e07459d0a 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 @@ -119,7 +119,7 @@ public class PceLink { private Long calcLatency(Link link) { Link1 link1 = null; link1 = link.augmentation(Link1.class); - Long tmplatency = link1.getLinkLatency(); + Long tmplatency = link1.getLinkLatency().toJava(); if (tmplatency != null) { return tmplatency; } @@ -128,7 +128,7 @@ public class PceLink { double tmp = 0; for (int i = 0; i < this.omsAttributesSpan.getLinkConcatenation().size(); i++) { //Length is expressed in meter and latency is expressed in ms according to OpenROADM MSA - tmp += this.omsAttributesSpan.getLinkConcatenation().get(i).getSRLGLength() / CELERITY; + tmp += this.omsAttributesSpan.getLinkConcatenation().get(i).getSRLGLength().toJava() / CELERITY; LOG.info("In PceLink: The latency of link {} == {}",link.getLinkId(),tmp); } tmplatency = (long) Math.ceil(tmp); diff --git a/pce/src/main/java/org/opendaylight/transportpce/pce/networkanalyzer/PceNode.java b/pce/src/main/java/org/opendaylight/transportpce/pce/networkanalyzer/PceNode.java index 74d71bd68..c95e4115a 100644 --- a/pce/src/main/java/org/opendaylight/transportpce/pce/networkanalyzer/PceNode.java +++ b/pce/src/main/java/org/opendaylight/transportpce/pce/networkanalyzer/PceNode.java @@ -10,8 +10,8 @@ package org.opendaylight.transportpce.pce.networkanalyzer; import java.util.List; import java.util.Map; - import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.network.rev180226.NodeId; +import org.opendaylight.yangtools.yang.common.Uint16; public interface PceNode { String getPceNodeType(); @@ -34,7 +34,7 @@ public interface PceNode { boolean checkWL(long index); - Map> getAvailableTribPorts(); + Map> getAvailableTribPorts(); - Map> getAvailableTribSlots(); + Map> getAvailableTribSlots(); } diff --git a/pce/src/main/java/org/opendaylight/transportpce/pce/networkanalyzer/PceOpticalNode.java b/pce/src/main/java/org/opendaylight/transportpce/pce/networkanalyzer/PceOpticalNode.java index e9273e1d2..a04cd6579 100644 --- a/pce/src/main/java/org/opendaylight/transportpce/pce/networkanalyzer/PceOpticalNode.java +++ b/pce/src/main/java/org/opendaylight/transportpce/pce/networkanalyzer/PceOpticalNode.java @@ -24,6 +24,7 @@ import org.opendaylight.yang.gen.v1.http.org.openroadm.network.types.rev181130.O import org.opendaylight.yang.gen.v1.http.org.openroadm.service.format.rev190531.ServiceFormat; 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.rev180226.networks.network.Node; +import org.opendaylight.yangtools.yang.common.Uint16; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -146,7 +147,7 @@ public class PceOpticalNode implements PceNode { } for (org.opendaylight.yang.gen.v1.http.org.openroadm.srg.rev181130.srg.node.attributes .AvailableWavelengths awl : srgAvailableWL) { - this.availableWLindex.add(awl.getIndex()); + this.availableWLindex.add(awl.getIndex().toJava()); LOG.debug("initWLlist: SRG next = {} in {}", awl.getIndex(), this.toString()); } break; @@ -160,7 +161,7 @@ public class PceOpticalNode implements PceNode { } for (org.opendaylight.yang.gen.v1.http.org.openroadm.degree.rev181130.degree.node.attributes .AvailableWavelengths awl : degAvailableWL) { - this.availableWLindex.add(awl.getIndex()); + this.availableWLindex.add(awl.getIndex().toJava()); LOG.debug("initWLlist: DEGREE next = {} in {}", awl.getIndex(), this.toString()); } break; @@ -362,13 +363,13 @@ public class PceOpticalNode implements PceNode { } @Override - public Map> getAvailableTribPorts() { + public Map> getAvailableTribPorts() { // TODO Auto-generated method stub return null; } @Override - public Map> getAvailableTribSlots() { + public Map> getAvailableTribSlots() { // TODO Auto-generated method stub return null; } diff --git a/pce/src/main/java/org/opendaylight/transportpce/pce/networkanalyzer/PceOtnNode.java b/pce/src/main/java/org/opendaylight/transportpce/pce/networkanalyzer/PceOtnNode.java index 65f17b78e..bdf5aeebf 100644 --- a/pce/src/main/java/org/opendaylight/transportpce/pce/networkanalyzer/PceOtnNode.java +++ b/pce/src/main/java/org/opendaylight/transportpce/pce/networkanalyzer/PceOtnNode.java @@ -34,6 +34,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; import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.network.topology.rev180226.TpId; import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.network.topology.rev180226.networks.network.node.TerminationPoint; +import org.opendaylight.yangtools.yang.common.Uint16; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -53,8 +54,8 @@ public class PceOtnNode implements PceNode { private final String pceNodeType; private final String otnServiceType; - private Map> tpAvailableTribPort = new TreeMap>(); - private Map> tpAvailableTribSlot = new TreeMap>(); + private Map> tpAvailableTribPort = new TreeMap>(); + private Map> tpAvailableTribSlot = new TreeMap>(); private Map availableXponderTp = new TreeMap(); private List usedXpdrNWTps = new ArrayList(); private List availableXpdrNWTps; @@ -366,7 +367,7 @@ public class PceOtnNode implements PceNode { for (OduSwitchingPools ospx : osp) { List nbl = ospx.getNonBlockingList(); for (NonBlockingList nbll : nbl) { - if (nbll.getAvailableInterconnectBandwidth() >= neededBW) { + if (nbll.getAvailableInterconnectBandwidth().toJava() >= neededBW) { List tplist = new ArrayList(nbll.getTpList()); if ((tplist.contains(tp1.getTpId())) & (tplist.contains(tp2.getTpId()))) { LOG.debug("validateSwitchingPoolBandwidth: couple of tp {} x {} valid for crossconnection", @@ -414,7 +415,7 @@ public class PceOtnNode implements PceNode { && tp.augmentation(TerminationPoint1.class).getXpdrTpPortConnectionAttributes().getOdtuTpnPool().get(0) .getOdtuType().equals(ODTU4TsAllocated.class)) { @Nullable - List tpnPool = tp.augmentation(TerminationPoint1.class).getXpdrTpPortConnectionAttributes() + List tpnPool = tp.augmentation(TerminationPoint1.class).getXpdrTpPortConnectionAttributes() .getOdtuTpnPool().get(0).getTpnPool(); if (tpnPool != null) { tpAvailableTribPort.put(tp.getTpId().getValue(), tpnPool); @@ -436,7 +437,7 @@ public class PceOtnNode implements PceNode { for (TerminationPoint tp : networkTpList) { if (tp.augmentation(TerminationPoint1.class).getXpdrTpPortConnectionAttributes().getTsPool() != null) { @Nullable - List tsPool = tp.augmentation(TerminationPoint1.class).getXpdrTpPortConnectionAttributes() + List tsPool = tp.augmentation(TerminationPoint1.class).getXpdrTpPortConnectionAttributes() .getTsPool(); tpAvailableTribSlot.put(tp.getTpId().getValue(), tsPool); } @@ -474,12 +475,12 @@ public class PceOtnNode implements PceNode { } @Override - public Map> getAvailableTribPorts() { + public Map> getAvailableTribPorts() { return tpAvailableTribPort; } @Override - public Map> getAvailableTribSlots() { + public Map> getAvailableTribSlots() { return tpAvailableTribSlot; } diff --git a/pce/src/main/java/org/opendaylight/transportpce/pce/networkanalyzer/PceResult.java b/pce/src/main/java/org/opendaylight/transportpce/pce/networkanalyzer/PceResult.java index ce8bb6b23..9f492b3dc 100644 --- a/pce/src/main/java/org/opendaylight/transportpce/pce/networkanalyzer/PceResult.java +++ b/pce/src/main/java/org/opendaylight/transportpce/pce/networkanalyzer/PceResult.java @@ -15,6 +15,7 @@ import org.opendaylight.transportpce.common.ResponseCodes; import org.opendaylight.yang.gen.v1.http.org.openroadm.service.format.rev190531.ServiceFormat; import org.opendaylight.yang.gen.v1.http.org.transportpce.b.c._interface.pathdescription.rev171017.path.description.AToZDirection; import org.opendaylight.yang.gen.v1.http.org.transportpce.b.c._interface.pathdescription.rev171017.path.description.ZToADirection; +import org.opendaylight.yangtools.yang.common.Uint16; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -25,8 +26,8 @@ public class PceResult { private boolean calcStatus = false; private String responseCode = ResponseCodes.RESPONSE_FAILED; private long resultWavelength = -1; - private Map resultTribPort; - private Map> resultTribSlot; + private Map resultTribPort; + private Map> resultTribSlot; private Integer resultTribSlotNb = -1; private String serviceType = ""; @@ -132,19 +133,19 @@ public class PceResult { this.calcMessage = calcMessage; } - public Map getResultTribPort() { + public Map getResultTribPort() { return resultTribPort; } - public void setResultTribPort(Map resultTribPort) { + public void setResultTribPort(Map resultTribPort) { this.resultTribPort = resultTribPort; } - public Map> getResultTribSlot() { + public Map> getResultTribSlot() { return resultTribSlot; } - public void setResultTribSlot(Map> resultTribSlot) { + public void setResultTribSlot(Map> resultTribSlot) { this.resultTribSlot = resultTribSlot; } 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 169933984..6fffc8e14 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 @@ -91,25 +91,25 @@ public final class PceTestUtils { Assert.assertEquals(atozSize, ztoaSize); Long actualAToZWavel = output.getResponseParameters().getPathDescription().getAToZDirection() - .getAToZWavelengthNumber(); + .getAToZWavelengthNumber().toJava(); Long expectedAToZWavel = expectedOutput.getResponseParameters().getPathDescription().getAToZDirection() - .getAToZWavelengthNumber(); + .getAToZWavelengthNumber().toJava(); Assert.assertEquals(actualAToZWavel, expectedAToZWavel); Long actualZtoAWavel = output.getResponseParameters().getPathDescription().getZToADirection() - .getZToAWavelengthNumber(); + .getZToAWavelengthNumber().toJava(); Long expectedZtoAWavel = expectedOutput.getResponseParameters().getPathDescription().getZToADirection() - .getZToAWavelengthNumber(); + .getZToAWavelengthNumber().toJava(); Assert.assertEquals(actualZtoAWavel, expectedZtoAWavel); - Long actualAToZRate = output.getResponseParameters().getPathDescription().getAToZDirection().getRate(); + Long actualAToZRate = output.getResponseParameters().getPathDescription().getAToZDirection().getRate().toJava(); Long expectedAToZRate = expectedOutput.getResponseParameters().getPathDescription().getAToZDirection() - .getRate(); + .getRate().toJava(); Assert.assertEquals(expectedAToZRate, actualAToZRate); - Long actualZToARate = output.getResponseParameters().getPathDescription().getZToADirection().getRate(); + Long actualZToARate = output.getResponseParameters().getPathDescription().getZToADirection().getRate().toJava(); Long expectedZToARate = expectedOutput.getResponseParameters().getPathDescription().getZToADirection() - .getRate(); + .getRate().toJava(); Assert.assertEquals(actualZToARate, expectedZToARate); } diff --git a/pom.xml b/pom.xml index 0559c2dae..84c3e5cdd 100644 --- a/pom.xml +++ b/pom.xml @@ -11,7 +11,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html INTERNAL org.opendaylight.odlparent odlparent - 5.0.5 + 6.0.4 @@ -71,4 +71,5 @@ and is available at http://www.eclipse.org/legal/epl-v10.html INTERNAL + diff --git a/renderer/pom.xml b/renderer/pom.xml index 5e51c49cb..b9614db72 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 - 4.0.11 + 5.0.9 @@ -41,7 +41,15 @@ and is available at http://www.eclipse.org/legal/epl-v10.html com.google.code.findbugs jsr305 + 3.0.2 true + + + + + false + + diff --git a/renderer/src/main/java/org/opendaylight/transportpce/renderer/ModelMappingUtils.java b/renderer/src/main/java/org/opendaylight/transportpce/renderer/ModelMappingUtils.java index c01d79609..048c9dcdc 100644 --- a/renderer/src/main/java/org/opendaylight/transportpce/renderer/ModelMappingUtils.java +++ b/renderer/src/main/java/org/opendaylight/transportpce/renderer/ModelMappingUtils.java @@ -90,7 +90,7 @@ public final class ModelMappingUtils { ServicePathInputBuilder servicePathInputBuilder = new ServicePathInputBuilder() .setServiceName(serviceName) .setOperation(ServicePathInput.Operation.Create) - .setWaveNumber(Long.valueOf(pathDescription.getAToZDirection().getAToZWavelengthNumber())) + .setWaveNumber(Long.valueOf(pathDescription.getAToZDirection().getAToZWavelengthNumber().toJava())) .setNodes(nodeLists.getList()); return new ServicePathInputData(servicePathInputBuilder.build(), nodeLists); } @@ -101,7 +101,7 @@ public final class ModelMappingUtils { ServicePathInputBuilder servicePathInputBuilder = new ServicePathInputBuilder() .setOperation(ServicePathInput.Operation.Create) .setServiceName(serviceName) - .setWaveNumber(Long.valueOf(pathDescription.getZToADirection().getZToAWavelengthNumber())) + .setWaveNumber(Long.valueOf(pathDescription.getZToADirection().getZToAWavelengthNumber().toJava())) .setNodes(nodeLists.getList()); return new ServicePathInputData(servicePathInputBuilder.build(), nodeLists); } diff --git a/renderer/src/main/java/org/opendaylight/transportpce/renderer/NetworkModelWavelengthServiceImpl.java b/renderer/src/main/java/org/opendaylight/transportpce/renderer/NetworkModelWavelengthServiceImpl.java index eee258516..9aaa23e00 100644 --- a/renderer/src/main/java/org/opendaylight/transportpce/renderer/NetworkModelWavelengthServiceImpl.java +++ b/renderer/src/main/java/org/opendaylight/transportpce/renderer/NetworkModelWavelengthServiceImpl.java @@ -92,12 +92,12 @@ public class NetworkModelWavelengthServiceImpl implements NetworkModelWavelength List ztoaTpIds = getZToATpList(pathDescription); deleteAvailableWL(atozTpIds.stream().map(NodeIdPair::getNodeID).distinct().collect(Collectors.toList()), - pathDescription.getAToZDirection().getAToZWavelengthNumber()); + pathDescription.getAToZDirection().getAToZWavelengthNumber().toJava()); deleteAvailableWL(ztoaTpIds.stream().map(NodeIdPair::getNodeID).distinct().collect(Collectors.toList()), - pathDescription.getZToADirection().getZToAWavelengthNumber()); + pathDescription.getZToADirection().getZToAWavelengthNumber().toJava()); - addUsedWL(pathDescription.getAToZDirection().getAToZWavelengthNumber(), atozTpIds); - addUsedWL(pathDescription.getZToADirection().getZToAWavelengthNumber(), ztoaTpIds); + addUsedWL(pathDescription.getAToZDirection().getAToZWavelengthNumber().toJava(), atozTpIds); + addUsedWL(pathDescription.getZToADirection().getZToAWavelengthNumber().toJava(), ztoaTpIds); } @Override @@ -105,13 +105,13 @@ public class NetworkModelWavelengthServiceImpl implements NetworkModelWavelength List atozTpIds = getAToZTpList(pathDescription); List ztoaTpIds = getZToATpList(pathDescription); - deleteUsedWL(pathDescription.getAToZDirection().getAToZWavelengthNumber(), atozTpIds); - deleteUsedWL(pathDescription.getZToADirection().getZToAWavelengthNumber(), ztoaTpIds); + deleteUsedWL(pathDescription.getAToZDirection().getAToZWavelengthNumber().toJava(), atozTpIds); + deleteUsedWL(pathDescription.getZToADirection().getZToAWavelengthNumber().toJava(), ztoaTpIds); addAvailableWL(atozTpIds.stream().map(NodeIdPair::getNodeID).distinct().collect(Collectors.toList()), - pathDescription.getAToZDirection().getAToZWavelengthNumber()); + pathDescription.getAToZDirection().getAToZWavelengthNumber().toJava()); addAvailableWL(ztoaTpIds.stream().map(NodeIdPair::getNodeID).distinct().collect(Collectors.toList()), - pathDescription.getZToADirection().getZToAWavelengthNumber()); + pathDescription.getZToADirection().getZToAWavelengthNumber().toJava()); } private List getAToZTpList(PathDescription pathDescription) { diff --git a/renderer/src/main/java/org/opendaylight/transportpce/renderer/openroadminterface/OpenRoadmOtnInterface221.java b/renderer/src/main/java/org/opendaylight/transportpce/renderer/openroadminterface/OpenRoadmOtnInterface221.java index ef16d1040..a20f833ba 100644 --- a/renderer/src/main/java/org/opendaylight/transportpce/renderer/openroadminterface/OpenRoadmOtnInterface221.java +++ b/renderer/src/main/java/org/opendaylight/transportpce/renderer/openroadminterface/OpenRoadmOtnInterface221.java @@ -34,6 +34,7 @@ import org.opendaylight.yang.gen.v1.http.org.openroadm.otn.odu.interfaces.rev181 import org.opendaylight.yang.gen.v1.http.org.openroadm.otn.odu.interfaces.rev181019.odu.container.OduBuilder; import org.opendaylight.yang.gen.v1.http.org.openroadm.otn.odu.interfaces.rev181019.opu.OpuBuilder; import org.opendaylight.yang.gen.v1.http.org.openroadm.otn.odu.interfaces.rev181019.parent.odu.allocation.ParentOduAllocationBuilder; +import org.opendaylight.yangtools.yang.common.Uint16; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -159,11 +160,11 @@ public class OpenRoadmOtnInterface221 { .setMonitoringMode(OduAttributes.MonitoringMode.Terminated); LOG.debug("Inside the ODU2e creation {} {} {}",isNetworkPort,tribPortNumber,tribSlotIndex); if (isNetworkPort) { - List tribSlots = new ArrayList<>(); - int newIdx = tribSlotIndex; + List tribSlots = new ArrayList<>(); + Uint16 newIdx = Uint16.valueOf(tribSlotIndex); tribSlots.add(newIdx); IntStream.range(tribSlotIndex, tribSlotIndex + 8).forEach( - nbr -> tribSlots.add(nbr) + nbr -> tribSlots.add(Uint16.valueOf(nbr)) ); ParentOduAllocationBuilder parentOduAllocationBuilder = new ParentOduAllocationBuilder() .setTribPortNumber(tribPortNumber) @@ -220,8 +221,8 @@ public class OpenRoadmOtnInterface221 { .setMonitoringMode(OduAttributes.MonitoringMode.Terminated); if (isNetworkPort) { LOG.debug("Network port is true"); - List tribSlots = new ArrayList<>(); - tribSlots.add(tribSlot); //add trib slots + List tribSlots = new ArrayList<>(); + tribSlots.add(Uint16.valueOf(tribSlot)); //add trib slots ParentOduAllocationBuilder parentOduAllocationBuilder = new ParentOduAllocationBuilder() //set trib port numbers .setTribPortNumber(tribPortNumber) @@ -282,9 +283,9 @@ public class OpenRoadmOtnInterface221 { .setOduFunction(ODUTTPCTP.class) .setMonitoringMode(OduAttributes.MonitoringMode.Terminated); if (isNetworkPort) { - List tribSlots = new ArrayList<>(); + List tribSlots = new ArrayList<>(); IntStream.range(tribSlotIndex, tribSlotIndex + 8).forEach( - nbr -> tribSlots.add(nbr) + nbr -> tribSlots.add(Uint16.valueOf(nbr)) ); ParentOduAllocationBuilder parentOduAllocationBuilder = new ParentOduAllocationBuilder() //set trib port numbers diff --git a/renderer/src/main/java/org/opendaylight/transportpce/renderer/provisiondevice/DeviceRendererServiceImpl.java b/renderer/src/main/java/org/opendaylight/transportpce/renderer/provisiondevice/DeviceRendererServiceImpl.java index 23d08b672..cf24125a9 100644 --- a/renderer/src/main/java/org/opendaylight/transportpce/renderer/provisiondevice/DeviceRendererServiceImpl.java +++ b/renderer/src/main/java/org/opendaylight/transportpce/renderer/provisiondevice/DeviceRendererServiceImpl.java @@ -115,7 +115,7 @@ public class DeviceRendererServiceImpl implements DeviceRendererService { if (this.deviceTransactionManager.isDeviceMounted(nodeId)) { String srcTp = node.getSrcTp(); String destTp = node.getDestTp(); - Long waveNumber = input.getWaveNumber(); + Long waveNumber = input.getWaveNumber().toJava(); if ((destTp != null) && destTp.contains(StringConstants.NETWORK_TOKEN)) { crossConnectFlag++; Mapping mapping = this.portMapping.getMapping(nodeId,destTp); @@ -262,7 +262,7 @@ public class DeviceRendererServiceImpl implements DeviceRendererService { LOG.info("Deleting service setup on node {}", nodeId); String srcTp; String destTp; - Long waveNumber = input.getWaveNumber(); + Long waveNumber = input.getWaveNumber().toJava(); if (node.getDestTp() == null) { LOG.error("Destination termination point must not be null."); return; diff --git a/renderer/src/main/java/org/opendaylight/transportpce/renderer/provisiondevice/otn/OtnDeviceOperationsImpl.java b/renderer/src/main/java/org/opendaylight/transportpce/renderer/provisiondevice/otn/OtnDeviceOperationsImpl.java index 531d81b62..02a45d953 100644 --- a/renderer/src/main/java/org/opendaylight/transportpce/renderer/provisiondevice/otn/OtnDeviceOperationsImpl.java +++ b/renderer/src/main/java/org/opendaylight/transportpce/renderer/provisiondevice/otn/OtnDeviceOperationsImpl.java @@ -51,7 +51,7 @@ public class OtnDeviceOperationsImpl implements OtnDeviceOperations { for (PortIfTypeConfig portIfTypeConfig : portIfTypeConfigList) { if (portIfTypeConfig.getCircuitPackName().equals(circuitPackName) && portIfTypeConfig.getPortName().equals(portName)) { - return possiblePortConfig.getConfigId(); + return possiblePortConfig.getConfigId().toJava(); } } } @@ -134,4 +134,4 @@ public class OtnDeviceOperationsImpl implements OtnDeviceOperations { //check supported interface types -} \ No newline at end of file +} diff --git a/servicehandler/pom.xml b/servicehandler/pom.xml index 4ccf02683..6dac80854 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 - 4.0.11 + 5.0.9 @@ -44,4 +44,11 @@ Author: Martial Coulibaly on behalf of Orange ${project.version} + + + + + false + + diff --git a/servicehandler/src/main/java/org/opendaylight/transportpce/servicehandler/validation/checks/ServicehandlerTxRxCheck.java b/servicehandler/src/main/java/org/opendaylight/transportpce/servicehandler/validation/checks/ServicehandlerTxRxCheck.java index e5cba5de0..93dc39349 100644 --- a/servicehandler/src/main/java/org/opendaylight/transportpce/servicehandler/validation/checks/ServicehandlerTxRxCheck.java +++ b/servicehandler/src/main/java/org/opendaylight/transportpce/servicehandler/validation/checks/ServicehandlerTxRxCheck.java @@ -134,7 +134,7 @@ public final class ServicehandlerTxRxCheck { String message = ""; if (serviceEnd != null) { try { - Long serviceRate = serviceEnd.getServiceRate(); + Long serviceRate = serviceEnd.getServiceRate().toJava(); ServiceFormat serviceformat = serviceEnd.getServiceFormat(); String clli = serviceEnd.getClli(); if ((serviceRate == null) || (serviceRate <= 0)) { diff --git a/tapi/pom.xml b/tapi/pom.xml index 361ebb4f5..638f28a45 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 - 4.0.11 + 5.0.9 @@ -29,7 +29,7 @@ Author: Martial Coulibaly on behalf of Orange org.opendaylight.mdsal mdsal-artifacts - 4.0.3 + 5.0.9 import pom @@ -108,4 +108,11 @@ Author: Martial Coulibaly on behalf of Orange + + + + + false + + diff --git a/tapimodels/pom.xml b/tapimodels/pom.xml index d61928348..0fe0f54f8 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 - 4.0.11 + 5.0.9 diff --git a/test-common/pom.xml b/test-common/pom.xml index 3a1645a09..04dc37810 100644 --- a/test-common/pom.xml +++ b/test-common/pom.xml @@ -11,7 +11,7 @@ org.opendaylight.odlparent bundle-parent - 5.0.5 + 6.0.4 @@ -31,7 +31,15 @@ com.google.code.findbugs jsr305 + 3.0.2 true + + + + + false + + -- 2.36.6