Code Review / transportpce.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | review | tree
raw | inline | side by side
Fix some SpotBugs issues
[transportpce.git] / olm / src / main / java / org / opendaylight / transportpce / olm / power / PowerMgmtImpl.java
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 f751e346013f1f64609765fd2738926b19802dfc..e8fc629d9ca4c64d7ff5be36166da613d2bdb3a8 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
@@ -8,12 +8,13 @@
 
 package org.opendaylight.transportpce.olm.power;
 
+//import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
 import java.math.BigDecimal;
 import java.util.HashMap;
 import java.util.Map;
 import java.util.Optional;
 
-import org.opendaylight.controller.md.sal.binding.api.DataBroker;
+import org.opendaylight.mdsal.binding.api.DataBroker;
 import org.opendaylight.transportpce.common.crossconnect.CrossConnect;
 import org.opendaylight.transportpce.common.device.DeviceTransactionManager;
 import org.opendaylight.transportpce.common.openroadminterfaces.OpenRoadmInterfaceException;
@@ -21,11 +22,12 @@ import org.opendaylight.transportpce.common.openroadminterfaces.OpenRoadmInterfa
 import org.opendaylight.transportpce.olm.util.OlmUtils;
 import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.olm.rev170418.ServicePowerSetupInput;
 import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.olm.rev170418.ServicePowerTurndownInput;
-import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev170228.network.Nodes;
-import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev170228.network.nodes.Mapping;
-import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev170228.network.nodes.MappingKey;
-import org.opendaylight.yang.gen.v1.http.org.openroadm.common.types.rev161014.NodeTypes;
+import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev200128.network.Nodes;
+import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev200128.network.nodes.Mapping;
+import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev200128.network.nodes.MappingKey;
+import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev200128.network.nodes.NodeInfo.OpenroadmVersion;
 import org.opendaylight.yang.gen.v1.http.org.openroadm.common.types.rev161014.OpticalControlMode;
+import org.opendaylight.yang.gen.v1.http.org.openroadm.common.types.rev181019.NodeTypes;
 import org.opendaylight.yang.gen.v1.http.org.openroadm.device.rev170206.interfaces.grp.Interface;
 import org.opendaylight.yang.gen.v1.http.org.openroadm.optical.transport.interfaces.rev161014.Interface1;
 import org.slf4j.Logger;
