removing some TODOs
Change-Id: Ic98c811573a1b37813993eedddec512ec85729f3
diff --git a/openflow/api/src/main/java/org/onosproject/openflow/controller/OpenFlowPacketContext.java b/openflow/api/src/main/java/org/onosproject/openflow/controller/OpenFlowPacketContext.java
index 9f381cf..dea2731 100644
--- a/openflow/api/src/main/java/org/onosproject/openflow/controller/OpenFlowPacketContext.java
+++ b/openflow/api/src/main/java/org/onosproject/openflow/controller/OpenFlowPacketContext.java
@@ -26,8 +26,6 @@
*/
public interface OpenFlowPacketContext {
- //TODO: may want to support sending packet out other switches than
- // the one it came in on.
/**
* Blocks further responses (ie. send() calls) on this
* packet in event.
diff --git a/openflow/api/src/main/java/org/onosproject/openflow/controller/driver/AbstractOpenFlowSwitch.java b/openflow/api/src/main/java/org/onosproject/openflow/controller/driver/AbstractOpenFlowSwitch.java
index f08c411..b066298 100644
--- a/openflow/api/src/main/java/org/onosproject/openflow/controller/driver/AbstractOpenFlowSwitch.java
+++ b/openflow/api/src/main/java/org/onosproject/openflow/controller/driver/AbstractOpenFlowSwitch.java
@@ -275,8 +275,8 @@
this.transitionToEqualSwitch();
}
} else {
+ log.warn("Failed to set role for {}", this.getStringId());
return;
- //TODO: tell people that we failed.
}
}
diff --git a/openflow/api/src/test/java/org/onosproject/openflow/controller/OpenflowControllerAdapter.java b/openflow/api/src/test/java/org/onosproject/openflow/controller/OpenflowControllerAdapter.java
index 580fbdc..f4fe490 100644
--- a/openflow/api/src/test/java/org/onosproject/openflow/controller/OpenflowControllerAdapter.java
+++ b/openflow/api/src/test/java/org/onosproject/openflow/controller/OpenflowControllerAdapter.java
@@ -81,13 +81,9 @@
@Override
public void addEventListener(OpenFlowEventListener listener) {
- // TODO Auto-generated method stub
-
}
@Override
public void removeEventListener(OpenFlowEventListener listener) {
- // TODO Auto-generated method stub
-
}
}
diff --git a/openflow/drivers/src/main/java/org/onosproject/openflow/drivers/OFOpticalSwitchImplLINC13.java b/openflow/drivers/src/main/java/org/onosproject/openflow/drivers/OFOpticalSwitchImplLINC13.java
index d2631a0..75f2726 100644
--- a/openflow/drivers/src/main/java/org/onosproject/openflow/drivers/OFOpticalSwitchImplLINC13.java
+++ b/openflow/drivers/src/main/java/org/onosproject/openflow/drivers/OFOpticalSwitchImplLINC13.java
@@ -137,7 +137,6 @@
}
}
- //Todo
public void processOFPortStatus(OFCircuitPortStatus ps) {
log.debug("LINC-OE ..OF Port Status :", ps);
diff --git a/openflow/drivers/src/main/java/org/onosproject/openflow/drivers/OFSwitchImplCPqD13.java b/openflow/drivers/src/main/java/org/onosproject/openflow/drivers/OFSwitchImplCPqD13.java
index 0046a02..276395a 100644
--- a/openflow/drivers/src/main/java/org/onosproject/openflow/drivers/OFSwitchImplCPqD13.java
+++ b/openflow/drivers/src/main/java/org/onosproject/openflow/drivers/OFSwitchImplCPqD13.java
@@ -672,9 +672,7 @@
subnetIps.add("10.0.3.0");
subnetIps.add("10.0.1.0");
}
- // TODO needed?
- //if (getId() == 0x2) {
- //}
+
if (getId() == 0x3) {
subnetIps.add("7.7.7.0");
}
@@ -740,9 +738,6 @@
hostNextHopIps.add(new RouteEntry("10.0.2.1", 4, "00:00:00:00:02:01"));
hostNextHopIps.add(new RouteEntry("10.0.3.1", 5, "00:00:00:00:03:01"));
}
- // TODO needed?
- //if (getId() == 0x2) {
- //}
if (getId() == 0x3) {
hostNextHopIps.add(new RouteEntry("7.7.7.7", 1, "00:00:07:07:07:07"));
}