Adapt TransportPCE code to Sulfur

[transportpce.git] / common / src / main / java / org / opendaylight / transportpce / common / crossconnect / CrossConnect.java

diff --git a/common/src/main/java/org/opendaylight/transportpce/common/crossconnect/CrossConnect.java b/common/src/main/java/org/opendaylight/transportpce/common/crossconnect/CrossConnect.java
index 1216452b1c4d1f9cb1d405b66ca4738760bcdda0..3e806f783d11aaa769a707cb1463827aacfc8165 100644 (file)
--- a/common/src/main/java/org/opendaylight/transportpce/common/crossconnect/CrossConnect.java
+++ b/common/src/main/java/org/opendaylight/transportpce/common/crossconnect/CrossConnect.java
@@ -8,10 +8,12 @@
 
 package org.opendaylight.transportpce.common.crossconnect;
 
-import java.math.BigDecimal;
 import java.util.List;
 import java.util.Optional;
+import org.opendaylight.transportpce.common.fixedflex.SpectrumInformation;
 import org.opendaylight.transportpce.common.openroadminterfaces.OpenRoadmInterfaceException;
+import org.opendaylight.yang.gen.v1.http.org.transportpce.common.types.rev210930.otn.renderer.nodes.Nodes;
+import org.opendaylight.yangtools.yang.common.Decimal64;
 
 public interface CrossConnect {
 
@@ -24,9 +26,9 @@ public interface CrossConnect {
      * @param connectionNumber
      *            Name of the cross connect.
      *
-     * @return Roadm connection subtree from the device.
+     * @return optional of Roadm connection subtree from the device.
      */
-    <T> Optional<T> getCrossConnect(String deviceId, String connectionNumber);
+    Optional<?> getCrossConnect(String deviceId, String connectionNumber);
 
     /**
      * This method does a post(edit-config) on roadm connection subtree for a
@@ -34,15 +36,15 @@ public interface CrossConnect {
      *
      * @param deviceId
      *            Device id.
-     * @param waveNumber
-     *            Wavelength number.
      * @param srcTp
      *            Name of source termination point.
      * @param destTp
      *            Name of destination termination point.
+     * @param spectrumInformation SpectrumInformation
      * @return optional of connection number
      */
-    Optional<String> postCrossConnect(String deviceId, Long waveNumber, String srcTp, String destTp);
+    Optional<String> postCrossConnect(String deviceId, String srcTp, String destTp,
+            SpectrumInformation spectrumInformation);
 
     /**
      * This method does a delete(edit-config) on roadm connection subtree for a
@@ -52,11 +54,12 @@ public interface CrossConnect {
      *            Device id.
      * @param connectionNumber
      *            Name of the cross connect.
+     * @param isOtn
+     *            True for odu-connection, False for roadm-connection.
      *
-     * @return true/false based on status of operation.
+     * @return the list of interface-names that were supporting the connection.
      */
-
-    List<String> deleteCrossConnect(String deviceId, String connectionNumber);
+    List<String> deleteCrossConnect(String deviceId, String connectionNumber, Boolean isOtn);
 
     /**
      * This public method returns the list of ports (port-trail) for a roadm's
@@ -65,16 +68,19 @@ public interface CrossConnect {
      *
      * @param nodeId
      *            node-id of NE.
-     * @param waveNumber
-     *            Wavelength number.
      * @param srcTp
      *            Source logical connection point.
      * @param destTp
      *            Destination logical connection point.
-     *
+     * @param lowerSpectralSlotNumber Value of lower spectral slot number.
+     * @param higherSpectralSlotNumber Value of higher spectral slot number.
      * @return list of Ports object type.
+     *
+     * @throws OpenRoadmInterfaceException
+     *            an exception at OpenRoadm interface.
      */
-    <T> List<T> getConnectionPortTrail(String nodeId, Long waveNumber, String srcTp, String destTp)
+    List<?> getConnectionPortTrail(String nodeId, String srcTp, String destTp, int lowerSpectralSlotNumber,
+            int higherSpectralSlotNumber)
             throws OpenRoadmInterfaceException;
 
     /**
@@ -92,6 +98,9 @@ public interface CrossConnect {
      *            Name of the cross connect.
      * @return true/false based on status of operation.
      */
-    boolean setPowerLevel(String deviceId, Enum mode, BigDecimal powerValue,
-                          String connectionNumber);
+    boolean setPowerLevel(String deviceId, String mode, Decimal64 powerValue, String connectionNumber);
+
+    Optional<String> postOtnCrossConnect(List<String> createdOduInterfaces, Nodes node) throws
+            OpenRoadmInterfaceException;
+
 }