홍길동 / onos

Go to a project
Toggle navigation Toggle navigation pinning
Jonathan Hart
7dd4a33d 1 parent 6dd018f7

Remove SDN-IP TODOs 

Change-Id: I59b510ba95d4f76600d23d79a81964c2ef290a56
Inline Side-by-side
Showing 6 changed files with 5 additions and 25 deletions
...@@ -295,10 +295,6 @@ public class IntentSynchronizer { ...@@ -295,10 +295,6 @@ public class IntentSynchronizer {
295 routeIntents.put(prefix, intent); 295 routeIntents.put(prefix, intent);
296 if (isElectedLeader && isActivatedLeader) { 296 if (isElectedLeader && isActivatedLeader) {
297 if (oldIntent != null) { 297 if (oldIntent != null) {
298 - //
299 - // TODO: Short-term solution to explicitly withdraw
300 - // instead of using "replace" operation.
301 - //
302 log.trace("SDN-IP Withdrawing old intent: {}", 298 log.trace("SDN-IP Withdrawing old intent: {}",
303 oldIntent); 299 oldIntent);
304 withdrawBuilder.addWithdrawOperation(oldIntent.id()); 300 withdrawBuilder.addWithdrawOperation(oldIntent.id());
...@@ -390,7 +386,6 @@ public class IntentSynchronizer { ...@@ -390,7 +386,6 @@ public class IntentSynchronizer {
390 IPCriterion ipCriterion = (IPCriterion) c; 386 IPCriterion ipCriterion = (IPCriterion) c;
391 Ip4Prefix ip4Prefix = ipCriterion.ip().getIp4Prefix(); 387 Ip4Prefix ip4Prefix = ipCriterion.ip().getIp4Prefix();
392 if (ip4Prefix == null) { 388 if (ip4Prefix == null) {
393 - // TODO: For now we support only IPv4
394 continue; 389 continue;
395 } 390 }
396 log.trace("SDN-IP Intent Synchronizer: updating " + 391 log.trace("SDN-IP Intent Synchronizer: updating " +
......
...@@ -94,7 +94,6 @@ public class PeerConnectivityManager { ...@@ -94,7 +94,6 @@ public class PeerConnectivityManager {
94 * Stops the peer connectivity manager. 94 * Stops the peer connectivity manager.
95 */ 95 */
96 public void stop() { 96 public void stop() {
97 - // TODO: Implement it
98 } 97 }
99 98
100 /** 99 /**
......
...@@ -29,6 +29,11 @@ import java.util.concurrent.Executors; ...@@ -29,6 +29,11 @@ import java.util.concurrent.Executors;
29 import java.util.concurrent.LinkedBlockingQueue; 29 import java.util.concurrent.LinkedBlockingQueue;
30 30
31 import org.apache.commons.lang3.tuple.Pair; 31 import org.apache.commons.lang3.tuple.Pair;
32 +import org.onlab.packet.Ethernet;
33 +import org.onlab.packet.Ip4Address;
34 +import org.onlab.packet.Ip4Prefix;
35 +import org.onlab.packet.IpAddress;
36 +import org.onlab.packet.MacAddress;
32 import org.onosproject.core.ApplicationId; 37 import org.onosproject.core.ApplicationId;
33 import org.onosproject.net.ConnectPoint; 38 import org.onosproject.net.ConnectPoint;
34 import org.onosproject.net.Host; 39 import org.onosproject.net.Host;
...@@ -43,11 +48,6 @@ import org.onosproject.net.intent.MultiPointToSinglePointIntent; ...@@ -43,11 +48,6 @@ import org.onosproject.net.intent.MultiPointToSinglePointIntent;
43 import org.onosproject.sdnip.config.BgpPeer; 48 import org.onosproject.sdnip.config.BgpPeer;
44 import org.onosproject.sdnip.config.Interface; 49 import org.onosproject.sdnip.config.Interface;
45 import org.onosproject.sdnip.config.SdnIpConfigurationService; 50 import org.onosproject.sdnip.config.SdnIpConfigurationService;
46 -import org.onlab.packet.Ethernet;
47 -import org.onlab.packet.IpAddress;
48 -import org.onlab.packet.Ip4Address;
49 -import org.onlab.packet.Ip4Prefix;
50 -import org.onlab.packet.MacAddress;
51 import org.slf4j.Logger; 51 import org.slf4j.Logger;
52 import org.slf4j.LoggerFactory; 52 import org.slf4j.LoggerFactory;
53 53
...@@ -294,7 +294,6 @@ public class Router implements RouteListener { ...@@ -294,7 +294,6 @@ public class Router implements RouteListener {
294 if (nextHopMacAddress == null) { 294 if (nextHopMacAddress == null) {
295 Set<Host> hosts = hostService.getHostsByIp(routeEntry.nextHop()); 295 Set<Host> hosts = hostService.getHostsByIp(routeEntry.nextHop());
296 if (!hosts.isEmpty()) { 296 if (!hosts.isEmpty()) {
297 - // TODO how to handle if multiple hosts are returned?
298 nextHopMacAddress = hosts.iterator().next().mac(); 297 nextHopMacAddress = hosts.iterator().next().mac();
299 } 298 }
300 if (nextHopMacAddress != null) { 299 if (nextHopMacAddress != null) {
...@@ -406,7 +405,6 @@ public class Router implements RouteListener { ...@@ -406,7 +405,6 @@ public class Router implements RouteListener {
406 } 405 }
407 406
408 routesWaitingOnArp.remove(routeEntry.nextHop(), routeEntry); 407 routesWaitingOnArp.remove(routeEntry.nextHop(), routeEntry);
409 - // TODO cancel the request in the ARP manager as well
410 } 408 }
411 409
412 /** 410 /**
...@@ -421,10 +419,6 @@ public class Router implements RouteListener { ...@@ -421,10 +419,6 @@ public class Router implements RouteListener {
421 private void updateMac(Ip4Address ipAddress, MacAddress macAddress) { 419 private void updateMac(Ip4Address ipAddress, MacAddress macAddress) {
422 log.debug("Received updated MAC info: {} => {}", ipAddress, macAddress); 420 log.debug("Received updated MAC info: {} => {}", ipAddress, macAddress);
423 421
424 - // TODO here we should check whether the next hop for any of our
425 - // installed prefixes has changed, not just prefixes pending
426 - // installation.
427 -
428 // We synchronize on this to prevent changes to the radix tree 422 // We synchronize on this to prevent changes to the radix tree
429 // while we're pushing intents. If the tree changes, the 423 // while we're pushing intents. If the tree changes, the
430 // tree and intents could get out of sync. 424 // tree and intents could get out of sync.
...@@ -505,7 +499,6 @@ public class Router implements RouteListener { ...@@ -505,7 +499,6 @@ public class Router implements RouteListener {
505 for (IpAddress ip : host.ipAddresses()) { 499 for (IpAddress ip : host.ipAddresses()) {
506 Ip4Address ip4Address = ip.getIp4Address(); 500 Ip4Address ip4Address = ip.getIp4Address();
507 if (ip4Address == null) { 501 if (ip4Address == null) {
508 - // TODO: For now we support only IPv4
509 continue; 502 continue;
510 } 503 }
511 updateMac(ip4Address, host.mac()); 504 updateMac(ip4Address, host.mac());
...@@ -515,7 +508,6 @@ public class Router implements RouteListener { ...@@ -515,7 +508,6 @@ public class Router implements RouteListener {
515 for (IpAddress ip : host.ipAddresses()) { 508 for (IpAddress ip : host.ipAddresses()) {
516 Ip4Address ip4Address = ip.getIp4Address(); 509 Ip4Address ip4Address = ip.getIp4Address();
517 if (ip4Address == null) { 510 if (ip4Address == null) {
518 - // TODO: For now we support only IPv4
519 continue; 511 continue;
520 } 512 }
521 ip2Mac.remove(ip4Address); 513 ip2Mac.remove(ip4Address);
......
...@@ -115,8 +115,6 @@ public class SdnIp implements SdnIpService { ...@@ -115,8 +115,6 @@ public class SdnIp implements SdnIpService {
115 115
116 bgpSessionManager = new BgpSessionManager(router); 116 bgpSessionManager = new BgpSessionManager(router);
117 bgpSessionManager.start(bgpPort); 117 bgpSessionManager.start(bgpPort);
118 -
119 - // TODO need to disable link discovery on external ports
120 } 118 }
121 119
122 @Deactivate 120 @Deactivate
......
...@@ -36,8 +36,6 @@ public class SdnIpConfigurationReader implements SdnIpConfigurationService { ...@@ -36,8 +36,6 @@ public class SdnIpConfigurationReader implements SdnIpConfigurationService {
36 36
37 private final Logger log = LoggerFactory.getLogger(getClass()); 37 private final Logger log = LoggerFactory.getLogger(getClass());
38 38
39 - // Current working dir seems to be /opt/onos/apache-karaf-3.0.2
40 - // TODO: Set the path to /opt/onos/config
41 private static final String CONFIG_DIR = "../config"; 39 private static final String CONFIG_DIR = "../config";
42 private static final String DEFAULT_CONFIG_FILE = "sdnip.json"; 40 private static final String DEFAULT_CONFIG_FILE = "sdnip.json";
43 private String configFileName = DEFAULT_CONFIG_FILE; 41 private String configFileName = DEFAULT_CONFIG_FILE;
......
...@@ -678,8 +678,6 @@ public class PeerConnectivityManagerTest extends AbstractIntentTest { ...@@ -678,8 +678,6 @@ public class PeerConnectivityManagerTest extends AbstractIntentTest {
678 /** 678 /**
679 * Tests a corner case, when there is no Interface configured for one BGP 679 * Tests a corner case, when there is no Interface configured for one BGP
680 * speaker. 680 * speaker.
681 - * TODO: we should add a configuration correctness checking module/method
682 - * before testing this corner case.
683 */ 681 */
684 @Ignore 682 @Ignore
685 @Test 683 @Test
......