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 <guillaume.lambert@orange.com>
Change-Id: I20dfe87985a1273e3f0864e6a4d26880fc80d197

diff --git a/api/pom.xml b/api/pom.xml
index 429aa7558af41168113ef0aa32ace8b4cdd40240..c9564099bfb4b7ccd099daca47be6c497739b2c5 100644 (file)
--- a/api/pom.xml
+++ b/api/pom.xml
@@ -12,7 +12,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
   <parent>
     <groupId>org.opendaylight.mdsal</groupId>
     <artifactId>binding-parent</artifactId>
-    <version>4.0.11</version>
+    <version>5.0.9</version>
     <relativePath/>
   </parent>
 
@@ -49,7 +49,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
        <plugin>
          <groupId>org.apache.felix</groupId>
          <artifactId>maven-bundle-plugin</artifactId>
-         <version>3.0.1</version>
+         <!--version>3.0.1</version-->
          <extensions>true</extensions>
          <configuration>
            <instructions>

diff --git a/common/pom.xml b/common/pom.xml
index bd2e85d9fef22dac66abce054648baacc72ec8f4..5ebcac83391ac1e8f99efe5b09f866751523023e 100644 (file)
--- a/common/pom.xml
+++ b/common/pom.xml
@@ -10,7 +10,7 @@
     <parent>
         <groupId>org.opendaylight.mdsal</groupId>
         <artifactId>binding-parent</artifactId>
-        <version>4.0.11</version>
+        <version>5.0.9</version>
         <relativePath />
     </parent>
 
@@ -24,14 +24,14 @@
             <dependency>
                 <groupId>org.opendaylight.netconf</groupId>
                 <artifactId>netconf-artifacts</artifactId>
-                <version>1.7.2-SNAPSHOT</version>
+                <version>1.8.0-SNAPSHOT</version>
                 <scope>import</scope>
                 <type>pom</type>
             </dependency>
             <dependency>
                 <groupId>org.opendaylight.mdsal</groupId>
                 <artifactId>mdsal-artifacts</artifactId>
-                <version>4.0.11</version>
+                <version>5.0.9</version>
                 <scope>import</scope>
                 <type>pom</type>
             </dependency>
@@ -62,6 +62,7 @@
         <dependency>
             <groupId>com.google.code.findbugs</groupId>
             <artifactId>jsr305</artifactId>
+            <version>3.0.2</version>
             <optional>true</optional>
         </dependency>
     </dependencies>
@@ -79,4 +80,11 @@
       </plugin>
     </plugins>
   </build>
