Fix spotbugs issues in network topologies module

JIRA: TRNSPRTPCE-210 ODLPARENT-226
Signed-off-by: Gilles Thouenon <gilles.thouenon@orange.com>
Change-Id: I7b9928b6ee8ab06db0cc27fdcdfe1aaa4cd2fa80

diff --git a/networkmodel/pom.xml b/networkmodel/pom.xml
index c4e5dfabb55af61a60e9df69a3dabca5988167d7..21a1527f6aa77263266e88b332330154c376a5d4 100644 (file)
--- a/networkmodel/pom.xml
+++ b/networkmodel/pom.xml
@@ -38,10 +38,4 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
     </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/networkmodel/src/main/java/org/opendaylight/transportpce/networkmodel/NetConfTopologyListener.java b/networkmodel/src/main/java/org/opendaylight/transportpce/networkmodel/NetConfTopologyListener.java
index 88382548d6a355dc78b365f93015415a2e68c3ec..7917e6df9fb4e7025414fbb983b6a03415687d72 100644 (file)
--- a/networkmodel/src/main/java/org/opendaylight/transportpce/networkmodel/NetConfTopologyListener.java
+++ b/networkmodel/src/main/java/org/opendaylight/transportpce/networkmodel/NetConfTopologyListener.java
@@ -7,8 +7,8 @@
  */
 package org.opendaylight.transportpce.networkmodel;
 
-//import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
-//even with @SuppressFBwarnings generate a checkstyles error...
+import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
+
 import java.util.Collection;
 import java.util.Collections;
 import java.util.List;
@@ -17,6 +17,7 @@ import java.util.Optional;
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.stream.Collectors;
 import javax.annotation.Nonnull;
+
 import org.opendaylight.mdsal.binding.api.DataBroker;
 import org.opendaylight.mdsal.binding.api.DataObjectModification;
 import org.opendaylight.mdsal.binding.api.DataObjectModification.ModificationType;
@@ -72,10 +73,11 @@ public class NetConfTopologyListener implements DataTreeChangeListener<Node> {
         this.registrations22 = new ConcurrentHashMap<>();
     }
 
