removing some TODOs
Change-Id: Ic98c811573a1b37813993eedddec512ec85729f3
diff --git a/providers/lldp/src/main/java/org/onosproject/provider/lldp/impl/LLDPLinkProvider.java b/providers/lldp/src/main/java/org/onosproject/provider/lldp/impl/LLDPLinkProvider.java
index 044dbc8..ba56d73 100644
--- a/providers/lldp/src/main/java/org/onosproject/provider/lldp/impl/LLDPLinkProvider.java
+++ b/providers/lldp/src/main/java/org/onosproject/provider/lldp/impl/LLDPLinkProvider.java
@@ -152,7 +152,7 @@
}
synchronized (discoverers) {
if (!discoverers.containsKey(deviceId)) {
- // TODO: ideally, should never reach here
+ // ideally, should never reach here
log.debug("Device mastership changed ({}) {}",
event.type(), deviceId);
discoverers.put(deviceId, new LinkDiscovery(device,
@@ -220,7 +220,7 @@
ConnectPoint point = new ConnectPoint(deviceId,
port.number());
providerService.linksVanished(point);
- // TODO: Don't we need to removePort from ld?
+
break;
case DEVICE_REMOVED:
case DEVICE_SUSPENDED:
diff --git a/providers/lldp/src/main/java/org/onosproject/provider/lldp/impl/LinkDiscovery.java b/providers/lldp/src/main/java/org/onosproject/provider/lldp/impl/LinkDiscovery.java
index df90b72..875ef6a 100644
--- a/providers/lldp/src/main/java/org/onosproject/provider/lldp/impl/LinkDiscovery.java
+++ b/providers/lldp/src/main/java/org/onosproject/provider/lldp/impl/LinkDiscovery.java
@@ -344,7 +344,6 @@
}
private void sendProbes(Long portNumber) {
- // TODO: should have suppression port configuration, not by type
if (device.type() != Device.Type.ROADM) {
log.trace("Sending probes out to {}@{}", portNumber, device.id());
OutboundPacket pkt = this.createOutBoundLLDP(portNumber);
diff --git a/providers/lldp/src/test/java/org/onosproject/provider/lldp/impl/LLDPLinkProviderTest.java b/providers/lldp/src/test/java/org/onosproject/provider/lldp/impl/LLDPLinkProviderTest.java
index 938ecdf..b37ee00 100644
--- a/providers/lldp/src/test/java/org/onosproject/provider/lldp/impl/LLDPLinkProviderTest.java
+++ b/providers/lldp/src/test/java/org/onosproject/provider/lldp/impl/LLDPLinkProviderTest.java
@@ -271,8 +271,6 @@
@Override
public void linkVanished(LinkDescription linkDescription) {
- // TODO Auto-generated method stub
-
}
@Override
diff --git a/providers/openflow/device/src/main/java/org/onosproject/provider/of/device/impl/OpenFlowDeviceProvider.java b/providers/openflow/device/src/main/java/org/onosproject/provider/of/device/impl/OpenFlowDeviceProvider.java
index 99a9650..1841a50 100644
--- a/providers/openflow/device/src/main/java/org/onosproject/provider/of/device/impl/OpenFlowDeviceProvider.java
+++ b/providers/openflow/device/src/main/java/org/onosproject/provider/of/device/impl/OpenFlowDeviceProvider.java
@@ -137,18 +137,6 @@
providerService.deviceDisconnected(deviceId);
} else {
LOG.trace("Confirmed device {} connection", deviceId);
- // FIXME require something like below to match javadoc description
- // but this starts infinite loop with current DeviceManager
-// final ChassisId cId = new ChassisId(dpid.value());
-// final Type deviceType = device.type();
-// DeviceDescription description =
-// new DefaultDeviceDescription(deviceId.uri(), deviceType,
-// sw.manfacturerDescription(),
-// sw.hardwareDescription(),
-// sw.softwareDescription(),
-// sw.serialNumber(),
-// cId);
-// providerService.deviceConnected(deviceId, description);
}
// Prompt an update of port information. We can use any XID for this.
@@ -165,16 +153,6 @@
}
}
- // Checks if the OF channel is connected.
- //private boolean checkChannel(Device device, OpenFlowSwitch sw) {
- // FIXME if possible, we might want this to be part of
- // OpenFlowSwitch interface so the driver interface isn't misused.
- // if (sw == null || !((OpenFlowSwitchDriver) sw).isConnected()) {
- // return false;
- // }
- // return true;
- // }
-
@Override
public void roleChanged(DeviceId deviceId, MastershipRole newRole) {
switch (newRole) {
diff --git a/providers/openflow/device/src/test/java/org/onosproject/provider/of/device/impl/OpenFlowDeviceProviderTest.java b/providers/openflow/device/src/test/java/org/onosproject/provider/of/device/impl/OpenFlowDeviceProviderTest.java
index 8fb5b79..ec27084 100644
--- a/providers/openflow/device/src/test/java/org/onosproject/provider/of/device/impl/OpenFlowDeviceProviderTest.java
+++ b/providers/openflow/device/src/test/java/org/onosproject/provider/of/device/impl/OpenFlowDeviceProviderTest.java
@@ -114,7 +114,7 @@
@Test
public void triggerProbe() {
- // TODO
+
}
@Test
diff --git a/providers/openflow/flow/src/main/java/org/onosproject/provider/of/flow/impl/FlowEntryBuilder.java b/providers/openflow/flow/src/main/java/org/onosproject/provider/of/flow/impl/FlowEntryBuilder.java
index b67abf3..e2b3478 100644
--- a/providers/openflow/flow/src/main/java/org/onosproject/provider/of/flow/impl/FlowEntryBuilder.java
+++ b/providers/openflow/flow/src/main/java/org/onosproject/provider/of/flow/impl/FlowEntryBuilder.java
@@ -186,7 +186,6 @@
}
break;
case SET_FIELD:
- // TODO handle 1.3 set field actions correctly
break;
case SET_TP_DST:
case SET_TP_SRC:
diff --git a/providers/openflow/flow/src/main/java/org/onosproject/provider/of/flow/impl/FlowModBuilderVer10.java b/providers/openflow/flow/src/main/java/org/onosproject/provider/of/flow/impl/FlowModBuilderVer10.java
index 587fde0..4df3e83 100644
--- a/providers/openflow/flow/src/main/java/org/onosproject/provider/of/flow/impl/FlowModBuilderVer10.java
+++ b/providers/openflow/flow/src/main/java/org/onosproject/provider/of/flow/impl/FlowModBuilderVer10.java
@@ -78,7 +78,7 @@
long cookie = flowRule().id().value();
- //TODO: what to do without bufferid? do we assume that there will be a pktout as well?
+
OFFlowAdd fm = factory().buildFlowAdd()
.setXid(xid)
.setCookie(U64.of(cookie))
@@ -99,7 +99,7 @@
long cookie = flowRule().id().value();
- //TODO: what to do without bufferid? do we assume that there will be a pktout as well?
+
OFFlowMod fm = factory().buildFlowModify()
.setXid(xid)
.setCookie(U64.of(cookie))
diff --git a/providers/openflow/flow/src/main/java/org/onosproject/provider/of/flow/impl/FlowModBuilderVer13.java b/providers/openflow/flow/src/main/java/org/onosproject/provider/of/flow/impl/FlowModBuilderVer13.java
index c50e6a0..9a90388 100644
--- a/providers/openflow/flow/src/main/java/org/onosproject/provider/of/flow/impl/FlowModBuilderVer13.java
+++ b/providers/openflow/flow/src/main/java/org/onosproject/provider/of/flow/impl/FlowModBuilderVer13.java
@@ -93,7 +93,7 @@
long cookie = flowRule().id().value();
- //TODO: what to do without bufferid? do we assume that there will be a pktout as well?
+
OFFlowAdd fm = factory().buildFlowAdd()
.setXid(xid)
.setCookie(U64.of(cookie))
@@ -117,7 +117,7 @@
long cookie = flowRule().id().value();
- //TODO: what to do without bufferid? do we assume that there will be a pktout as well?
+
OFFlowMod fm = factory().buildFlowModify()
.setXid(xid)
.setCookie(U64.of(cookie))
@@ -145,8 +145,6 @@
.setXid(xid)
.setCookie(U64.of(cookie))
.setBufferId(OFBufferId.NO_BUFFER)
- //.setActions(actions) //FIXME do we want to send actions in flowdel?
- //.setInstructions(Collections.singletonList(writeActions))
.setMatch(match)
.setFlags(Collections.singleton(OFFlowModFlags.SEND_FLOW_REM))
.setPriority(flowRule().priority())
diff --git a/providers/openflow/host/src/main/java/org/onosproject/provider/of/host/impl/OpenFlowHostProvider.java b/providers/openflow/host/src/main/java/org/onosproject/provider/of/host/impl/OpenFlowHostProvider.java
index 047fb3f..4dfcf17 100644
--- a/providers/openflow/host/src/main/java/org/onosproject/provider/of/host/impl/OpenFlowHostProvider.java
+++ b/providers/openflow/host/src/main/java/org/onosproject/provider/of/host/impl/OpenFlowHostProvider.java
@@ -142,7 +142,6 @@
}
- // TODO: Use DHCP packets as well later...
}
}
diff --git a/providers/openflow/link/src/test/java/org/onosproject/provider/of/link/impl/OpenFlowLinkProviderTest.java b/providers/openflow/link/src/test/java/org/onosproject/provider/of/link/impl/OpenFlowLinkProviderTest.java
index 94abe80..f947e60 100644
--- a/providers/openflow/link/src/test/java/org/onosproject/provider/of/link/impl/OpenFlowLinkProviderTest.java
+++ b/providers/openflow/link/src/test/java/org/onosproject/provider/of/link/impl/OpenFlowLinkProviderTest.java
@@ -258,8 +258,6 @@
@Override
public void linkVanished(LinkDescription linkDescription) {
- // TODO Auto-generated method stub
-
}
@Override