+
+<!-- checkstyle and spotbugds enforced by odlparent since Magnesium -->
+  <properties>
+    <!-- odlparent.checkstyle.enforce>false</odlparent.checkstyle.enforce -->
+    <odlparent.spotbugs.enforce>false</odlparent.spotbugs.enforce>
+  </properties>
+
 </project>

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 6335ed85b5fc416b9ac1b93ed9e2dfb4bc433521..aed65339be824853ea04a64a0a9e3c77d13eb571 100644 (file)
--- 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<YangModuleInfo> moduleInfos) {
             this.moduleInfoBackedCntxt.addModuleInfos(moduleInfos);
-            Optional<SchemaContext> tryToCreateSchemaContext =
-                    this.moduleInfoBackedCntxt.tryToCreateSchemaContext();
+            Optional<? extends SchemaContext> 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 00033933e212672bb01cd4fae79dea386390cf91..e4fc4a09306b2c9883279f90dea3a095a9d035a3 100644 (file)
--- 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 dd0cd820467dae54e674ee9d269bf79fc2d2ab10..7f06049523dceedb9fdba946fe310572495608b1 100644 (file)
--- 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 9697a92454449a08f4d1c435a4e98a37d14d8071..3ec2c6c651cebe95767f92bdbf25818ba83b5df3 100644 (file)
--- 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
   <parent>
     <groupId>org.opendaylight.odlparent</groupId>
     <artifactId>single-feature-parent</artifactId>
-    <version>5.0.5</version>
+    <version>6.0.4</version>
     <relativePath/>
   </parent>
 
@@ -24,7 +24,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html INTERNAL
   <name>OpenDaylight :: transportpce :: api</name>
 
   <properties>
-    <netconf.version>1.7.2-SNAPSHOT</netconf.version>
+    <netconf.version>1.8.0-SNAPSHOT</netconf.version>
     <configfile.directory>etc/opendaylight/karaf</configfile.directory>
   </properties>
 

diff --git a/features/odl-transportpce-inventory/pom.xml b/features/odl-transportpce-inventory/pom.xml
index 3d5d8ddbcf44f272f5e0e50a2f557d7a74a7235e..bd5b8f17ff39f3ca0bd947732c91a8903e096339 100644 (file)
--- a/features/odl-transportpce-inventory/pom.xml
+++ b/features/odl-transportpce-inventory/pom.xml
@@ -9,7 +9,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>single-feature-parent</artifactId>
-        <version>5.0.5</version>
+        <version>6.0.4</version>
         <relativePath/>
     </parent>
 

diff --git a/features/odl-transportpce-ordmodels/pom.xml b/features/odl-transportpce-ordmodels/pom.xml
index 1cc5fdeaf4bfbe65f6a709fc0d5936aa61503e03..4f8e71a075d4b03ccdeb9d45913d3eaf2ff13cea 100644 (file)
--- 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
   <parent>
     <groupId>org.opendaylight.odlparent</groupId>
     <artifactId>single-feature-parent</artifactId>
-    <version>5.0.5</version>
+    <version>6.0.4</version>
     <relativePath/>
   </parent>
 

diff --git a/features/odl-transportpce/pom.xml b/features/odl-transportpce/pom.xml
index fae81d9116b1d064faa732a3f8bcf54ffce2fea2..b4be4e8cd5e8566db6e5385695aefc50c58a1066 100644 (file)
--- 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
   <parent>
     <groupId>org.opendaylight.odlparent</groupId>
     <artifactId>single-feature-parent</artifactId>
-    <version>5.0.5</version>
+    <version>6.0.4</version>
     <relativePath/>
   </parent>
 
@@ -24,9 +24,9 @@ and is available at http://www.eclipse.org/legal/epl-v10.html INTERNAL
   <name>OpenDaylight :: transportpce</name>
 
   <properties>
-    <mdsal.version>1.10.2-SNAPSHOT</mdsal.version>
-    <netconf.version>1.7.2-SNAPSHOT</netconf.version>
-    <restconf.version>1.10.2-SNAPSHOT</restconf.version>
+    <mdsal.version>1.11.0-SNAPSHOT</mdsal.version>
+    <netconf.version>1.8.0-SNAPSHOT</netconf.version>
+    <restconf.version>1.11.0-SNAPSHOT</restconf.version>
     <configfile.directory>etc/opendaylight/karaf</configfile.directory>
   </properties>
 

diff --git a/features/pom.xml b/features/pom.xml
index b6d4f45d508520988b7010a3823df755b4c0d462..8f802e3a5c8481c236a8de993dbe1e7b79229904 100644 (file)
--- 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
   <parent>
     <groupId>org.opendaylight.odlparent</groupId>
     <artifactId>odlparent-lite</artifactId>
-    <version>5.0.5</version>
+    <version>6.0.4</version>
     <relativePath/>
   </parent>
 

diff --git a/inventory/pom.xml b/inventory/pom.xml
index a1a179ee9fa1e0552facc2dea7af63c9596abeef..72c58dcf529031f94113b0f632bb29e1a8c7f3d8 100644 (file)
--- a/inventory/pom.xml
+++ b/inventory/pom.xml
@@ -10,7 +10,7 @@
     <parent>
         <groupId>org.opendaylight.mdsal</groupId>
         <artifactId>binding-parent</artifactId>
-        <version>4.0.11</version>
+        <version>5.0.9</version>
         <relativePath />
     </parent>
 
@@ -26,4 +26,11 @@
         <version>${project.version}</version>
       </dependency>
     </dependencies>
+
+<!-- checkstyle and spotbugds enforced by odlparent since Magnesium -->
+  <properties>
+    <!-- odlparent.checkstyle.enforce>false</odlparent.checkstyle.enforce -->
+    <odlparent.spotbugs.enforce>false</odlparent.spotbugs.enforce>
+  </properties>
+
 </project>

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 1ed0e1115da08571683791016843e2873c793ce5..c4bc590118a71d7c47e58d9733964ca04c4213a6 100644 (file)
--- 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 4c5ed86e5177a9fffe7f5209e3ceb1f9c220289b..a4c33830a90af7a72d580a66fa1148d668073f24 100644 (file)
--- 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 2805cd15cf75f76c10298523a81942ff14b1883c..aedf6d325aaba5b69b230e920d7ba2eb2c7c3bb5 100644 (file)
--- 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
   <parent>
     <groupId>org.opendaylight.odlparent</groupId>
     <artifactId>karaf4-parent</artifactId>
-    <version>5.0.5</version>
+    <version>6.0.4</version>
     <relativePath/>
   </parent>
 

diff --git a/networkmodel/pom.xml b/networkmodel/pom.xml
index f2a19dbad49a73284673802f637cd6ff02628a19..bc8c2972d960ad8fa84416fdb37dc07cf88e3549 100644 (file)
--- a/networkmodel/pom.xml
+++ b/networkmodel/pom.xml
@@ -13,7 +13,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
   <parent>
     <groupId>org.opendaylight.odlparent</groupId>
     <artifactId>bundle-parent</artifactId>
-    <version>5.0.5</version>
+    <version>6.0.4</version>
     <relativePath/>
   </parent>
 
@@ -33,7 +33,15 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
     <dependency>
       <groupId>com.google.code.findbugs</groupId>
       <artifactId>jsr305</artifactId>
+      <version>3.0.2</version>
       <optional>true</optional>
     </dependency>
   </dependencies>
+
+<!-- checkstyle and spotbugds enforced by odlparent since Magnesium -->
+  <properties>
+    <!-- odlparent.checkstyle.enforce>false</odlparent.checkstyle.enforce -->
+    <odlparent.spotbugs.enforce>false</odlparent.spotbugs.enforce>
+  </properties>
+
 </project>

diff --git a/olm/pom.xml b/olm/pom.xml
index 9fe5218f020aacf85667ee3062162c70b9cf97a4..806c0da880b66bf65b30e6ae0285682af5739524 100644 (file)
--- a/olm/pom.xml
+++ b/olm/pom.xml
@@ -13,7 +13,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
   <parent>
     <groupId>org.opendaylight.mdsal</groupId>
     <artifactId>binding-parent</artifactId>
-    <version>4.0.11</version>
+    <version>5.0.9</version>
     <relativePath/>
   </parent>
 
@@ -59,7 +59,15 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
     <dependency>
       <groupId>com.google.code.findbugs</groupId>
       <artifactId>jsr305</artifactId>
+      <version>3.0.2</version>
       <optional>true</optional>
     </dependency>
   </dependencies>
+
+<!-- checkstyle and spotbugds enforced by odlparent since Magnesium -->
+  <properties>
+    <!-- odlparent.checkstyle.enforce>false</odlparent.checkstyle.enforce -->
+    <odlparent.spotbugs.enforce>false</odlparent.spotbugs.enforce>
+  </properties>
+
 </project>

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 e8fc629d9ca4c64d7ff5be36166da613d2bdb3a8..094bf32c44bf3e20b4d0dccc534ca1d086988589 100644 (file)
--- 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 800fbe193c572971f15a984c5675074c570e06a3..719a477dcabdcb02d0388513f5795a120543c957 100644 (file)
--- 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<Measurements> measurementsList = new ArrayList<Measurements>();
         measurementsList.add(measurements);

diff --git a/ordmodels/common/pom.xml b/ordmodels/common/pom.xml
index 6470edf53d10686ff2b1ff0f24954e6e5a24046e..286cafe171637c7a188f74ed47e458a20345e48f 100644 (file)
--- 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
   <parent>
     <groupId>org.opendaylight.mdsal</groupId>
     <artifactId>binding-parent</artifactId>
-    <version>4.0.11</version>
+    <version>5.0.9</version>
     <relativePath/>
   </parent>
 

diff --git a/ordmodels/device/pom.xml b/ordmodels/device/pom.xml
index b1c612d4a5be2f09c01e3384a70c7ff7a00a0f26..1173b131ab0d0dbcb0e644e44541790aa07c7a65 100644 (file)
--- 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
   <parent>
     <groupId>org.opendaylight.mdsal</groupId>
     <artifactId>binding-parent</artifactId>
-    <version>4.0.11</version>
+    <version>5.0.9</version>
     <relativePath/>
   </parent>
 
@@ -26,7 +26,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
       <dependency>
         <groupId>org.opendaylight.netconf</groupId>
         <artifactId>netconf-artifacts</artifactId>
-        <version>1.7.2-SNAPSHOT</version>
+        <version>1.8.0-SNAPSHOT</version>
         <scope>import</scope>
         <type>pom</type>
       </dependency>
@@ -49,7 +49,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
     <dependency>
       <groupId>org.opendaylight.mdsal.model</groupId>
       <artifactId>iana-afn-safi</artifactId>
-      <version>2013.07.04.16.3</version>
+      <!--version>2013.07.04.17.9</version-->
     </dependency>
     <dependency>
       <groupId>org.opendaylight.mdsal.binding.model.ietf</groupId>
@@ -66,7 +66,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
        <plugin>
          <groupId>org.apache.felix</groupId>
          <artifactId>maven-bundle-plugin</artifactId>
-         <version>3.0.1</version>
+         <!--version>3.0.1</version-->
          <extensions>true</extensions>
          <configuration>
            <instructions>
@@ -89,4 +89,5 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
        </plugin>
      </plugins>
   </build>
+
 </project>

diff --git a/ordmodels/network/pom.xml b/ordmodels/network/pom.xml
index 510210f875e73051f18fd1025be284edc0cb3930..a5a06917705ccbbd55f6f1ee3c1014d6b5a35677 100644 (file)
--- 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
   <parent>
     <groupId>org.opendaylight.mdsal</groupId>
     <artifactId>binding-parent</artifactId>
-    <version>4.0.11</version>
+    <version>5.0.9</version>
     <relativePath/>
   </parent>
 

diff --git a/ordmodels/pom.xml b/ordmodels/pom.xml
index e6ee66499a3bf1920f72b0ed539eab3e78e37bd0..c9270358caddaa513ecf8db929abc92f656cce33 100644 (file)
--- a/ordmodels/pom.xml
+++ b/ordmodels/pom.xml
@@ -12,7 +12,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
   <parent>
     <groupId>org.opendaylight.mdsal</groupId>
     <artifactId>binding-parent</artifactId>
-    <version>4.0.11</version>
+    <version>5.0.9</version>
     <relativePath/>
   </parent>
 

diff --git a/ordmodels/service/pom.xml b/ordmodels/service/pom.xml
index c3002c4feb60ecb28d66fc2ca6348043bc95c446..6720ab880f05eba328c337644fa6e3527e3b2e8c 100644 (file)
--- 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
   <parent>
     <groupId>org.opendaylight.mdsal</groupId>
     <artifactId>binding-parent</artifactId>
-    <version>4.0.11</version>
+    <version>5.0.9</version>
     <relativePath/>
   </parent>
 

diff --git a/pce/pom.xml b/pce/pom.xml
index 6fc5d0ddcb36029b916aa070a33ab993d1801600..4a7b2f5784b94327ad2a480705260e22b7db7258 100644 (file)
--- a/pce/pom.xml
+++ b/pce/pom.xml
@@ -17,7 +17,7 @@ Author: Martial Coulibaly <martial.coulibaly@gfi.com> on behalf of Orange
   <parent>
     <groupId>org.opendaylight.mdsal</groupId>
     <artifactId>binding-parent</artifactId>
-    <version>4.0.11</version>
+    <version>5.0.9</version>
     <relativePath/>
   </parent>
 
@@ -42,6 +42,7 @@ Author: Martial Coulibaly <martial.coulibaly@gfi.com> on behalf of Orange
     <dependency>
       <groupId>com.google.code.findbugs</groupId>
       <artifactId>jsr305</artifactId>
+      <version>3.0.2</version>
       <optional>true</optional>
     </dependency>
   </dependencies>
@@ -70,4 +71,11 @@ Author: Martial Coulibaly <martial.coulibaly@gfi.com> on behalf of Orange
       </plugin>
     </plugins>
   </build>
+
+<!-- checkstyle and spotbugds enforced by odlparent since Magnesium -->
+  <properties>
+    <!-- odlparent.checkstyle.enforce>false</odlparent.checkstyle.enforce -->
+    <odlparent.spotbugs.enforce>false</odlparent.spotbugs.enforce>
+  </properties>
+
 </project>

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 f8c2ecb6ad168aae131fc9bf7796371d33b6240b..e79aa84ca859568233cc107b09cba724c995146b 100644 (file)
--- 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 4c6beee8a3f49dee2eb1dad759a176e7774fcdf6..4bc475a9829810595e5eb59817adfca037900540 100644 (file)
--- 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<PathRequest> 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<Synchronization> extractSynchronization(Long requestId) {
+    private List<Synchronization> extractSynchronization(Uint32 requestId) {
         // Create RequestIdNumber
-        List<Long> requestIdNumber = new ArrayList<>();
+        List<Uint32> 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 787fdb63bdf12b32af1c8d8e728c9d671caf267d..1b3c41e9249f1c432971f29cd19058617a95812d 100644 (file)
--- 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<LinkConcatenation> 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 a1cec9a59fe8780c5d88f38d7f70c8fe75ae8454..744882f637aad1b806c6880d76eaad509347b2e2 100644 (file)
--- 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<PathRequest> pathRequestList = gnpySvc.getPathRequest();
         List<Synchronization> 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 cae5ca1639fb8cf6530ca72e6ff2a0a20f37a73a..a0dd42d7184cdbea37ae4fa2700fa4b8ef8e7580 100644 (file)
--- 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<String, Integer> tribPort = chooseTribPort(path, allPceNodes);
-                Map<String, List<Integer>> tribSlot = chooseTribSlot(path, allPceNodes, tribSlotNb);
+                Map<String, Uint16> tribPort = chooseTribPort(path, allPceNodes);
+                Map<String, List<Uint16>> tribSlot = chooseTribSlot(path, allPceNodes, tribSlotNb);
 
                 if (tribPort != null && tribSlot != null) {
                     pceResult.setResultTribPort(tribPort);
@@ -276,10 +277,10 @@ public class PostAlgoPathValidator {
         return listOfElements;
     }
 
-    private Map<String, Integer> chooseTribPort(GraphPath<String,
+    private Map<String, Uint16> chooseTribPort(GraphPath<String,
         PceGraphEdge> path, Map<NodeId, PceNode> allPceNodes) {
         LOG.info("In choosetribPort: edgeList = {} ", path.getEdgeList().toString());
-        Map<String, Integer> tribPortMap = new HashMap<>();
+        Map<String, Uint16> 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<Integer> srcTpnPool = pceOtnNodeSrc.getAvailableTribPorts().get(linkSrcTp);
-            List<Integer> destTpnPool = pceOtnNodeDest.getAvailableTribPorts().get(linkDestTp);
-            List<Integer> commonEdgeTpnPool = new ArrayList<>();
-            for (Integer integer : srcTpnPool) {
+            List<Uint16> srcTpnPool = pceOtnNodeSrc.getAvailableTribPorts().get(linkSrcTp);
+            List<Uint16> destTpnPool = pceOtnNodeDest.getAvailableTribPorts().get(linkDestTp);
+            List<Uint16> 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<String, List<Integer>> chooseTribSlot(GraphPath<String,
+    private Map<String, List<Uint16>> chooseTribSlot(GraphPath<String,
         PceGraphEdge> path, Map<NodeId, PceNode> allPceNodes, int nbSlot) {
         LOG.info("In choosetribSlot2: edgeList = {} ", path.getEdgeList().toString());
-        Map<String, List<Integer>> tribSlotMap = new HashMap<>();
+        Map<String, List<Uint16>> 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<Integer> srcTsPool = pceOtnNodeSrc.getAvailableTribSlots().get(linkSrcTp);
-            List<Integer> destTsPool = pceOtnNodeDest.getAvailableTribSlots().get(linkDestTp);
-            List<Integer> commonEdgeTsPool = new ArrayList<>();
-            List<Integer> tribSlotList = new ArrayList<>();
-            for (Integer integer : srcTsPool) {
+            List<Uint16> srcTsPool = pceOtnNodeSrc.getAvailableTribSlots().get(linkSrcTp);
+            List<Uint16> destTsPool = pceOtnNodeDest.getAvailableTribSlots().get(linkDestTp);
+            List<Uint16> commonEdgeTsPool = new ArrayList<>();
+            List<Uint16> 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<List<Integer>> chooseTribSlot3(GraphPath<String, PceGraphEdge> path,
+    private List<List<Uint16>> chooseTribSlot3(GraphPath<String, PceGraphEdge> path,
         Map<NodeId, PceNode> allPceNodes) {
-        List<List<Integer>> tribSlot = new ArrayList<>();
+        List<List<Uint16>> 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<Integer> tribSlotEdgeSourceN = new ArrayList<>();
-                List<Integer> tribSlotEdgeDestN = new ArrayList<>();
+                List<Uint16> tribSlotEdgeSourceN = new ArrayList<>();
+                List<Uint16> 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 4db6dbb5baed4b59cdbd8c4a9c97d55279d15a31..8949d0a1ca71116ffae671340cc2d526d4a87590 100644 (file)
--- 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<LinkConcatenation> 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 c6158756f0e9a91b0928ce180df000539d05a4a7..d8c2caf77382240b6634e6c31a74ba03dfcdec52 100644 (file)
--- 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 92b483d65da9fc8b81dd9d3e9bf07435f09eec9c..e07459d0a74ee128ea6c660f67dde3a9635ec9fc 100644 (file)
--- 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 74d71bd68bccad06540fce7f9007703a00342fe4..c95e4115abb5dc14ac06f48e959b5612ab64f439 100644 (file)
--- 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<String, List<Integer>> getAvailableTribPorts();
+    Map<String, List<Uint16>> getAvailableTribPorts();
 
-    Map<String, List<Integer>> getAvailableTribSlots();
+    Map<String, List<Uint16>> 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 e9273e1d279f5f92d482bbb2ccace2152f163722..a04cd6579922dc2aa61e5748c933c693afa8a56c 100644 (file)
--- 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<String, List<Integer>> getAvailableTribPorts() {
+    public Map<String, List<Uint16>> getAvailableTribPorts() {
         // TODO Auto-generated method stub
         return null;
     }
 
     @Override
-    public Map<String, List<Integer>> getAvailableTribSlots() {
+    public Map<String, List<Uint16>> 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 65f17b78e97bc6c63e157c258e4a006aa8aedd25..bdf5aeebfd580886ec94fe17a0c76bb783df05b5 100644 (file)
--- 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<String, List<Integer>> tpAvailableTribPort = new TreeMap<String, List<Integer>>();
-    private Map<String, List<Integer>> tpAvailableTribSlot = new TreeMap<String, List<Integer>>();
+    private Map<String, List<Uint16>> tpAvailableTribPort = new TreeMap<String, List<Uint16>>();
+    private Map<String, List<Uint16>> tpAvailableTribSlot = new TreeMap<String, List<Uint16>>();
     private Map<String, OpenroadmTpType> availableXponderTp = new TreeMap<String, OpenroadmTpType>();
     private List<String> usedXpdrNWTps = new ArrayList<String>();
     private List<TpId> availableXpdrNWTps;
@@ -366,7 +367,7 @@ public class PceOtnNode implements PceNode {
             for (OduSwitchingPools ospx : osp) {
                 List<NonBlockingList> nbl = ospx.getNonBlockingList();
                 for (NonBlockingList nbll : nbl) {
-                    if (nbll.getAvailableInterconnectBandwidth() >= neededBW) {
+                    if (nbll.getAvailableInterconnectBandwidth().toJava() >= neededBW) {
                         List<TpId> tplist = new ArrayList<TpId>(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<Integer> tpnPool = tp.augmentation(TerminationPoint1.class).getXpdrTpPortConnectionAttributes()
+                List<Uint16> 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<Integer> tsPool = tp.augmentation(TerminationPoint1.class).getXpdrTpPortConnectionAttributes()
+                List<Uint16> 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<String, List<Integer>> getAvailableTribPorts() {
+    public Map<String, List<Uint16>> getAvailableTribPorts() {
         return tpAvailableTribPort;
     }
 
     @Override
-    public Map<String, List<Integer>> getAvailableTribSlots() {
+    public Map<String, List<Uint16>> 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 ce8bb6b230322fb661bfa07927f75fa2aeaec342..9f492b3dc07c2b3ac834ae9a35bad55d07ab09e4 100644 (file)
--- 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<String, Integer> resultTribPort;
-    private Map<String, List<Integer>> resultTribSlot;
+    private Map<String, Uint16> resultTribPort;
+    private Map<String, List<Uint16>> resultTribSlot;
     private Integer resultTribSlotNb = -1;
     private String serviceType = "";
 
@@ -132,19 +133,19 @@ public class PceResult {
         this.calcMessage = calcMessage;
     }
 
-    public Map<String, Integer> getResultTribPort() {
+    public Map<String, Uint16> getResultTribPort() {
         return resultTribPort;
     }
 
-    public void setResultTribPort(Map<String, Integer> resultTribPort) {
+    public void setResultTribPort(Map<String, Uint16> resultTribPort) {
         this.resultTribPort = resultTribPort;
     }
 
-    public Map<String, List<Integer>> getResultTribSlot() {
+    public Map<String, List<Uint16>> getResultTribSlot() {
         return resultTribSlot;
     }
 
-    public void setResultTribSlot(Map<String, List<Integer>> resultTribSlot) {
+    public void setResultTribSlot(Map<String, List<Uint16>> 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 169933984cad44ef33304b58b8a97e9b049cb43f..6fffc8e149f6dee0e1f43beff2560572287dd6cc 100644 (file)
--- 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 0559c2dae8899ecc639d6321ea27f7026188c6e0..84c3e5cdd6d06bca059339777ae8de8d915e685c 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -11,7 +11,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html INTERNAL
   <parent>
     <groupId>org.opendaylight.odlparent</groupId>
     <artifactId>odlparent</artifactId>
-    <version>5.0.5</version>
+    <version>6.0.4</version>
     <relativePath/>
   </parent>
 
@@ -71,4 +71,5 @@ and is available at http://www.eclipse.org/legal/epl-v10.html INTERNAL
       </plugin>
     </plugins>
   </build>
+
 </project>

diff --git a/renderer/pom.xml b/renderer/pom.xml
index 5e51c49cb7aa738733d39ba1865d570c98068167..b9614db72084a46ee702cf9d6b35f55634c6cd29 100644 (file)
--- a/renderer/pom.xml
+++ b/renderer/pom.xml
@@ -13,7 +13,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
   <parent>
     <groupId>org.opendaylight.mdsal</groupId>
     <artifactId>binding-parent</artifactId>
-    <version>4.0.11</version>
+    <version>5.0.9</version>
     <relativePath/>
   </parent>
 
@@ -41,7 +41,15 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
     <dependency>
         <groupId>com.google.code.findbugs</groupId>
         <artifactId>jsr305</artifactId>
+        <version>3.0.2</version>
         <optional>true</optional>
     </dependency>
   </dependencies>
+
+<!-- checkstyle and spotbugds enforced by odlparent since Magnesium -->
+  <properties>
+    <!-- odlparent.checkstyle.enforce>false</odlparent.checkstyle.enforce -->
+    <odlparent.spotbugs.enforce>false</odlparent.spotbugs.enforce>
+  </properties>
+
 </project>

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 c01d7960903fafcd51a60856380e36da1fd531e2..048c9dcdc4be7d53ede7e0b754daf757a31b75f1 100644 (file)
--- 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 eee258516ae28e70d5d68e69c7cec9d92783a9df..9aaa23e006e511c175b841c58df28cec232699b3 100644 (file)
--- 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<NodeIdPair> 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<NodeIdPair> atozTpIds = getAToZTpList(pathDescription);
         List<NodeIdPair> 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<NodeIdPair> 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 ef16d10400e77b03f5ab0f538626625a4d0973da..a20f833badbdfcd3b512cc16f2da5801732aa0bd 100644 (file)
--- 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<Integer> tribSlots = new ArrayList<>();
-            int newIdx = tribSlotIndex;
+            List<Uint16> 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<Integer> tribSlots = new ArrayList<>();
-            tribSlots.add(tribSlot); //add trib slots
+            List<Uint16> 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<Integer> tribSlots = new ArrayList<>();
+            List<Uint16> 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 23d08b672dc064596f4899da1b6b4a41770a9379..cf24125a98aee4115dcae4a3a96b39be2950b1c0 100644 (file)
--- 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 531d81b62d004a019d84f6e3f58034571e34bb84..02a45d9533e16e4f11359e3ef8d97d52e2d21b57 100644 (file)
--- 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 4ccf02683298a50e2285c906e3c2c32138554920..6dac8085439b7789c3148e1414d7f1be234bb51b 100644 (file)
--- a/servicehandler/pom.xml
+++ b/servicehandler/pom.xml
@@ -15,7 +15,7 @@ Author: Martial Coulibaly <martial.coulibaly@gfi.com> on behalf of Orange
   <parent>
     <groupId>org.opendaylight.mdsal</groupId>
     <artifactId>binding-parent</artifactId>
-    <version>4.0.11</version>
+    <version>5.0.9</version>
     <relativePath/>
   </parent>
 
@@ -44,4 +44,11 @@ Author: Martial Coulibaly <martial.coulibaly@gfi.com> on behalf of Orange
       <version>${project.version}</version>
     </dependency>
   </dependencies>
+
+<!-- checkstyle and spotbugds enforced by odlparent since Magnesium -->
+  <properties>
+    <!-- odlparent.checkstyle.enforce>false</odlparent.checkstyle.enforce -->
+    <odlparent.spotbugs.enforce>false</odlparent.spotbugs.enforce>
+  </properties>
+
 </project>

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 e5cba5de00650645a971578c5a993db5a742d640..93dc393497aaf489c8f874084bd04f600662e5e7 100644 (file)
--- 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 361ebb4f597d8ba3ef0a37532c292cae68f03241..638f28a450f0ea22c0c63bb4fbf97b2c75facabd 100644 (file)
--- a/tapi/pom.xml
+++ b/tapi/pom.xml
@@ -15,7 +15,7 @@ Author: Martial Coulibaly <martial.coulibaly@gfi.com> on behalf of Orange
   <parent>
     <groupId>org.opendaylight.mdsal</groupId>
     <artifactId>binding-parent</artifactId>
-    <version>4.0.11</version>
+    <version>5.0.9</version>
     <relativePath/>
   </parent>
 
@@ -29,7 +29,7 @@ Author: Martial Coulibaly <martial.coulibaly@gfi.com> on behalf of Orange
       <dependency>
         <groupId>org.opendaylight.mdsal</groupId>
         <artifactId>mdsal-artifacts</artifactId>
-        <version>4.0.3</version>
+        <version>5.0.9</version>
         <scope>import</scope>
         <type>pom</type>
       </dependency>
@@ -108,4 +108,11 @@ Author: Martial Coulibaly <martial.coulibaly@gfi.com> on behalf of Orange
     </dependency>
 
   </dependencies>
+
+<!-- checkstyle and spotbugds enforced by odlparent since Magnesium -->
+  <properties>
+    <!-- odlparent.checkstyle.enforce>false</odlparent.checkstyle.enforce -->
+    <odlparent.spotbugs.enforce>false</odlparent.spotbugs.enforce>
+  </properties>
+
 </project>

diff --git a/tapimodels/pom.xml b/tapimodels/pom.xml
index d61928348bbb6152cfe971de9e199d1765938899..0fe0f54f8aceac5f77f7c951eb4a5a129a1f6b58 100644 (file)
--- a/tapimodels/pom.xml
+++ b/tapimodels/pom.xml
@@ -12,7 +12,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
   <parent>
     <groupId>org.opendaylight.mdsal</groupId>
     <artifactId>binding-parent</artifactId>
-    <version>4.0.11</version>
+    <version>5.0.9</version>
     <relativePath/>
   </parent>
 

diff --git a/test-common/pom.xml b/test-common/pom.xml
index 3a1645a09f740e610da23b0ea149d30b6b31ba75..04dc3781035e3334ee90882339e8860d33052e2c 100644 (file)
--- a/test-common/pom.xml
+++ b/test-common/pom.xml
@@ -11,7 +11,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>bundle-parent</artifactId>
-        <version>5.0.5</version>
+        <version>6.0.4</version>
         <relativePath/>
     </parent>
 
@@ -31,7 +31,15 @@
         <dependency>
             <groupId>com.google.code.findbugs</groupId>
             <artifactId>jsr305</artifactId>
+            <version>3.0.2</version>
             <optional>true</optional>
         </dependency>
     </dependencies>
+
+<!-- checkstyle and spotbugds enforced by odlparent since Magnesium -->
+  <properties>
+    <!-- odlparent.checkstyle.enforce>false</odlparent.checkstyle.enforce -->
+    <odlparent.spotbugs.enforce>false</odlparent.spotbugs.enforce>
+  </properties>
+
 </project>