Fix AltoNorthboundRouter is null in SimpleIrd

Change-Id: Ia094d338bbaa88de9e8ee8ada66668bd3171ea20
Signed-off-by: Shawn Lin <x.shawn.lin@gmail.com>

diff --git a/alto-basic/simple-ird/impl/src/main/java/org/opendaylight/alto/basic/impl/AltoSimpleIrdProvider.java b/alto-basic/simple-ird/impl/src/main/java/org/opendaylight/alto/basic/impl/AltoSimpleIrdProvider.java
index 4e5dcc1eaeedf3907655d1f5596ebf3f1f82e770..8105c8ed370869f16aeb5653e87133dec56f1c70 100644 (file)
--- a/alto-basic/simple-ird/impl/src/main/java/org/opendaylight/alto/basic/impl/AltoSimpleIrdProvider.java
+++ b/alto-basic/simple-ird/impl/src/main/java/org/opendaylight/alto/basic/impl/AltoSimpleIrdProvider.java
@@ -97,8 +97,9 @@ public class AltoSimpleIrdProvider {
         }
     }
 
-    public AltoSimpleIrdProvider(final DataBroker dataBroker) {
+    public AltoSimpleIrdProvider(final DataBroker dataBroker, final AltoNorthboundRouter router) {
         this.m_dataBroker = dataBroker;
+        this.m_router = router;
     }
 
     /**
@@ -112,6 +113,7 @@ public class AltoSimpleIrdProvider {
             createContext();
             setupListener();
             createDefaultIrd();
+            setupRoute(m_router);
         } catch (Exception e) {
             LOG.error("Failed to create top-level containers");
             e.printStackTrace();
@@ -165,7 +167,6 @@ public class AltoSimpleIrdProvider {
 
             wx.submit().get();
 
-            m_router = router;
             m_route = route;
         } catch (Exception e) {
             LOG.error("Failed to reigster route");

diff --git a/alto-basic/simple-ird/impl/src/main/resources/org/opendaylight/blueprint/impl-blueprint.xml b/alto-basic/simple-ird/impl/src/main/resources/org/opendaylight/blueprint/impl-blueprint.xml
index 5f001c8261f6d894710d19289a8c186130252b1e..45963ab2a85488bfff0952a826d3301e4fb4125f 100644 (file)
--- a/alto-basic/simple-ird/impl/src/main/resources/org/opendaylight/blueprint/impl-blueprint.xml
+++ b/alto-basic/simple-ird/impl/src/main/resources/org/opendaylight/blueprint/impl-blueprint.xml
@@ -14,11 +14,14 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
   <reference id="dataBroker"
     interface="org.opendaylight.controller.md.sal.binding.api.DataBroker"
     odl:type="default" />
+  <reference id="router"
+             interface="org.opendaylight.alto.core.northbound.api.AltoNorthboundRouter"/>
 
   <bean id="altoSimpleIrdProvider"
     class="org.opendaylight.alto.basic.impl.AltoSimpleIrdProvider"
     init-method="init" destroy-method="close">
     <argument ref="dataBroker" />
+    <argument ref="router" />
   </bean>
 
 </blueprint>

diff --git a/alto-core/northbound/impl/src/main/resources/org/opendaylight/blueprint/impl-blueprint.xml b/alto-core/northbound/impl/src/main/resources/org/opendaylight/blueprint/impl-blueprint.xml
index d3e29908b744794e5474164251219b76607d07e0..7d86efc8bc5eb8046e10244d59d0237dbb8e4e62 100644 (file)
--- a/alto-core/northbound/impl/src/main/resources/org/opendaylight/blueprint/impl-blueprint.xml
+++ b/alto-core/northbound/impl/src/main/resources/org/opendaylight/blueprint/impl-blueprint.xml
@@ -14,4 +14,5 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
     class="org.opendaylight.alto.core.northbound.impl.AltoNorthboundProvider"
     init-method="init" destroy-method="close">
   </bean>
+  <service ref="provider" interface="org.opendaylight.alto.core.northbound.api.AltoNorthboundRouter"/>
 </blueprint>