OPNFLWPLUG-986: Administrative Reconciliation for multiple/all Nodes

[openflowplugin.git] / applications / forwardingrules-manager / src / main / resources / org / opendaylight / blueprint / forwardingrules-manager.xml

diff --git a/applications/forwardingrules-manager/src/main/resources/org/opendaylight/blueprint/forwardingrules-manager.xml b/applications/forwardingrules-manager/src/main/resources/org/opendaylight/blueprint/forwardingrules-manager.xml
index 34a6dc8f455f03674fa1e5cf9caaaabcbced241f..0d426fc18aa3011f6f727dd743d952be7a679f23 100644 (file)
--- a/applications/forwardingrules-manager/src/main/resources/org/opendaylight/blueprint/forwardingrules-manager.xml
+++ b/applications/forwardingrules-manager/src/main/resources/org/opendaylight/blueprint/forwardingrules-manager.xml
@@ -8,23 +8,13 @@
   <reference id="rpcRegistry" interface="org.opendaylight.controller.sal.binding.api.RpcProviderRegistry"/>
   <reference id="notificationService" interface="org.opendaylight.controller.sal.binding.api.NotificationProviderService"/>
   <reference id="clusterSingletonService" interface="org.opendaylight.mdsal.singleton.common.api.ClusterSingletonServiceProvider"/>
+  <reference id="configurationService" interface="org.opendaylight.openflowplugin.api.openflow.configuration.ConfigurationService"/>
+  <reference id="reconciliationservice" interface="org.opendaylight.openflowplugin.applications.reconciliation.ReconciliationManager"/>
+
 
   <odl:clustered-app-config id="frmConfig"
       binding-class="org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.openflowplugin.app.forwardingrules.manager.config.rev160511.ForwardingRulesManagerConfig"/>
 
-  <cm:property-placeholder persistent-id="org.opendaylight.openflowplugin"
-                           placeholder-prefix="${frm-"
-                           update-strategy="none">
-    <cm:default-properties>
-      <!-- Disable switch reconciliation -->
-      <cm:property name="disable-reconciliation" value="false"/>
-      <!-- Enable stale marking for switch reconciliation -->
-      <cm:property name="stale-marking-enabled" value="false"/>
-      <!-- Number of retries for switch reconciliation -->
-      <cm:property name="reconciliation-retry-count" value="5"/>
-    </cm:default-properties>
-  </cm:property-placeholder>
-
   <bean id="frmManager" class="org.opendaylight.openflowplugin.applications.frm.impl.ForwardingRulesManagerImpl"
           init-method="start" destroy-method="close">
     <argument ref="dataBroker"/>
@@ -32,9 +22,16 @@
     <argument ref="frmConfig"/>
     <argument ref="clusterSingletonService"/>
     <argument ref="notificationService"/>
-    <argument value="${frm-disable-reconciliation}"/>
-    <argument value="${frm-stale-marking-enabled}"/>
-    <argument value="${frm-reconciliation-retry-count}"/>
+    <argument ref="configurationService"/>
+    <argument ref="reconciliationservice"/>
+  </bean>
 
+  <bean id="reconciliationService"
+          class="org.opendaylight.openflowplugin.applications.frm.impl.ReconciliationServiceImpl">
+    <argument ref="frmManager"/>
   </bean>
-</blueprint>
\ No newline at end of file
+  <service ref="reconciliationService"
+           interface="org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.openflowplugin.app.reconciliation.service.rev180227.ReconciliationService"
+           odl:type="default"/>
+
+</blueprint>