+    @SuppressFBWarnings(
+        value = "RV_RETURN_VALUE_IGNORED",
+        justification = "nothing to verify once rpc has been sent")
     private void onDeviceConnected(final String nodeId, String openRoadmVersion) {
         LOG.info("onDeviceConnected: {}", nodeId);
-        LOG.info(StringConstants.OPENROADM_DEVICE_VERSION_1_2_1);
-        LOG.info(openRoadmVersion);
         Optional<MountPoint> mountPointOpt = this.deviceTransactionManager.getDeviceMountPoint(nodeId);
         MountPoint mountPoint;
         if (mountPointOpt.isPresent()) {
@@ -213,7 +215,9 @@ public class NetConfTopologyListener implements DataTreeChangeListener<Node> {
     }
 
     @Override
-    //@SuppressFBwarnings("SF_SWITCH_FALLTHROUGH")
+    @SuppressFBWarnings(
+        value = "SF_SWITCH_FALLTHROUGH",
+        justification = "intentional fallthrough")
     public void onDataTreeChanged(@Nonnull Collection<DataTreeModification<Node>> changes) {
         LOG.info("onDataTreeChanged");
         for (DataTreeModification<Node> change : changes) {

diff --git a/networkmodel/src/main/java/org/opendaylight/transportpce/networkmodel/R2RLinkDiscovery.java b/networkmodel/src/main/java/org/opendaylight/transportpce/networkmodel/R2RLinkDiscovery.java
index 4826a145be9f7f128de6b88a49995ca2d3b937c8..07616f72121600701b88c81e0713eb62d3d98ab1 100644 (file)
--- a/networkmodel/src/main/java/org/opendaylight/transportpce/networkmodel/R2RLinkDiscovery.java
+++ b/networkmodel/src/main/java/org/opendaylight/transportpce/networkmodel/R2RLinkDiscovery.java
@@ -39,6 +39,7 @@ import org.opendaylight.yang.gen.v1.http.org.openroadm.lldp.rev161014.lldp.conta
 import org.opendaylight.yang.gen.v1.http.org.openroadm.lldp.rev161014.lldp.container.lldp.nbr.list.IfName;
 import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.network.rev180226.NodeId;
 import org.opendaylight.yangtools.yang.binding.InstanceIdentifier;
+import org.opendaylight.yangtools.yang.common.Uint8;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -220,8 +221,8 @@ public class R2RLinkDiscovery {
             "Found a neighbor SrcNodeId: {} , SrcDegId: {} , SrcTPId: {}, DestNodeId:{} , DestDegId: {}, DestTPId: {}",
             nodeId.getValue(), srcDegId, srcTpTx, destNodeId, destDegId, destTpRx);
         InitRoadmNodesInputBuilder r2rlinkBuilderAToZ = new InitRoadmNodesInputBuilder();
-        r2rlinkBuilderAToZ.setRdmANode(nodeId.getValue()).setDegANum(srcDegId.shortValue())
-            .setTerminationPointA(srcTpTx).setRdmZNode(destNodeId.getValue()).setDegZNum(destDegId.shortValue())
+        r2rlinkBuilderAToZ.setRdmANode(nodeId.getValue()).setDegANum(Uint8.valueOf(srcDegId))
+            .setTerminationPointA(srcTpTx).setRdmZNode(destNodeId.getValue()).setDegZNum(Uint8.valueOf(destDegId))
             .setTerminationPointZ(destTpRx);
         if (!OrdLink.createRdm2RdmLinks(r2rlinkBuilderAToZ.build(), this.dataBroker)) {
             LOG.error("OMS Link creation failed between node: {} and nodeId: {} in A->Z direction", nodeId.getValue(),
@@ -236,10 +237,10 @@ public class R2RLinkDiscovery {
 
         InitRoadmNodesInputBuilder r2rlinkBuilderZToA = new InitRoadmNodesInputBuilder()
             .setRdmANode(destNodeId.getValue())
-            .setDegANum(destDegId.shortValue())
+            .setDegANum(Uint8.valueOf(destDegId))
             .setTerminationPointA(destTpTx)
             .setRdmZNode(nodeId.getValue())
-            .setDegZNum(srcDegId.shortValue())
+            .setDegZNum(Uint8.valueOf(srcDegId))
             .setTerminationPointZ(srcTpRx);
         if (!OrdLink.createRdm2RdmLinks(r2rlinkBuilderZToA.build(), this.dataBroker)) {
             LOG.error("OMS Link creation failed between node: {} and nodeId: {} in Z->A direction",
@@ -294,12 +295,10 @@ public class R2RLinkDiscovery {
             destTpTx = "DEG" + destDegId + "-TTP-TX";
             destTpRx = "DEG" + destDegId + "-TTP-RX";
         }
-        return TopologyUtils.deleteLink(nodeId.getValue() + "-" + srcDegId.toString(),
-                destNodeId.getValue() + "-" + destDegId.toString(),
-                srcTpTx.toString(), destTpRx.toString(), networkTransactionService)
-            && TopologyUtils.deleteLink(destNodeId.getValue() + "-" + destDegId.toString(),
-                nodeId.getValue() + "-" + srcDegId.toString(), destTpTx, srcTpRx,
-                networkTransactionService);
+        return TopologyUtils.deleteLink(nodeId.getValue() + "-" + srcDegId, destNodeId.getValue() + "-" + destDegId,
+            srcTpTx, destTpRx, networkTransactionService)
+            && TopologyUtils.deleteLink(destNodeId.getValue() + "-" + destDegId, nodeId.getValue() + "-" + srcDegId,
+                destTpTx, srcTpRx, networkTransactionService);
     }
 
     private Integer getDegFromInterface(NodeId nodeId, String interfaceName) {

diff --git a/networkmodel/src/main/java/org/opendaylight/transportpce/networkmodel/Rdm2XpdrLink.java b/networkmodel/src/main/java/org/opendaylight/transportpce/networkmodel/Rdm2XpdrLink.java
index bdf46a6f39b932c9f177ec53aadea60f54bc40cf..d3a26f50fb907305cb0d4f5a1aabb9b19f6b48a5 100644 (file)
--- a/networkmodel/src/main/java/org/opendaylight/transportpce/networkmodel/Rdm2XpdrLink.java
+++ b/networkmodel/src/main/java/org/opendaylight/transportpce/networkmodel/Rdm2XpdrLink.java
@@ -176,20 +176,19 @@ final class Rdm2XpdrLink {
         ReadTransaction readTransaction = dataBroker.newReadOnlyTransaction();
         @NonNull
         FluentFuture<Optional<TerminationPoint>> tpFf = readTransaction.read(LogicalDatastoreType.CONFIGURATION, iiTp);
-        TerminationPoint tp = null;
         if (tpFf.isDone()) {
-            Optional<TerminationPoint> tpOpt = null;
             try {
+                Optional<TerminationPoint> tpOpt;
                 tpOpt = tpFf.get();
+                if (tpOpt.isPresent()) {
+                    return tpOpt.get();
+                }
             } catch (InterruptedException | ExecutionException e) {
                 LOG.error("Impossible to get tp-id {} of node {} from {}", srcTp, srcNode,
-                    NetworkUtils.OVERLAY_NETWORK_ID);
-            }
-            if (tpOpt.isPresent()) {
-                tp = tpOpt.get();
+                    NetworkUtils.OVERLAY_NETWORK_ID, e);
             }
         }
-        return tp;
+        return null;
     }
 
     private Rdm2XpdrLink() {

diff --git a/networkmodel/src/main/java/org/opendaylight/transportpce/networkmodel/listeners/AlarmNotificationListener.java b/networkmodel/src/main/java/org/opendaylight/transportpce/networkmodel/listeners/AlarmNotificationListener.java
index ee71be736193da9a90f5ca336a52d79c6f5a2e78..2286bdbc4a8d8251c7522af2fd7a4260a4dbbcdf 100644 (file)
--- a/networkmodel/src/main/java/org/opendaylight/transportpce/networkmodel/listeners/AlarmNotificationListener.java
+++ b/networkmodel/src/main/java/org/opendaylight/transportpce/networkmodel/listeners/AlarmNotificationListener.java
@@ -82,9 +82,9 @@ public class AlarmNotificationListener implements OrgOpenroadmAlarmListener {
         String message = sb.toString();
         Nodes build = new NodesBuilder().setNodeId(notification.getResource().getDevice().getNodeId()).build();
         if (allNodeList.contains(build)) {
-            LOG.info(message);
+            LOG.info("onAlarmNotification: {}", message);
         } else {
-            LOG.warn(message);
+            LOG.warn("onAlarmNotification: {}", message);
         }
     }
 

diff --git a/networkmodel/src/main/java/org/opendaylight/transportpce/networkmodel/listeners/AlarmNotificationListener221.java b/networkmodel/src/main/java/org/opendaylight/transportpce/networkmodel/listeners/AlarmNotificationListener221.java
index 98cabb96e7bc018b0eda6e0e9e454669c869551b..3564623300af18758bb1c663f2e92283070f1c51 100644 (file)
--- a/networkmodel/src/main/java/org/opendaylight/transportpce/networkmodel/listeners/AlarmNotificationListener221.java
+++ b/networkmodel/src/main/java/org/opendaylight/transportpce/networkmodel/listeners/AlarmNotificationListener221.java
@@ -84,9 +84,9 @@ public class AlarmNotificationListener221 implements OrgOpenroadmAlarmListener {
         Nodes build = new NodesBuilder().setNodeId(notification.getResource().getDevice().getNodeId().getValue())
             .build();
         if (allNodeList.contains(build)) {
-            LOG.info(message);
+            LOG.info("onAlarmNotification: {}", message);
         } else {
-            LOG.warn(message);
+            LOG.warn("onAlarmNotification: {}", message);
         }
     }
 

diff --git a/networkmodel/src/main/java/org/opendaylight/transportpce/networkmodel/util/LinkIdUtil.java b/networkmodel/src/main/java/org/opendaylight/transportpce/networkmodel/util/LinkIdUtil.java
index 15fbc35a03f11bef172f768dc6a1dc213c3d7b1a..e5184af13f224ec98dd2de0a9ba11164b2c73586 100644 (file)
--- a/networkmodel/src/main/java/org/opendaylight/transportpce/networkmodel/util/LinkIdUtil.java
+++ b/networkmodel/src/main/java/org/opendaylight/transportpce/networkmodel/util/LinkIdUtil.java
@@ -8,7 +8,6 @@
 
 package org.opendaylight.transportpce.networkmodel.util;
 
-import java.text.MessageFormat;
 import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.networkutils.rev170818.InitRoadmNodesInput;
 import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.network.topology.rev180226.LinkId;
 
@@ -19,7 +18,7 @@ public final class LinkIdUtil {
     private static final String TRANSMIT = "-TX";
     private static final String RECEIVE = "-RX";
     private static final String BIDIRECTIONAL = "-TXRX";
-    private static final MessageFormat LINK_ID_FORMAT = new MessageFormat("{0}-{1}to{2}-{3}");
+    private static final String LINK_ID_FORMAT = "%1$s-%2$sto%3$s-%4$s";
 
     private LinkIdUtil() {
         // utility class
@@ -35,8 +34,7 @@ public final class LinkIdUtil {
      * @return {@link LinkId}
      */
     public static LinkId buildLinkId(String srcNode, String srcTp, String destNode, String destTp) {
-        return new LinkId(LINK_ID_FORMAT
-                .format(new Object[] {srcNode, srcTp, destNode, destTp}, new StringBuffer(), null).toString());
+        return new LinkId(String.format(LINK_ID_FORMAT, srcNode, srcTp, destNode, destTp));
     }
 
     /**
@@ -53,7 +51,7 @@ public final class LinkIdUtil {
 
         Object[] params = buildParams(srcNode, srcTp, destNode, destTp, false);
 
-        return new LinkId(LINK_ID_FORMAT.format(params, new StringBuffer(), null).toString());
+        return new LinkId(String.format(LINK_ID_FORMAT, params));
     }
 
     /**
@@ -83,7 +81,7 @@ public final class LinkIdUtil {
     public static LinkId getOppositeLinkId(String srcNode, String srcTp, String destNode, String destTp,
         boolean checkNode) {
         Object[] params = buildParams(srcNode, srcTp, destNode, destTp, checkNode);
-        return new LinkId(LINK_ID_FORMAT.format(params, new StringBuffer(), null).toString());
+        return new LinkId(String.format(LINK_ID_FORMAT, params));
     }
 
     private static Object[] buildParams(String srcNode, String srcTp, String destNode, String destTp,

diff --git a/networkmodel/src/main/java/org/opendaylight/transportpce/networkmodel/util/OpenRoadmOtnTopology.java b/networkmodel/src/main/java/org/opendaylight/transportpce/networkmodel/util/OpenRoadmOtnTopology.java
index 785a872d2f5d6664b2239b922c27142abf83574c..47b8f2c0084c7e68e49ded54c8f1547c9af6d7a7 100644 (file)
--- a/networkmodel/src/main/java/org/opendaylight/transportpce/networkmodel/util/OpenRoadmOtnTopology.java
+++ b/networkmodel/src/main/java/org/opendaylight/transportpce/networkmodel/util/OpenRoadmOtnTopology.java
@@ -66,12 +66,17 @@ import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.network.top
 import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.network.topology.rev180226.networks.network.node.TerminationPointKey;
 import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.network.topology.rev180226.networks.network.node.termination.point.SupportingTerminationPoint;
 import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.network.topology.rev180226.networks.network.node.termination.point.SupportingTerminationPointBuilder;
+import org.opendaylight.yangtools.yang.common.Uint16;
+import org.opendaylight.yangtools.yang.common.Uint32;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 public final class OpenRoadmOtnTopology {
 
     private static final Logger LOG = LoggerFactory.getLogger(OpenRoadmOtnTopology.class);
+    private static final String CLIENT = "-CLIENT";
+    private static final String NETWORK = "-NETWORK";
+    private static final String XPDR = "-XPDR";
 
     private OpenRoadmOtnTopology() {
     }
@@ -107,9 +112,9 @@ public final class OpenRoadmOtnTopology {
             Integer xpdrNb = Integer.parseInt(mapping.getLogicalConnectionPoint().split("XPDR")[1].split("-")[0]);
             if (!xpdrMap.containsKey(xpdrNb)) {
                 List<Mapping> xpdrNetMaps = mappingNode.getMapping().stream().filter(k -> k.getLogicalConnectionPoint()
-                    .contains("XPDR" + xpdrNb + "-NETWORK")).collect(Collectors.toList());
+                    .contains("XPDR" + xpdrNb + NETWORK)).collect(Collectors.toList());
                 List<Mapping> xpdrClMaps = mappingNode.getMapping().stream().filter(k -> k.getLogicalConnectionPoint()
-                    .contains("XPDR" + xpdrNb + "-CLIENT")).collect(Collectors.toList());
+                    .contains("XPDR" + xpdrNb + CLIENT)).collect(Collectors.toList());
                 OtnTopoNode otnNode = null;
                 if (mapping.getXponderType() != null) {
                     otnNode = new OtnTopoNode(mappingNode.getNodeId(), mappingNode.getNodeInfo().getNodeClli(), xpdrNb,
@@ -142,7 +147,7 @@ public final class OpenRoadmOtnTopology {
     private static Node createTpdr(OtnTopoNode node) {
         //create otn-topology node augmentation
         XpdrAttributes xpdrAttr = new XpdrAttributesBuilder()
-            .setXpdrNumber(Integer.valueOf(node.getXpdrNb()))
+            .setXpdrNumber(Uint16.valueOf(node.getXpdrNb()))
             .build();
         Node1 otnNodeAug = new Node1Builder()
             .setXpdrAttributes(xpdrAttr)
@@ -163,8 +168,8 @@ public final class OpenRoadmOtnTopology {
 
         //return ietfNode
         return new NodeBuilder()
-            .setNodeId(new NodeId(node.getNodeId() + "-XPDR" + node.getXpdrNb()))
-            .withKey(new NodeKey(new NodeId(node.getNodeId() + "-XPDR" + node.getXpdrNb())))
+            .setNodeId(new NodeId(node.getNodeId() + XPDR + node.getXpdrNb()))
+            .withKey(new NodeKey(new NodeId(node.getNodeId() + XPDR + node.getXpdrNb())))
             .setSupportingNode(createSupportingNodes(node))
             .addAugmentation(Node1.class, otnNodeAug)
             .addAugmentation(org.opendaylight.yang.gen.v1.http.org.openroadm.common.network.rev181130.Node1.class,
@@ -175,29 +180,30 @@ public final class OpenRoadmOtnTopology {
     }
 
     private static Node createMuxpdr(OtnTopoNode node) {
-        //create otn-topology node augmentation
-        TpBandwidthSharing tpBwSh = new TpBandwidthSharingBuilder().build();    // to be completed
+        // create otn-topology node augmentation
+        // TODO: will need to be completed
+        TpBandwidthSharing tpBwSh = new TpBandwidthSharingBuilder().build();
         XpdrAttributes xpdrAttr = new XpdrAttributesBuilder()
-            .setXpdrNumber(Integer.valueOf(node.getXpdrNb()))
+            .setXpdrNumber(Uint16.valueOf(node.getXpdrNb()))
             .build();
 
         List<NonBlockingList> nblList = new ArrayList<>();
         for (int i = 1; i <= node.getNbTpClient(); i++) {
             List<TpId> tpList = new ArrayList<>();
-            TpId tpId = new TpId("XPDR" + node.getXpdrNb() + "-CLIENT" + i);
+            TpId tpId = new TpId("XPDR" + node.getXpdrNb() + CLIENT + i);
             tpList.add(tpId);
             tpId = new TpId("XPDR" + node.getXpdrNb() + "-NETWORK1");
             tpList.add(tpId);
             NonBlockingList nbl = new NonBlockingListBuilder()
-                .setNblNumber(i)
+                .setNblNumber(Uint16.valueOf(i))
                 .setTpList(tpList)
-                .setAvailableInterconnectBandwidth(Long.valueOf(node.getNbTpNetwork() * 10))
-                .setInterconnectBandwidthUnit(Long.valueOf(1000000000))
+                .setAvailableInterconnectBandwidth(Uint32.valueOf(node.getNbTpNetwork() * 10L))
+                .setInterconnectBandwidthUnit(Uint32.valueOf(1000000000))
                 .build();
             nblList.add(nbl);
         }
         OduSwitchingPools oduSwitchPool = new OduSwitchingPoolsBuilder()
-            .setSwitchingPoolNumber(Integer.valueOf(1))
+            .setSwitchingPoolNumber(Uint16.valueOf(1))
             .setSwitchingPoolType(SwitchingPoolTypes.NonBlocking)
             .setNonBlockingList(nblList)
             .build();
@@ -228,8 +234,8 @@ public final class OpenRoadmOtnTopology {
 
         //return ietfNode
         return new NodeBuilder()
-            .setNodeId(new NodeId(node.getNodeId() + "-XPDR" + node.getXpdrNb()))
-            .withKey(new NodeKey(new NodeId(node.getNodeId() + "-XPDR" + node.getXpdrNb())))
+            .setNodeId(new NodeId(node.getNodeId() + XPDR + node.getXpdrNb()))
+            .withKey(new NodeKey(new NodeId(node.getNodeId() + XPDR + node.getXpdrNb())))
             .setSupportingNode(createSupportingNodes(node))
             .addAugmentation(Node1.class, otnNodeAug)
             .addAugmentation(org.opendaylight.yang.gen.v1.http.org.openroadm.common.network.rev181130.Node1.class,
@@ -243,22 +249,22 @@ public final class OpenRoadmOtnTopology {
         List<TpId> tpl = new ArrayList<>();
         TpId tpId = null;
         for (int i = 1; i <= node.getNbTpClient(); i++) {
-            tpId = new TpId("XPDR" + node.getXpdrNb() + "-CLIENT" + i);
+            tpId = new TpId("XPDR" + node.getXpdrNb() + CLIENT + i);
             tpl.add(tpId);
         }
         for (int i = 1; i <= node.getNbTpNetwork(); i++) {
-            tpId = new TpId("XPDR" + node.getXpdrNb() + "-NETWORK" + i);
+            tpId = new TpId("XPDR" + node.getXpdrNb() + NETWORK + i);
             tpl.add(tpId);
         }
         List<NonBlockingList> nblList = new ArrayList<>();
         NonBlockingList nbl = new NonBlockingListBuilder()
-            .setNblNumber(Integer.valueOf(1))
+            .setNblNumber(Uint16.valueOf(1))
             .setTpList(tpl)
             .build();
         nblList.add(nbl);
 
         OduSwitchingPools oduSwitchPool = new OduSwitchingPoolsBuilder()
-            .setSwitchingPoolNumber(Integer.valueOf(1))
+            .setSwitchingPoolNumber(Uint16.valueOf(1))
             .setSwitchingPoolType(SwitchingPoolTypes.NonBlocking)
             .setNonBlockingList(nblList)
             .build();
@@ -268,10 +274,11 @@ public final class OpenRoadmOtnTopology {
             .setOduSwitchingPools(oduSwitchPoolList)
             .build();
 
-        //create otn-topology node augmentation
-        TpBandwidthSharing tpBwSh = new TpBandwidthSharingBuilder().build();    // to be completed
+        // create otn-topology node augmentation
+        // TODO: will need to be completed
+        TpBandwidthSharing tpBwSh = new TpBandwidthSharingBuilder().build();
         XpdrAttributes xpdrAttr = new XpdrAttributesBuilder()
-            .setXpdrNumber(Integer.valueOf(node.getXpdrNb()))
+            .setXpdrNumber(Uint16.valueOf(node.getXpdrNb()))
             .build();
 
         Node1 otnNodeAug = new Node1Builder()
@@ -295,8 +302,8 @@ public final class OpenRoadmOtnTopology {
 
         //return ietfNode
         return new NodeBuilder()
-            .setNodeId(new NodeId(node.getNodeId() + "-XPDR" + node.getXpdrNb()))
-            .withKey(new NodeKey(new NodeId(node.getNodeId() + "-XPDR" + node.getXpdrNb())))
+            .setNodeId(new NodeId(node.getNodeId() + XPDR + node.getXpdrNb()))
+            .withKey(new NodeKey(new NodeId(node.getNodeId() + XPDR + node.getXpdrNb())))
             .setSupportingNode(createSupportingNodes(node))
             .addAugmentation(Node1.class, otnNodeAug)
             .addAugmentation(org.opendaylight.yang.gen.v1.http.org.openroadm.common.network.rev181130.Node1.class,
@@ -339,20 +346,20 @@ public final class OpenRoadmOtnTopology {
             org.opendaylight.yang.gen.v1.http.transportpce.topology.rev200129.TerminationPoint1Builder tpceTp1Bldr =
                 new org.opendaylight.yang.gen.v1.http.transportpce.topology.rev200129.TerminationPoint1Builder();
             if (OpenroadmTpType.XPONDERNETWORK.equals(tpType)) {
-                TpId tpId = new TpId("XPDR" + node.getXpdrNb() + "-NETWORK" + i);
+                TpId tpId = new TpId("XPDR" + node.getXpdrNb() + NETWORK + i);
                 if (node.getXpdrNetConnectionMap().get(tpId.getValue()) != null) {
                     tpceTp1Bldr.setAssociatedConnectionMapPort(node.getXpdrNetConnectionMap().get(tpId.getValue()));
                 }
                 SupportingTerminationPoint stp = new SupportingTerminationPointBuilder()
                     .setNetworkRef(new NetworkId(NetworkUtils.OVERLAY_NETWORK_ID))
-                    .setNodeRef(new NodeId(node.getNodeId() + "-XPDR" + node.getXpdrNb()))
-                    .setTpRef("XPDR" + node.getXpdrNb() + "-NETWORK" + i)
+                    .setNodeRef(new NodeId(node.getNodeId() + XPDR + node.getXpdrNb()))
+                    .setTpRef("XPDR" + node.getXpdrNb() + NETWORK + i)
                     .build();
                 List<SupportingTerminationPoint> supportTpList = new ArrayList<>();
                 supportTpList.add(stp);
                 tpList.add(buildIetfTp(tpceTp1Bldr, otnTp1, tpType, tpId, supportTpList));
             } else if (OpenroadmTpType.XPONDERCLIENT.equals(tpType)) {
-                TpId tpId = new TpId("XPDR" + node.getXpdrNb() + "-CLIENT" + i);
+                TpId tpId = new TpId("XPDR" + node.getXpdrNb() + CLIENT + i);
                 if (node.getXpdrCliConnectionMap().get(tpId.getValue()) != null) {
                     tpceTp1Bldr.setAssociatedConnectionMapPort(node.getXpdrCliConnectionMap().get(tpId.getValue()));
                 }
@@ -384,9 +391,9 @@ public final class OpenRoadmOtnTopology {
             .build();
         SupportingNode suppNode2 = new SupportingNodeBuilder()
             .setNetworkRef(new NetworkId(NetworkUtils.OVERLAY_NETWORK_ID))
-            .setNodeRef(new NodeId(node.getNodeId() + "-XPDR" + node.getXpdrNb()))
+            .setNodeRef(new NodeId(node.getNodeId() + XPDR + node.getXpdrNb()))
             .withKey(new SupportingNodeKey(new NetworkId(NetworkUtils.OVERLAY_NETWORK_ID),
-                new NodeId(node.getNodeId() + "-XPDR" + node.getXpdrNb())))
+                new NodeId(node.getNodeId() + XPDR + node.getXpdrNb())))
             .build();
         SupportingNode suppNode3 = new SupportingNodeBuilder()
             .setNetworkRef(new NetworkId(NetworkUtils.CLLI_NETWORK_ID))

diff --git a/networkmodel/src/main/java/org/opendaylight/transportpce/networkmodel/util/OpenRoadmTopology.java b/networkmodel/src/main/java/org/opendaylight/transportpce/networkmodel/util/OpenRoadmTopology.java
index 2425f70f4f13833d18d77eb011f4741e2729e20e..2becccb3569e45331213f068368bc0a0f669b69f 100644 (file)
--- a/networkmodel/src/main/java/org/opendaylight/transportpce/networkmodel/util/OpenRoadmTopology.java
+++ b/networkmodel/src/main/java/org/opendaylight/transportpce/networkmodel/util/OpenRoadmTopology.java
@@ -65,6 +65,8 @@ import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.network.top
 import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.network.topology.rev180226.networks.network.node.TerminationPointKey;
 import org.opendaylight.yangtools.yang.binding.InstanceIdentifier;
 import org.opendaylight.yangtools.yang.binding.InstanceIdentifier.InstanceIdentifierBuilder;
+import org.opendaylight.yangtools.yang.common.Uint16;
+import org.opendaylight.yangtools.yang.common.Uint32;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -98,8 +100,7 @@ public final class OpenRoadmTopology {
                 }
             }
             for (String str : nodeShardList) {
-                List<Mapping> interList = new ArrayList<>();
-                interList = mappingList.stream().filter(x -> x.getLogicalConnectionPoint().contains(str))
+                List<Mapping> interList = mappingList.stream().filter(x -> x.getLogicalConnectionPoint().contains(str))
                     .collect(Collectors.toList());
                 if (str.contains("DEG")) {
                     mapDeg.put(str, interList);
@@ -110,14 +111,14 @@ public final class OpenRoadmTopology {
                 }
             }
             // create degree nodes
-            for (String k : mapDeg.keySet()) {
-                NodeBuilder ietfNode = createDegree(k, mapDeg.get(k), mappingNode.getNodeId(),
+            for (Map.Entry<String, List<Mapping>> entry : mapDeg.entrySet()) {
+                NodeBuilder ietfNode = createDegree(entry.getKey(), entry.getValue(), mappingNode.getNodeId(),
                     mappingNode.getNodeInfo().getNodeClli());
                 nodes.add(ietfNode.build());
             }
             // create srg nodes
-            for (String k : mapSrg.keySet()) {
-                NodeBuilder ietfNode = createSrg(k, mapSrg.get(k), mappingNode.getNodeId(),
+            for (Map.Entry<String, List<Mapping>> entry : mapSrg.entrySet()) {
+                NodeBuilder ietfNode = createSrg(entry.getKey(), entry.getValue(), mappingNode.getNodeId(),
                     mappingNode.getNodeInfo().getNodeClli());
                 nodes.add(ietfNode.build());
             }
@@ -278,7 +279,7 @@ public final class OpenRoadmTopology {
         tpList.add(ietfTpBldr.build());
         // set degree-attributes
         DegreeAttributes degAtt = new DegreeAttributesBuilder()
-            .setDegreeNumber(Integer.valueOf(degNb.split("DEG")[1]))
+            .setDegreeNumber(Uint16.valueOf(degNb.split("DEG")[1]))
             .setAvailableWavelengths(create96AvalWaveDegree()).build();
         // Create ietf node augmentation to support ietf tp-list
         org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.network.topology.rev180226
@@ -475,7 +476,7 @@ public final class OpenRoadmTopology {
 
     // This method returns the linkBuilder object for given source and destination
     public static boolean deleteLinkLinkId(LinkId linkId , NetworkTransactionService networkTransactionService) {
-        LOG.info("deleting link for LinkId: {}", linkId);
+        LOG.info("deleting link for LinkId: {}", linkId.getValue());
         try {
             InstanceIdentifierBuilder<Link> linkIID = InstanceIdentifier.builder(Networks.class).child(Network.class,
                 new NetworkKey(new NetworkId(NetworkUtils.OVERLAY_NETWORK_ID))).augmentation(Network1.class)
@@ -503,7 +504,7 @@ public final class OpenRoadmTopology {
             }
 
         } catch (InterruptedException | ExecutionException | TimeoutException e) {
-            LOG.error(e.getMessage(), e);
+            LOG.error("Error deleting link {}", linkId.getValue(), e);
             return false;
         }
     }
@@ -513,8 +514,8 @@ public final class OpenRoadmTopology {
 
         for (int i = 1; i < 97; i++) {
             AvailableWavelengthsBuilder avalBldr = new AvailableWavelengthsBuilder()
-                .setIndex((long) i)
-                .withKey(new AvailableWavelengthsKey((long) i));
+                .setIndex(Uint32.valueOf(i))
+                .withKey(new AvailableWavelengthsKey(Uint32.valueOf(i)));
             waveList.add(avalBldr.build());
         }
 
@@ -531,9 +532,9 @@ public final class OpenRoadmTopology {
             org.opendaylight.yang.gen.v1.http.org.openroadm.srg.rev181130.srg.node.attributes
                 .AvailableWavelengthsBuilder avalBldr = new org.opendaylight.yang.gen.v1.http.org.openroadm.srg
                 .rev181130.srg.node.attributes.AvailableWavelengthsBuilder()
-                .setIndex((long) i)
+                .setIndex(Uint32.valueOf(i))
                 .withKey(new org.opendaylight.yang.gen.v1.http.org.openroadm.srg.rev181130.srg.node.attributes
-                    .AvailableWavelengthsKey((long) i));
+                    .AvailableWavelengthsKey(Uint32.valueOf(i)));
             waveList.add(avalBldr.build());
         }
         return waveList;

diff --git a/networkmodel/src/main/java/org/opendaylight/transportpce/networkmodel/util/TopologyUtils.java b/networkmodel/src/main/java/org/opendaylight/transportpce/networkmodel/util/TopologyUtils.java
index 2d001439488df24adabf04d6be286c91b43edf05..249873f4117d29d5f58e6fb52bc893b1be08f77e 100644 (file)
--- a/networkmodel/src/main/java/org/opendaylight/transportpce/networkmodel/util/TopologyUtils.java
+++ b/networkmodel/src/main/java/org/opendaylight/transportpce/networkmodel/util/TopologyUtils.java
@@ -82,7 +82,7 @@ public final class TopologyUtils {
 
     // This method returns the linkBuilder object for given source and destination
     public static boolean deleteLinkLinkId(LinkId linkId , NetworkTransactionService networkTransactionService) {
-        LOG.info("deleting link for LinkId: {}", linkId);
+        LOG.info("deleting link for LinkId: {}", linkId.getValue());
         try {
             InstanceIdentifier.InstanceIdentifierBuilder<Link> linkIID = InstanceIdentifier.builder(Networks.class)
                 .child(Network.class, new NetworkKey(new NetworkId(NetworkUtils.OVERLAY_NETWORK_ID)))
@@ -105,7 +105,7 @@ public final class TopologyUtils {
             }
 
         } catch (InterruptedException | ExecutionException | TimeoutException e) {
-            LOG.error(e.getMessage(), e);
+            LOG.error("Error deleting link {}", linkId.getValue(), e);
             return false;
         }
     }