Optical related minor fixes
Change-Id: Ic13017ce7a294b7eb55374d287173a7eef6e3259
diff --git a/core/api/src/main/java/org/onosproject/net/OchSignal.java b/core/api/src/main/java/org/onosproject/net/OchSignal.java
index d0dfdf3..dfb36ae 100644
--- a/core/api/src/main/java/org/onosproject/net/OchSignal.java
+++ b/core/api/src/main/java/org/onosproject/net/OchSignal.java
@@ -78,7 +78,10 @@
* @param channel channel number
* @param maxFrequency maximum frequency
* @param grid grid spacing frequency
+ *
+ * @deprecated in Emu (ONOS 1.4).
*/
+ @Deprecated
public OchSignal(int channel, Frequency maxFrequency, Frequency grid) {
// Calculate center frequency
Frequency centerFrequency = maxFrequency.subtract(grid.multiply(channel - 1));
@@ -89,6 +92,7 @@
this.slotGranularity = (int) Math.round((double) grid.asHz() / ChannelSpacing.CHL_12P5GHZ.frequency().asHz());
}
+ @Deprecated
public OchSignal(Frequency centerFrequency, ChannelSpacing channelSpacing, int slotGranularity) {
this.gridType = DEFAULT_OCH_GRIDTYPE;
this.channelSpacing = channelSpacing;
diff --git a/core/api/src/main/java/org/onosproject/net/flow/criteria/IndexedLambdaCriterion.java b/core/api/src/main/java/org/onosproject/net/flow/criteria/IndexedLambdaCriterion.java
index bc612cd..17ea2d0 100644
--- a/core/api/src/main/java/org/onosproject/net/flow/criteria/IndexedLambdaCriterion.java
+++ b/core/api/src/main/java/org/onosproject/net/flow/criteria/IndexedLambdaCriterion.java
@@ -24,6 +24,8 @@
/**
* Implementation of indexed lambda criterion.
+ *
+ * @deprecated in Emu (ONOS 1.4).
*/
@Deprecated
public class IndexedLambdaCriterion implements Criterion {
diff --git a/tools/test/topos/optical2.py b/tools/test/topos/optical2.py
old mode 100644
new mode 100755
diff --git a/tools/test/topos/opticalTest.py b/tools/test/topos/opticalTest.py
old mode 100644
new mode 100755
diff --git a/tools/test/topos/opticalTestBig.py b/tools/test/topos/opticalTestBig.py
old mode 100644
new mode 100755