commit 492cc3ab1083d0d9ed58aa55d1c3e3911530dda8
author Pavlin Radoslavov <pavlin@onlab.us> Thu Jan 22 18:46:26 2015 -0800
committer Gerrit Code Review <gerrit@onlab.us> Fri Jan 23 06:33:02 2015 +0000
tree cda694d9b0bf25a468513fad103389b24e6d3402
parent 7446da93e0a7b8d3f8943ce1b86f5ee2d94fa705

Fix startup dependency between features onos-app-config and onos-app-sdnip:
 * Expose NetworkConfigReader as a service - NetworkConfigService
 * Add reference within SdnIp to NetworkConfigService

This fixes bug ONOS-735

Change-Id: I85cdd0ce0a4f6293e8a5633bddd140a23ecddc10

apps/sdnip/pom.xml

diff --git a/apps/sdnip/pom.xml b/apps/sdnip/pom.xml
index 09a3a48..920b5e5 100644
--- a/apps/sdnip/pom.xml
+++ b/apps/sdnip/pom.xml
@@ -96,6 +96,12 @@
     </dependency>
 
     <dependency>
+      <groupId>org.onosproject</groupId>
+      <artifactId>onos-app-config</artifactId>
+      <version>${project.version}</version>
+    </dependency>
+
+    <dependency>
       <groupId>org.apache.karaf.shell</groupId>
       <artifactId>org.apache.karaf.shell.console</artifactId>
     </dependency>

apps/sdnip/src/main/java/org/onosproject/sdnip/SdnIp.java

diff --git a/apps/sdnip/src/main/java/org/onosproject/sdnip/SdnIp.java b/apps/sdnip/src/main/java/org/onosproject/sdnip/SdnIp.java
index 2b95129..a910950 100644
--- a/apps/sdnip/src/main/java/org/onosproject/sdnip/SdnIp.java
+++ b/apps/sdnip/src/main/java/org/onosproject/sdnip/SdnIp.java
@@ -32,6 +32,7 @@
 import org.onosproject.cluster.LeadershipEvent;
 import org.onosproject.cluster.LeadershipEventListener;
 import org.onosproject.cluster.LeadershipService;
+import org.onosproject.config.NetworkConfigService;
 import org.onosproject.core.ApplicationId;
 import org.onosproject.core.CoreService;
 import org.onosproject.net.host.HostService;
@@ -68,6 +69,14 @@
     @Reference(cardinality = ReferenceCardinality.MANDATORY_UNARY)
     protected LeadershipService leadershipService;
 
+    //
+    // NOTE: Unused reference - needed to guarentee that the
+    // NetworkConfigReader component is activated and the network configuration
+    // is read.
+    //
+    @Reference(cardinality = ReferenceCardinality.MANDATORY_UNARY)
+    protected NetworkConfigService networkConfigService;
+
     private static final int DEFAULT_BGP_PORT = 2000;
     private int bgpPort;