Merge "Change OFConstants.OFPCML_NO_BUFFER to Uint16"

[openflowplugin.git] / applications / southbound-cli / src / main / resources / OSGI-INF / blueprint / southbound-cli.xml

diff --git a/applications/southbound-cli/src/main/resources/OSGI-INF/blueprint/southbound-cli.xml b/applications/southbound-cli/src/main/resources/OSGI-INF/blueprint/southbound-cli.xml
index 635c5319e6948cd8a7e6450f7f87e48989232d48..1c9d8d851a649d27b4b21af31f4137d42f9c96aa 100644 (file)
--- a/applications/southbound-cli/src/main/resources/OSGI-INF/blueprint/southbound-cli.xml
+++ b/applications/southbound-cli/src/main/resources/OSGI-INF/blueprint/southbound-cli.xml
@@ -6,13 +6,19 @@
 
     <reference id="dataBroker"
                interface="org.opendaylight.mdsal.binding.api.DataBroker"/>
+    <reference id="flowCacheManager" interface="org.opendaylight.openflowplugin.api.openflow.FlowGroupCacheManager"/>
 
     <odl:rpc-service id="frmReconciliationService"
              interface="org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.openflowplugin.app.frm.reconciliation.service.rev180227.FrmReconciliationService"/>
-
     <bean id="alarmAgent"
           class="org.opendaylight.openflowplugin.applications.southboundcli.alarm.AlarmAgent" init-method="start">
     </bean>
+    <bean id="nodeListener"
+          class="org.opendaylight.openflowplugin.applications.southboundcli.NodeListener"
+          init-method="start"
+          destroy-method="close">
+        <argument ref="dataBroker"/>
+    </bean>
     <bean id="reconciliationService"
           class="org.opendaylight.openflowplugin.applications.southboundcli.ReconciliationServiceImpl"
           destroy-method="close">
@@ -20,39 +26,9 @@
         <argument ref="frmReconciliationService"/>
         <argument ref="alarmAgent"/>
         <argument ref="nodeListener"/>
-    </bean>
-    <bean id="nodeListener"
-          class="org.opendaylight.openflowplugin.applications.southboundcli.NodeListener"
-          init-method="start"
-          destroy-method="close">
-        <argument ref="dataBroker"/>
+        <argument ref="flowCacheManager"/>
     </bean>
 
     <odl:rpc-implementation ref="reconciliationService"/>
 
-    <!--To assert references for CLI implementations-->
-    <command-bundle xmlns="http://karaf.apache.org/xmlns/shell/v1.0.0">
-        <command name="openflow/getallnodes">
-            <action class="org.opendaylight.openflowplugin.applications.southboundcli.cli.GetAllNodesCommandProvider">
-                <property name="dataBroker" ref="dataBroker" />
-                <property name="nodeListener" ref="nodeListener"/>
-            </action>
-        </command>
-        <command name="openflow/shownode">
-            <action class="org.opendaylight.openflowplugin.applications.southboundcli.cli.ShowNodeCommandProvider">
-                <property name="dataBroker" ref="dataBroker" />
-            </action>
-        </command>
-        <command name="openflow/reconcile">
-            <action class="org.opendaylight.openflowplugin.applications.southboundcli.cli.Reconciliation">
-                <property name="reconciliationService" ref="reconciliationService"/>
-            </action>
-        </command>
-        <command name="openflow/getreconciliationcount">
-            <action class="org.opendaylight.openflowplugin.applications.southboundcli.cli.ReconciliationCount">
-                <property name="dataBroker" ref="dataBroker"/>
-            </action>
-        </command>
-    </command-bundle>
-
 </blueprint>