Refactor code after Chlorine Bump

Signed-off-by: guillaume.lambert <guillaume.lambert@orange.com>
Change-Id: I3d1f875d8c5f5afe883b9556f1aaaac5a18fef36

diff --git a/common/src/main/java/org/opendaylight/transportpce/common/crossconnect/CrossConnectImpl.java b/common/src/main/java/org/opendaylight/transportpce/common/crossconnect/CrossConnectImpl.java
index 108905983d54842b9adf17dc381f67b557c1139d..f39bdab95ef796425d44b16f039f20ecad5a9fbb 100644 (file)
--- a/common/src/main/java/org/opendaylight/transportpce/common/crossconnect/CrossConnectImpl.java
+++ b/common/src/main/java/org/opendaylight/transportpce/common/crossconnect/CrossConnectImpl.java
@@ -46,38 +46,36 @@ public class CrossConnectImpl implements CrossConnect {
     }
 
     public Optional<?> getCrossConnect(String nodeId, String connectionNumber) {
-        String openRoadmVersion = mappingUtils.getOpenRoadmVersion(nodeId);
-        if (OPENROADM_DEVICE_VERSION_1_2_1.equals(openRoadmVersion)) {
-            return crossConnectImpl121.getCrossConnect(nodeId,connectionNumber);
-        }
-        else if (OPENROADM_DEVICE_VERSION_2_2_1.equals(openRoadmVersion)) {
-            return crossConnectImpl221.getCrossConnect(nodeId,connectionNumber);
+        switch (mappingUtils.getOpenRoadmVersion(nodeId)) {
+            case OPENROADM_DEVICE_VERSION_1_2_1:
+                return crossConnectImpl121.getCrossConnect(nodeId,connectionNumber);
+            case OPENROADM_DEVICE_VERSION_2_2_1:
+                return crossConnectImpl221.getCrossConnect(nodeId,connectionNumber);
+            default:
+                return Optional.empty();
         }
-        return Optional.empty();
     }
 
 
     public Optional<String> postCrossConnect(String nodeId, String srcTp, String destTp,
             SpectrumInformation spectrumInformation) {
         String openRoadmVersion = mappingUtils.getOpenRoadmVersion(nodeId);
-        LOG.info("Cross Connect post request received for node {} with version {}",nodeId,openRoadmVersion);
-        if (OPENROADM_DEVICE_VERSION_1_2_1.equals(openRoadmVersion)) {
-            LOG.info("Device Version is 1.2.1");
-            return crossConnectImpl121.postCrossConnect(nodeId, srcTp, destTp, spectrumInformation);
-        }
-        else if (OPENROADM_DEVICE_VERSION_2_2_1.equals(openRoadmVersion)) {
-            LOG.info("Device Version is 2.2");
-            return crossConnectImpl221.postCrossConnect(nodeId, srcTp, destTp,
-                    spectrumInformation);
+        LOG.info("Cross Connect post request received for node {} with version {}", nodeId, openRoadmVersion);
+        switch (openRoadmVersion) {
+            case OPENROADM_DEVICE_VERSION_1_2_1:
+                LOG.info("Device Version is 1.2.1");
+                return crossConnectImpl121.postCrossConnect(nodeId, srcTp, destTp, spectrumInformation);
+            case OPENROADM_DEVICE_VERSION_2_2_1:
+                LOG.info("Device Version is 2.2.1");
+                return crossConnectImpl221.postCrossConnect(nodeId, srcTp, destTp, spectrumInformation);
+            default:
+                LOG.info("Device Version not found");
+                return Optional.empty();
         }
-        LOG.info("Device Version not found");
-        return Optional.empty();
-
     }
 
 
     public List<String> deleteCrossConnect(String nodeId, String connectionNumber, Boolean isOtn) {
-
         switch (mappingUtils.getOpenRoadmVersion(nodeId)) {
             case OPENROADM_DEVICE_VERSION_1_2_1:
                 return crossConnectImpl121.deleteCrossConnect(nodeId, connectionNumber);
@@ -93,46 +91,52 @@ public class CrossConnectImpl implements CrossConnect {
     public List<?> getConnectionPortTrail(String nodeId, String srcTp, String destTp, int lowerSpectralSlotNumber,
             int higherSpectralSlotNumber)
             throws OpenRoadmInterfaceException {
-        String openRoadmVersion = mappingUtils.getOpenRoadmVersion(nodeId);
-        if (OPENROADM_DEVICE_VERSION_1_2_1.equals(openRoadmVersion)) {
-            return crossConnectImpl121.getConnectionPortTrail(nodeId, srcTp, destTp,
-                    lowerSpectralSlotNumber, higherSpectralSlotNumber);
-        }
-        else if (OPENROADM_DEVICE_VERSION_2_2_1.equals(openRoadmVersion)) {
-            return crossConnectImpl221
+        switch (mappingUtils.getOpenRoadmVersion(nodeId)) {
+            case OPENROADM_DEVICE_VERSION_1_2_1:
+                return crossConnectImpl121
                     .getConnectionPortTrail(nodeId, srcTp, destTp, lowerSpectralSlotNumber, higherSpectralSlotNumber);
+            case OPENROADM_DEVICE_VERSION_2_2_1:
+                return crossConnectImpl221
+                    .getConnectionPortTrail(nodeId, srcTp, destTp, lowerSpectralSlotNumber, higherSpectralSlotNumber);
+            default:
+                return null;
         }
-        return null;
     }
 
     @Override
     public boolean setPowerLevel(String nodeId, String mode, Decimal64 powerValue, String connectionNumber) {
-        String openRoadmVersion = mappingUtils.getOpenRoadmVersion(nodeId);
-        if (OPENROADM_DEVICE_VERSION_1_2_1.equals(openRoadmVersion) && OpticalControlMode.forName(mode) != null) {
-            return crossConnectImpl121.setPowerLevel(nodeId,OpticalControlMode.forName(mode), powerValue,
-                connectionNumber);
-        }
-        else if (OPENROADM_DEVICE_VERSION_2_2_1.equals(openRoadmVersion)
-                && org.opendaylight.yang.gen.v1.http.org.openroadm.common.types.rev181019.OpticalControlMode
-                    .forName(mode) != null) {
-            return crossConnectImpl221.setPowerLevel(nodeId,
-                org.opendaylight.yang.gen.v1.http.org.openroadm.common.types.rev181019.OpticalControlMode.forName(mode),
-                powerValue, connectionNumber);
+        switch (mappingUtils.getOpenRoadmVersion(nodeId)) {
+            case OPENROADM_DEVICE_VERSION_1_2_1:
+                if (OpticalControlMode.forName(mode) == null) {
+                    return false;
+                }
+                return crossConnectImpl121.setPowerLevel(nodeId,
+                    OpticalControlMode.forName(mode),
+                    powerValue, connectionNumber);
+            case OPENROADM_DEVICE_VERSION_2_2_1:
+                if (org.opendaylight.yang.gen.v1.http.org.openroadm.common.types.rev181019.OpticalControlMode
+                        .forName(mode) == null) {
+                    return false;
+                }
+                return crossConnectImpl221.setPowerLevel(nodeId,
+                    org.opendaylight.yang.gen.v1.http.org.openroadm.common.types.rev181019.OpticalControlMode
+                        .forName(mode),
+                    powerValue, connectionNumber);
+            default:
+                return false;
         }
-        return false;
     }
 
     @Override
     public Optional<String> postOtnCrossConnect(List<String> createdOduInterfaces, Nodes node)
             throws OpenRoadmInterfaceException {
-        String openRoadmVersion = mappingUtils.getOpenRoadmVersion(node.getNodeId());
-
-        if (OPENROADM_DEVICE_VERSION_2_2_1.equals(openRoadmVersion)) {
-            return crossConnectImpl221.postOtnCrossConnect(createdOduInterfaces, node);
-        }
-        else if (OPENROADM_DEVICE_VERSION_7_1.equals(openRoadmVersion)) {
-            return crossConnectImpl710.postOtnCrossConnect(createdOduInterfaces, node);
+        switch (mappingUtils.getOpenRoadmVersion(node.getNodeId())) {
+            case OPENROADM_DEVICE_VERSION_2_2_1:
+                return crossConnectImpl221.postOtnCrossConnect(createdOduInterfaces, node);
+            case OPENROADM_DEVICE_VERSION_7_1:
+                return crossConnectImpl710.postOtnCrossConnect(createdOduInterfaces, node);
+            default:
+                return Optional.empty();
         }
-        return Optional.empty();
     }
 }

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 cded0f0779dff2d7e1089aa6dc9ed7a65b0c1b1d..ae65f9951ca449aee62a0a263228e3f93e83f35a 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
@@ -102,6 +102,7 @@ public class PortMappingVersion121 {
             Direction.Bidirectional, "TXRX");
     }
 
+
     public PortMappingVersion121(DataBroker dataBroker, DeviceTransactionManager deviceTransactionManager) {
         this.dataBroker = dataBroker;
         this.deviceTransactionManager = deviceTransactionManager;
@@ -610,8 +611,7 @@ public class PortMappingVersion121 {
     }
 
     private MappingBuilder updateMappingInterfaces(String nodeId, MappingBuilder mpBldr, Ports port) {
-        mpBldr.setSupportingOtu4(null)
-            .setSupportingOdu4(null);
+        mpBldr.setSupportingOtu4(null).setSupportingOdu4(null);
         for (Interfaces interfaces : port.getInterfaces()) {
             Optional<Interface> openRoadmInterface = getInterfaceFromDevice(nodeId, interfaces.getInterfaceName());
             if (openRoadmInterface.isEmpty()) {
@@ -619,23 +619,18 @@ public class PortMappingVersion121 {
                     nodeId, interfaces.getInterfaceName() + "- empty interface");
                 continue;
             }
-            LOG.debug(PortMappingUtils.GOT_INTF_LOGMSG,
-                nodeId, openRoadmInterface.get().getName(), openRoadmInterface.get().getType());
             InterfaceType interfaceType = openRoadmInterface.get().getType();
-            // Check if interface type is OMS or OTS
+            LOG.debug(PortMappingUtils.GOT_INTF_LOGMSG, nodeId, openRoadmInterface.get().getName(), interfaceType);
+            // Switch/Case might be more indicated here but is not possible in jdk17 w/o enable-preview
             if (interfaceType.equals(OpenROADMOpticalMultiplex.VALUE)) {
                 mpBldr.setSupportingOms(interfaces.getInterfaceName());
-            }
-            if (interfaceType.equals(OpticalTransport.VALUE)) {
+            } else if (interfaceType.equals(OpticalTransport.VALUE)) {
                 mpBldr.setSupportingOts(interfaces.getInterfaceName());
-            }
-            if (interfaceType.equals(OtnOtu.VALUE)) {
+            } else if (interfaceType.equals(OtnOtu.VALUE)) {
                 mpBldr.setSupportingOtu4(interfaces.getInterfaceName());
-            }
-            if (interfaceType.equals(OtnOdu.VALUE)) {
+            } else if (interfaceType.equals(OtnOdu.VALUE)) {
                 mpBldr.setSupportingOdu4(interfaces.getInterfaceName());
-            }
-            if (interfaceType.equals(EthernetCsmacd.VALUE)) {
+            } else if (interfaceType.equals(EthernetCsmacd.VALUE)) {
                 mpBldr.setSupportingEthernet(interfaces.getInterfaceName());
             }
         }

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 eac3516d2656bbffdcf85dc16fc6cbdb9ce8c724..d92c69905ee10a57f47fb90629c96019ebfddd05 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
@@ -829,8 +829,7 @@ public class PortMappingVersion221 {
     }
 
     private MappingBuilder updateMappingInterfaces(String nodeId, MappingBuilder mpBldr, Ports port) {
-        mpBldr.setSupportingOtu4(null)
-            .setSupportingOdu4(null);
+        mpBldr.setSupportingOtu4(null).setSupportingOdu4(null);
         for (Interfaces interfaces : port.getInterfaces()) {
             Optional<Interface> openRoadmInterface = getInterfaceFromDevice(nodeId,
                 interfaces.getInterfaceName());
@@ -839,23 +838,19 @@ public class PortMappingVersion221 {
                     nodeId, interfaces.getInterfaceName() + "- empty interface");
                 continue;
             }
-            LOG.debug(PortMappingUtils.GOT_INTF_LOGMSG,
-                nodeId, openRoadmInterface.get().getName(), openRoadmInterface.get().getType());
             InterfaceType interfaceType = openRoadmInterface.get().getType();
+            LOG.debug(PortMappingUtils.GOT_INTF_LOGMSG, nodeId, openRoadmInterface.get().getName(), interfaceType);
             // Check if interface type is OMS or OTS
+            // Switch/Case might be more indicated here but is not possible in jdk17 w/o enable-preview
             if (interfaceType.equals(OpenROADMOpticalMultiplex.VALUE)) {
                 mpBldr.setSupportingOms(interfaces.getInterfaceName());
-            }
-            if (interfaceType.equals(OpticalTransport.VALUE)) {
+            } else if (interfaceType.equals(OpticalTransport.VALUE)) {
                 mpBldr.setSupportingOts(interfaces.getInterfaceName());
-            }
-            if (interfaceType.equals(OtnOtu.VALUE)) {
+            } else if (interfaceType.equals(OtnOtu.VALUE)) {
                 mpBldr.setSupportingOtu4(interfaces.getInterfaceName());
-            }
-            if (interfaceType.equals(OtnOdu.VALUE)) {
+            } else if (interfaceType.equals(OtnOdu.VALUE)) {
                 mpBldr.setSupportingOdu4(interfaces.getInterfaceName());
-            }
-            if (interfaceType.equals(EthernetCsmacd.VALUE)) {
+            } else if (interfaceType.equals(EthernetCsmacd.VALUE)) {
                 mpBldr.setSupportingEthernet(interfaces.getInterfaceName());
             }
         }

diff --git a/common/src/main/java/org/opendaylight/transportpce/common/mapping/PortMappingVersion710.java b/common/src/main/java/org/opendaylight/transportpce/common/mapping/PortMappingVersion710.java
index 1a6985b2192fb9ee16d5c176bccd1f71ba729ff0..7d760df44f73a8796dc9dbe9eed848c7e2eb2f9b 100644 (file)
--- a/common/src/main/java/org/opendaylight/transportpce/common/mapping/PortMappingVersion710.java
+++ b/common/src/main/java/org/opendaylight/transportpce/common/mapping/PortMappingVersion710.java
@@ -983,36 +983,33 @@ public class PortMappingVersion710 {
                     nodeId, interfaces.getInterfaceName() + "- empty interface");
                 continue;
             }
-            LOG.debug(PortMappingUtils.GOT_INTF_LOGMSG,
-                nodeId, openRoadmInterface.get().getName(), openRoadmInterface.get().getType());
             InterfaceType interfaceType = openRoadmInterface.get().getType();
+            LOG.debug(PortMappingUtils.GOT_INTF_LOGMSG, nodeId, openRoadmInterface.get().getName(), interfaceType);
             // Check if interface type is OMS or OTS
+            // Switch/Case might be more indicated here but is not possible in jdk17 w/o enable-preview
             if (interfaceType.equals(OpenROADMOpticalMultiplex.VALUE)) {
                 mpBldr.setSupportingOms(interfaces.getInterfaceName());
-            }
-            if (interfaceType.equals(OpticalTransport.VALUE)) {
+            } else if (interfaceType.equals(OpticalTransport.VALUE)) {
                 mpBldr.setSupportingOts(interfaces.getInterfaceName());
-            }
-            String interfaceName = interfaces.getInterfaceName();
-            if (interfaceType.equals(OtnOtu.VALUE)
-                && (interfaceName.substring(interfaceName.lastIndexOf("-") + 1)
-                .equals("OTU4"))) {
-                mpBldr.setSupportingOtu4(interfaces.getInterfaceName());
-            }
-            if ((interfaceType.equals(OtnOtu.VALUE))
-                && (interfaceName.substring(interfaceName.lastIndexOf("-") + 1)
-                .contains("OTUC"))) {
-                mpBldr.setSupportingOtucn(interfaces.getInterfaceName());
-            }
-            if (interfaceType.equals(OtnOdu.VALUE)
-                && (interfaceName.substring(interfaceName.lastIndexOf("-") + 1)
-                .equals("ODU4"))) {
-                mpBldr.setSupportingOdu4(interfaces.getInterfaceName());
-            }
-            if ((interfaceType.equals(OtnOdu.VALUE))
-                && (interfaceName.substring(interfaceName.lastIndexOf("-") + 1)
-                .contains("ODUC"))) {
-                mpBldr.setSupportingOducn(interfaces.getInterfaceName());
+            //TODO check if the following lines for Eth CSMACD present in 1.2.1 and 2.2.1 were not forgotten in 7.1
+            //} else if(interfaceType.equals(EthernetCsmacd.VALUE)) {
+            //    mpBldr.setSupportingEthernet(interfaces.getInterfaceName());
+            } else if (interfaceType.equals(OtnOtu.VALUE)) {
+                String interfaceName = interfaces.getInterfaceName();
+                String suffix = interfaceName.substring(interfaceName.lastIndexOf("-") + 1);
+                if (suffix.equals("OTU4")) {
+                    mpBldr.setSupportingOtu4(interfaces.getInterfaceName());
+                } else if (suffix.contains("OTUC")) {
+                    mpBldr.setSupportingOtucn(interfaces.getInterfaceName());
+                }
+            } else if (interfaceType.equals(OtnOdu.VALUE)) {
+                String interfaceName = interfaces.getInterfaceName();
+                String suffix = interfaceName.substring(interfaceName.lastIndexOf("-") + 1);
+                if (suffix.equals("ODU4")) {
+                    mpBldr.setSupportingOdu4(interfaces.getInterfaceName());
+                } else if (suffix.contains("ODUC")) {
+                    mpBldr.setSupportingOducn(interfaces.getInterfaceName());
+                }
             }
         }
         return mpBldr;

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 1a8eb7aff2274ce82dcbbb467e52f825c900ed1d..c419727d212e99d9ca8817a05ef86742c8927fc4 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
@@ -33,14 +33,10 @@ import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.pce.rev22
 import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev220316.mc.capabilities.McCapabilities;
 import org.opendaylight.yang.gen.v1.http.org.openroadm.common.network.rev211210.Link1;
 import org.opendaylight.yang.gen.v1.http.org.openroadm.common.network.rev211210.Node1;
-//import org.opendaylight.yang.gen.v1.http.org.openroadm.common.network.rev200529.Link1;
-//import org.opendaylight.yang.gen.v1.http.org.openroadm.common.network.rev200529.Node1;
 import org.opendaylight.yang.gen.v1.http.org.openroadm.common.state.types.rev191129.State;
 import org.opendaylight.yang.gen.v1.http.org.openroadm.device.types.rev191129.NodeTypes;
 import org.opendaylight.yang.gen.v1.http.org.openroadm.network.types.rev211210.OpenroadmLinkType;
 import org.opendaylight.yang.gen.v1.http.org.openroadm.network.types.rev211210.OpenroadmNodeType;
-//import org.opendaylight.yang.gen.v1.http.org.openroadm.network.types.rev200529.OpenroadmLinkType;
-//import org.opendaylight.yang.gen.v1.http.org.openroadm.network.types.rev200529.OpenroadmNodeType;
 import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.network.rev180226.NetworkId;
 import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.network.rev180226.Networks;
 import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.network.rev180226.NodeId;
@@ -269,8 +265,6 @@ public class PceCalculation {
             LOG.error("readMdSal: Error reading topology {}", nwInstanceIdentifier);
             networkTransactionService.close();
             returnStructure.setRC(ResponseCodes.RESPONSE_FAILED);
-//            throw new RuntimeException(
-//                "readMdSal: Error reading from operational store, topology : " + nwInstanceIdentifier + " :" + e);
         }
         return nw;
     }

diff --git a/tapi/src/main/java/org/opendaylight/transportpce/tapi/connectivity/ConnectivityUtils.java b/tapi/src/main/java/org/opendaylight/transportpce/tapi/connectivity/ConnectivityUtils.java
index cbfbbf4b10aea67a04684df0bc175fcecb9487cc..54df3b71954e93df3db31982b02536e08cf1db16 100644 (file)
--- a/tapi/src/main/java/org/opendaylight/transportpce/tapi/connectivity/ConnectivityUtils.java
+++ b/tapi/src/main/java/org/opendaylight/transportpce/tapi/connectivity/ConnectivityUtils.java
@@ -1648,8 +1648,7 @@ public final class ConnectivityUtils {
                 .build()));
         if (serviceFormat.equals(ServiceFormat.ODU)) {
             serviceAEndBuilder.setOduServiceRate(ODU4.VALUE);
-        }
-        if (serviceFormat.equals(ServiceFormat.OTU)) {
+        } else if (serviceFormat.equals(ServiceFormat.OTU)) {
             serviceAEndBuilder.setOtuServiceRate(OTU4.VALUE);
         }
         if (!serviceLayer.equals(LayerProtocolName.ETH)) {
@@ -1773,4 +1772,4 @@ public final class ConnectivityUtils {
         }
         return openroadmNodeTypeList.get(0);
     }
-}
\ No newline at end of file
+}