[ONOS-5925] Removing 1.6 deprecated optical ports
Change-Id: I2c8583323e6c99d08f3568a81941036fa8e949d8
diff --git a/drivers/optical/src/main/java/org/onosproject/driver/optical/query/DefaultTributarySlotQuery.java b/drivers/optical/src/main/java/org/onosproject/driver/optical/query/DefaultTributarySlotQuery.java
index c424272..ef0fb7c 100644
--- a/drivers/optical/src/main/java/org/onosproject/driver/optical/query/DefaultTributarySlotQuery.java
+++ b/drivers/optical/src/main/java/org/onosproject/driver/optical/query/DefaultTributarySlotQuery.java
@@ -82,15 +82,9 @@
private Set<TributarySlot> queryOchTributarySlots(Port ochPort) {
OduSignalType signalType = null;
- if (ochPort instanceof org.onosproject.net.OchPort) {
- // remove once deprecation of old OchPort model is done
- signalType = ((org.onosproject.net.OchPort) ochPort).signalType();
- }
if (ochPort instanceof OchPort) {
signalType = ((OchPort) ochPort).signalType();
- }
-
- if (signalType == null) {
+ } else {
log.warn("{} was not an OchPort", ochPort);
return Collections.emptySet();
}
@@ -108,15 +102,9 @@
private Set<TributarySlot> queryOtuTributarySlots(Port otuPort) {
OtuSignalType signalType = null;
- if (otuPort instanceof org.onosproject.net.OtuPort) {
- // remove once deprecation of old OtuPort model is done
- signalType = ((org.onosproject.net.OtuPort) otuPort).signalType();
- }
if (otuPort instanceof OtuPort) {
signalType = ((OtuPort) otuPort).signalType();
- }
-
- if (signalType == null) {
+ } else {
log.warn("{} was not an OtuPort", otuPort);
return Collections.emptySet();
}