Fix RIB activation

We now have a separate CodecsRegistry component, make sure we inject
that instead of codec/schema combo.

Change-Id: I277e40fb90b1140d9c59ff492024db0361845716
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>

diff --git a/bgp/rib-impl/src/main/resources/OSGI-INF/blueprint/bgp-rib.xml b/bgp/rib-impl/src/main/resources/OSGI-INF/blueprint/bgp-rib.xml
index 0bb1e659a80f7da3305fd0ec454b3c2712563e33..3488dc35ea0a100c435247f8fe8111af29b4b143 100644 (file)
--- a/bgp/rib-impl/src/main/resources/OSGI-INF/blueprint/bgp-rib.xml
+++ b/bgp/rib-impl/src/main/resources/OSGI-INF/blueprint/bgp-rib.xml
@@ -33,10 +33,8 @@
 
   <reference id="dataBroker" interface="org.opendaylight.mdsal.binding.api.DataBroker" odl:type="default"/>
   <reference id="globalBgpExtensions" interface="org.opendaylight.protocol.bgp.rib.spi.RIBExtensionConsumerContext"/>
-  <reference id="codecTreeFactory" interface="org.opendaylight.mdsal.binding.dom.codec.api.BindingCodecTreeFactory"/>
   <reference id="domDataBroker" interface="org.opendaylight.mdsal.dom.api.DOMDataBroker" odl:type="default"/>
   <reference id="bgpTableTypeRegistry" interface="org.opendaylight.protocol.bgp.openconfig.spi.BGPTableTypeRegistryConsumer"/>
-  <odl:static-reference id="domSchemaService" interface="org.opendaylight.mdsal.dom.api.DOMSchemaService"/>
   <reference id="rpcRegistry" interface="org.opendaylight.mdsal.binding.api.RpcProviderService"/>
 
   <bean id="bgpDeployer" class="org.opendaylight.protocol.bgp.rib.impl.config.BgpDeployerImpl"
@@ -51,14 +49,15 @@
   </bean>
 
   <reference id="policiesProvider" interface="org.opendaylight.protocol.bgp.openconfig.routing.policy.spi.BGPRibRoutingPolicyFactory"/>
+  <reference id="codecRegistry" interface="org.opendaylight.protocol.bgp.rib.impl.spi.CodecsRegistry"/>
+
   <bean id="ribImpl" class="org.opendaylight.protocol.bgp.rib.impl.config.RibImpl" scope="prototype">
     <argument ref="globalBgpExtensions"/>
     <argument ref="BGPDispatcher"/>
     <argument ref="policiesProvider"/>
-    <argument ref="codecTreeFactory"/>
+    <argument ref="codecRegistry"/>
     <argument ref="domDataBroker"/>
     <argument ref="dataBroker"/>
-    <argument ref="domSchemaService"/>
   </bean>
 
   <bean id="bgpPeer" class="org.opendaylight.protocol.bgp.rib.impl.config.BgpPeer" scope="prototype">