commit 9965d77a8ea89e6e700fc5d48968d5bb30487d58
author Jonathan Hart <jono@onlab.us> Tue Dec 02 10:28:34 2014 -0800
committer Gerrit Code Review <gerrit@onlab.us> Tue Dec 02 20:49:09 2014 +0000
tree a3382e09d038fca3b01ef10f4b4fc4c25c714915
parent 2103df4873ea45199ef8749a61a020488440934e

Cleaned up some commented code, javadocs and names in SDN-IP.

No functional changes.

Change-Id: Ic4421428ec468049f1d93ac457c08103543d5140

apps/sdnip/src/main/java/org/onlab/onos/sdnip/SdnIp.java

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 4c81c15..44d80bf 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
@@ -37,7 +37,7 @@
 import org.onlab.onos.sdnip.bgp.BgpRouteEntry;
 import org.onlab.onos.sdnip.bgp.BgpSession;
 import org.onlab.onos.sdnip.bgp.BgpSessionManager;
-import org.onlab.onos.sdnip.config.SdnIpConfigReader;
+import org.onlab.onos.sdnip.config.SdnIpConfigurationReader;
 import org.slf4j.Logger;
 
 /**
@@ -70,7 +70,7 @@
     protected LeadershipService leadershipService;
 
     private IntentSynchronizer intentSynchronizer;
-    private SdnIpConfigReader config;
+    private SdnIpConfigurationReader config;
     private PeerConnectivityManager peerConnectivity;
     private Router router;
     private BgpSessionManager bgpSessionManager;
@@ -84,8 +84,8 @@
         log.info("SDN-IP started");
 
         appId = coreService.registerApplication(SDN_IP_APP);
-        config = new SdnIpConfigReader();
-        config.init();
+        config = new SdnIpConfigurationReader();
+        config.readConfiguration();
 
         localControllerNode = clusterService.getLocalNode();