Removing OCH singal from intent created from TAPI.
This enables ONOS to compute lambda according to LambdaQuery
Change-Id: I360e2c008eadc5c597374e0d3d49e49b3770ff2e
diff --git a/apps/odtn/service/src/main/java/org/onosproject/odtn/impl/ServiceApplicationComponent.java b/apps/odtn/service/src/main/java/org/onosproject/odtn/impl/ServiceApplicationComponent.java
index e9985c6..2971f9f 100644
--- a/apps/odtn/service/src/main/java/org/onosproject/odtn/impl/ServiceApplicationComponent.java
+++ b/apps/odtn/service/src/main/java/org/onosproject/odtn/impl/ServiceApplicationComponent.java
@@ -84,8 +84,6 @@
import org.onosproject.net.intent.Key;
import org.onosproject.net.intent.OpticalConnectivityIntent;
import org.onosproject.net.optical.OchPort;
-import org.onosproject.net.ChannelSpacing;
-import org.onosproject.net.OchSignal;
import org.onosproject.net.OduSignalType;
import java.util.Objects;
@@ -253,7 +251,7 @@
*/
protected Intent createOpticalIntent(ConnectPoint ingress, ConnectPoint egress,
Key key, ApplicationId appId) {
- Intent intent = null;
+
if (ingress == null || egress == null) {
log.error("Invalid endpoint(s) for optical intent: ingress {}, egress {}",
ingress, egress);
@@ -268,19 +266,15 @@
return null;
}
- // OchSignal signal = new OchSignal(GridType.FLEX, ChannelSpacing.CHL_6P25GHZ, 1, 1);
- OchSignal signal = OchSignal.newDwdmSlot(ChannelSpacing.CHL_50GHZ, 1);
OduSignalType signalType = ((OchPort) srcPort).signalType();
- intent = OpticalConnectivityIntent.builder()
+ return OpticalConnectivityIntent.builder()
.appId(appId)
.key(key)
.src(ingress)
.dst(egress)
.signalType(signalType)
- .bidirectional(true)
- .ochSignal(signal)
+ .bidirectional(true) //TODO Revisit this.
.build();
- return intent;
}