@@ -57,6 +59,7 @@ public class PowerMgmtImpl implements PowerMgmt {
      * @return true/false based on status of operation.
      */
     //TODO Need to Case Optical Power mode/NodeType in case of 2.2 devices
+    //@SuppressFBwarnings("DM_CONVERT_CASE")
     public Boolean setPower(ServicePowerSetupInput input) {
         LOG.info("Olm-setPower initiated");
         for (int i = 0; i < input.getNodes().size(); i++) {
@@ -66,12 +69,12 @@ public class PowerMgmtImpl implements PowerMgmt {
             Optional<Nodes> inputNodeOptional = OlmUtils.getNode(nodeId, this.db);
             // If node type is transponder
             if (inputNodeOptional.isPresent()
-                    && (inputNodeOptional.get().getNodeType() != null)
-                    && inputNodeOptional.get().getNodeType().equals(NodeTypes.Xpdr)) {
+                    && (inputNodeOptional.get().getNodeInfo().getNodeType() != null)
+                    && inputNodeOptional.get().getNodeInfo().getNodeType().equals(NodeTypes.Xpdr)) {
 
                 Nodes inputNode = inputNodeOptional.get();
-                Nodes.OpenroadmVersion openroadmVersion = inputNode.getOpenroadmVersion();
-                LOG.info("Getting data from input node {}", inputNode.getNodeType());
+                OpenroadmVersion openroadmVersion = inputNode.getNodeInfo().getOpenroadmVersion();
+                LOG.info("Getting data from input node {}", inputNode.getNodeInfo().getNodeType());
                 LOG.info("Getting mapping data for node is {}", inputNode.getMapping().stream().filter(o -> o.key()
                         .equals(new MappingKey(destTpId))).findFirst().toString());
                 // If its A-End transponder
@@ -82,10 +85,10 @@ public class PowerMgmtImpl implements PowerMgmt {
                         String circuitPackName = mappingObject.get().getSupportingCircuitPackName();
                         String portName = mappingObject.get().getSupportingPort();
                         Map<String, Double> txPowerRangeMap = new HashMap<>();
-                        if (openroadmVersion.equals(Nodes.OpenroadmVersion._121)) {
+                        if (openroadmVersion.getIntValue() == 1) {
                             txPowerRangeMap = PowerMgmtVersion121.getXponderPowerRange(circuitPackName, portName,
                                     nodeId, deviceTransactionManager);
-                        } else if (openroadmVersion.equals(Nodes.OpenroadmVersion._221)) {
+                        } else if (openroadmVersion.getIntValue() == 2) {
                             txPowerRangeMap = PowerMgmtVersion221.getXponderPowerRange(circuitPackName, portName,
                                     nodeId, deviceTransactionManager);
                         }
@@ -100,12 +103,12 @@ public class PowerMgmtImpl implements PowerMgmt {
                                                     .equals(new MappingKey(srgId))).findFirst());
                             if (mappingObjectSRG.isPresent()) {
 
-                                if (openroadmVersion.equals(Nodes.OpenroadmVersion._121)) {
+                                if (openroadmVersion.getIntValue() == 1) {
                                     rxSRGPowerRangeMap = PowerMgmtVersion121.getSRGRxPowerRange(nextNodeId, srgId,
                                             deviceTransactionManager, mappingObjectSRG.get()
                                             .getSupportingCircuitPackName(),
                                             mappingObjectSRG.get().getSupportingPort());
-                                } else if (inputNode.getOpenroadmVersion().equals(Nodes.OpenroadmVersion._221)) {
+                                } else if (openroadmVersion.getIntValue() == 2) {
                                     rxSRGPowerRangeMap = PowerMgmtVersion221.getSRGRxPowerRange(nextNodeId, srgId,
                                             deviceTransactionManager, mappingObjectSRG.get()
                                             .getSupportingCircuitPackName(),
@@ -162,11 +165,11 @@ public class PowerMgmtImpl implements PowerMgmt {
                     LOG.info("{} is a drop node. Net power settings needed", nodeId);
                 }
             } else if (inputNodeOptional.isPresent()
-                    && (inputNodeOptional.get().getNodeType() != null)
-                    && inputNodeOptional.get().getNodeType().equals(NodeTypes.Rdm)) {
+                    && (inputNodeOptional.get().getNodeInfo().getNodeType() != null)
+                    && inputNodeOptional.get().getNodeInfo().getNodeType().equals(NodeTypes.Rdm)) {
                 // If Degree is transmitting end then set power
                 Nodes inputNode = inputNodeOptional.get();
-                Nodes.OpenroadmVersion openroadmVersion = inputNode.getOpenroadmVersion();
+                OpenroadmVersion openroadmVersion = inputNode.getNodeInfo().getOpenroadmVersion();
                 LOG.info("This is a roadm {} device", openroadmVersion.getName());
                 String connectionNumber = srcTpId + "-" + destTpId + "-" + input.getWaveNumber();
                 LOG.info("Connection number is {}", connectionNumber);
@@ -178,7 +181,7 @@ public class PowerMgmtImpl implements PowerMgmt {
                         LOG.info("Dest point is Degree {}", mappingObjectOptional.get());
                         Mapping portMapping = mappingObjectOptional.get();
                         // debut reprise
-                        if (openroadmVersion.equals(Nodes.OpenroadmVersion._121)) {
+                        if (openroadmVersion.getIntValue() == 1) {
                             Optional<Interface> interfaceOpt;
                             try {
                                 interfaceOpt =
@@ -206,7 +209,7 @@ public class PowerMgmtImpl implements PowerMgmt {
                                     nodeId);
                                 return false;
                             }
-                        } else if (openroadmVersion.equals(Nodes.OpenroadmVersion._221)) {
+                        } else if (openroadmVersion.getIntValue() == 2) {
                             Optional<org.opendaylight.yang.gen.v1.http.org.openroadm.device.rev181019.interfaces.grp
                                 .Interface> interfaceOpt;
                             try {
@@ -260,7 +263,7 @@ public class PowerMgmtImpl implements PowerMgmt {
                                     OpticalControlMode.Power, powerValue, connectionNumber);
                             LOG.info("Success Value is {}", setXconnPowerSuccessVal);
                             if (setXconnPowerSuccessVal) {
-                                LOG.info("Roadm-connection: {} updated ");
+                                LOG.info("Roadm-connection: {} updated ", connectionNumber);
                                 //The value recommended by the white paper is 20 seconds and not 60.
                                 //TODO - commented code because one vendor is not supporting
                                 //GainLoss with target-output-power
@@ -273,7 +276,7 @@ public class PowerMgmtImpl implements PowerMgmt {
                                 return false;
                             }
                         } catch (InterruptedException e) {
-                            LOG.error("Olm-setPower wait failed {}", e);
+                            LOG.error("Olm-setPower wait failed :", e);
                             return false;
                         }
                     }
@@ -282,6 +285,8 @@ public class PowerMgmtImpl implements PowerMgmt {
                     LOG.info("Setting power at drop node");
                     crossConnect.setPowerLevel(nodeId, OpticalControlMode.Power, null, connectionNumber);
                 }
+            } else {
+                LOG.error("OLM-PowerMgmtImpl : Error with node type for node {}", nodeId);
             }
         }
         return true;
@@ -333,7 +338,7 @@ public class PowerMgmtImpl implements PowerMgmt {
                     }
                 } catch (InterruptedException e) {
                     // TODO Auto-generated catch block
-                    LOG.error("Olm-powerTurnDown wait failed {}",e);
+                    LOG.error("Olm-powerTurnDown wait failed: ",e);
                     return false;
                 }
             }
@@ -341,7 +346,7 @@ public class PowerMgmtImpl implements PowerMgmt {
         return true;
     }
 
-    /**
+    /*
      * This method does an edit-config on roadm connection subtree for a given
      * connection number in order to set power level for use by the optical
      * power control.
@@ -358,22 +363,22 @@ public class PowerMgmtImpl implements PowerMgmt {
      *            WaveLength number part of request
      * @return true/false based on status of operation.
      */
-    private boolean setTransponderPowerTx(Nodes inputNode, String destTpId, String srgId,
+    /*private boolean setTransponderPowerTx(Nodes inputNode, String destTpId, String srgId,
                                           String nextNodeId, Long waveLength) {
         Map<String, Double> txPowerRangeMap = null;
         Map<String, Double> rxSRGPowerRangeMap = null;
-        Nodes.OpenroadmVersion openroadmVersion;
+        OpenroadmVersion openroadmVersion;
         Optional<Mapping> mappingObject = inputNode.getMapping().stream().filter(o -> o.key()
                 .equals(new MappingKey(destTpId))).findFirst();
         String nodeId = inputNode.getNodeId();
         if (mappingObject.isPresent()) {
             String circuitPackName = mappingObject.get().getSupportingCircuitPackName();
             String portName = mappingObject.get().getSupportingPort();
-            openroadmVersion = inputNode.getOpenroadmVersion();
-            if (inputNode.getOpenroadmVersion().equals(Nodes.OpenroadmVersion._121)) {
+            openroadmVersion = inputNode.getNodeInfo().getOpenroadmVersion();
+            if (openroadmVersion.getIntValue() == 1) {
                 txPowerRangeMap = PowerMgmtVersion121.getXponderPowerRange(circuitPackName, portName,
                         nodeId, deviceTransactionManager);
-            } else if (inputNode.getOpenroadmVersion().equals(Nodes.OpenroadmVersion._221)) {
+            } else if (openroadmVersion.getIntValue() == 2) {
                 txPowerRangeMap = PowerMgmtVersion221.getXponderPowerRange(circuitPackName, portName,
                         nodeId, deviceTransactionManager);
             }
@@ -388,11 +393,11 @@ public class PowerMgmtImpl implements PowerMgmt {
                                         .equals(new MappingKey(srgId))).findFirst());
                 if (mappingObjectSRG.isPresent()) {
                     LOG.info("Transponder range exists for nodeId: {}", nodeId);
-                    if (inputNode.getOpenroadmVersion().equals(Nodes.OpenroadmVersion._121)) {
+                    if (openroadmVersion.getIntValue() == 1) {
                         rxSRGPowerRangeMap = PowerMgmtVersion121.getSRGRxPowerRange(nextNodeId, srgId,
                                 deviceTransactionManager, mappingObjectSRG.get().getSupportingCircuitPackName(),
                                 mappingObjectSRG.get().getSupportingPort());
-                    } else if (inputNode.getOpenroadmVersion().equals(Nodes.OpenroadmVersion._221)) {
+                    } else if (openroadmVersion.getIntValue() == 2) {
                         rxSRGPowerRangeMap = PowerMgmtVersion221.getSRGRxPowerRange(nextNodeId, srgId,
                                 deviceTransactionManager, mappingObjectSRG.get().getSupportingCircuitPackName(),
                                 mappingObjectSRG.get().getSupportingPort());
@@ -452,7 +457,7 @@ public class PowerMgmtImpl implements PowerMgmt {
             LOG.info("Mapping object not found for nodeId: {}", nodeId);
             return false;
         }
-    }
+    }*/
 
     /**
      * This method retrieves transponder OCH interface and
@@ -469,10 +474,10 @@ public class PowerMgmtImpl implements PowerMgmt {
      * @return true/false based on status of operation
      */
     private boolean callSetTransponderPower(String nodeId, String interfaceName, BigDecimal txPower,
-                                            Nodes.OpenroadmVersion openroadmVersion) {
+                                            OpenroadmVersion openroadmVersion) {
         boolean powerSetupResult = false;
         try {
-            if (openroadmVersion.equals(Nodes.OpenroadmVersion._121)) {
+            if (openroadmVersion.getIntValue() == 1) {
                 Optional<Interface> interfaceOptional;
                 interfaceOptional = openRoadmInterfaces.getInterface(nodeId, interfaceName);
                 if (interfaceOptional.isPresent()) {
@@ -482,7 +487,7 @@ public class PowerMgmtImpl implements PowerMgmt {
                     LOG.error("Interface {} on node {} is not present!", interfaceName, nodeId);
                     return false;
                 }
-            } else if (openroadmVersion.equals(Nodes.OpenroadmVersion._221)) {
+            } else if (openroadmVersion.getIntValue() == 2) {
                 Optional<org.opendaylight.yang.gen.v1.http.org.openroadm.device.rev181019.interfaces.grp
                         .Interface> interfaceOptional;
                 interfaceOptional = openRoadmInterfaces.getInterface(nodeId, interfaceName);
@@ -509,7 +514,7 @@ public class PowerMgmtImpl implements PowerMgmt {
         }
     }
 
-    /**
+    /*
      * This method retrieves transponder OCH interface and
      * sets power.
      *
@@ -523,8 +528,8 @@ public class PowerMgmtImpl implements PowerMgmt {
      *            Wavelength Number    *
      * @return true/false based on status of operation
      */
-    private boolean callSetRoadmPowerTx(String nodeId, String interfaceName,
-                                        Nodes.OpenroadmVersion openroadmVersion,
+    /*private boolean callSetRoadmPowerTx(String nodeId, String interfaceName,
+                                        OpenroadmVersion openroadmVersion,
                                         Long wavelength, String connectionNumber) {
         if (interfaceName == null) {
             crossConnect.setPowerLevel(nodeId,
@@ -532,7 +537,7 @@ public class PowerMgmtImpl implements PowerMgmt {
             return true;
         }
         try {
-            if (openroadmVersion.equals(Nodes.OpenroadmVersion._121)) {
+            if (openroadmVersion.getIntValue() == 1) {
                 Optional<Interface> interfaceOpt;
                 interfaceOpt = openRoadmInterfaces.getInterface(nodeId, interfaceName);
                 if (interfaceOpt.isPresent()) {
@@ -559,7 +564,7 @@ public class PowerMgmtImpl implements PowerMgmt {
                     LOG.error("Interface {} on node {} is not present!", interfaceName, nodeId);
                     return false;
                 }
-            } else if (openroadmVersion.equals(Nodes.OpenroadmVersion._221)) {
+            } else if (openroadmVersion.getIntValue() == 2) {
                 Optional<org.opendaylight.yang.gen.v1.http.org.openroadm.device.rev181019.interfaces
                         .grp.Interface> interfaceOpt;
                 interfaceOpt = openRoadmInterfaces.getInterface(nodeId, interfaceName);
@@ -591,6 +596,6 @@ public class PowerMgmtImpl implements PowerMgmt {
             return false;
         }
         return false;
-    }
+    }*/
 
 }
Repository for Transport PCE project.