Ported the unit tests for PeerConnectivityManager
diff --git a/apps/sdnip/src/main/java/org/onlab/onos/sdnip/PeerConnectivity.java b/apps/sdnip/src/main/java/org/onlab/onos/sdnip/PeerConnectivityManager.java
similarity index 98%
rename from apps/sdnip/src/main/java/org/onlab/onos/sdnip/PeerConnectivity.java
rename to apps/sdnip/src/main/java/org/onlab/onos/sdnip/PeerConnectivityManager.java
index 31cd971..3917f5a 100644
--- a/apps/sdnip/src/main/java/org/onlab/onos/sdnip/PeerConnectivity.java
+++ b/apps/sdnip/src/main/java/org/onlab/onos/sdnip/PeerConnectivityManager.java
@@ -25,10 +25,10 @@
/**
* Manages the connectivity requirements between peers.
*/
-public class PeerConnectivity {
+public class PeerConnectivityManager {
private static final Logger log = LoggerFactory.getLogger(
- PeerConnectivity.class);
+ PeerConnectivityManager.class);
// TODO these shouldn't be defined here
private static final short BGP_PORT = 179;
@@ -41,7 +41,7 @@
// TODO this sucks.
private int intentId = 0;
- public PeerConnectivity(SdnIpConfigService configInfoService,
+ public PeerConnectivityManager(SdnIpConfigService configInfoService,
InterfaceService interfaceService, IntentService intentService) {
this.configInfoService = configInfoService;
this.interfaceService = interfaceService;
diff --git a/apps/sdnip/src/main/java/org/onlab/onos/sdnip/SdnIp.java b/apps/sdnip/src/main/java/org/onlab/onos/sdnip/SdnIp.java
index e7ed601..3cc7708 100644
--- a/apps/sdnip/src/main/java/org/onlab/onos/sdnip/SdnIp.java
+++ b/apps/sdnip/src/main/java/org/onlab/onos/sdnip/SdnIp.java
@@ -36,7 +36,7 @@
protected HostService hostService;
private SdnIpConfigReader config;
- private PeerConnectivity peerConnectivity;
+ private PeerConnectivityManager peerConnectivity;
private Router router;
private BgpSessionManager bgpSessionManager;
@@ -49,7 +49,7 @@
InterfaceService interfaceService = new HostServiceBasedInterfaceService(hostService);
- peerConnectivity = new PeerConnectivity(config, interfaceService, intentService);
+ peerConnectivity = new PeerConnectivityManager(config, interfaceService, intentService);
peerConnectivity.start();
router = new Router(intentService, hostService, config, interfaceService);
@@ -79,4 +79,8 @@
public Collection<RouteEntry> getRoutes() {
return router.getRoutes();
}
+
+ static String dpidToUri(String dpid) {
+ return "of:" + dpid.replace(":", "");
+ }
}