Bump versions by x.(y+1).z

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

diff --git a/applications/southbound-cli/src/main/resources/OSGI-INF/blueprint/commands.xml b/applications/southbound-cli/src/main/resources/OSGI-INF/blueprint/commands.xml
index 5c3454ff8bac7e44f36c510a8e82dbf2971d1875..6c68e0924a36604d19a5d77ce406ebd403e532b7 100644 (file)
--- a/applications/southbound-cli/src/main/resources/OSGI-INF/blueprint/commands.xml
+++ b/applications/southbound-cli/src/main/resources/OSGI-INF/blueprint/commands.xml
@@ -1,23 +1,31 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <blueprint xmlns="http://www.osgi.org/xmlns/blueprint/v1.0.0"
            xmlns:cm="http://aries.apache.org/blueprint/xmlns/blueprint-cm/v1.2.0">
-
+    <reference id="dataBroker"
+               interface="org.opendaylight.mdsal.binding.api.DataBroker"/>
     <reference id="reconciliationJMXServiceMBean"
                interface="org.opendaylight.openflowplugin.applications.frm.ReconciliationJMXServiceMBean"
                availability="optional"/>
+    <reference id="clusterMemberInfoProvider"
+               interface="org.opendaylight.infrautils.diagstatus.ClusterMemberInfo"
+               availability="optional"/>
+    <reference id="flowGroupHistories"
+               interface="org.opendaylight.openflowplugin.api.openflow.FlowGroupInfoHistories"/>
+    <reference id="reconciliationService"
+               interface="org.opendaylight.openflowplugin.applications.southboundcli.ReconcileService"/>
+    <reference id="dpnTracker"
+               interface="org.opendaylight.openflowplugin.applications.southboundcli.DpnTracker"/>
+
     <cm:property-placeholder persistent-id="org.ops4j.pax.web" update-strategy="none">
         <cm:default-properties>
             <cm:property name="org.osgi.service.http.port" value="8181"/>
         </cm:default-properties>
     </cm:property-placeholder>
-    <reference id="clusterMemberInfoProvider"
-               interface="org.opendaylight.infrautils.diagstatus.ClusterMemberInfo"
-               availability="optional"/>
+
     <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"/>
+                <argument ref="dpnTracker"/>
             </action>
         </command>
         <command name="openflow/shownode">
@@ -38,15 +46,12 @@
         <command name="openflow/getreconciliationstate">
             <action class="org.opendaylight.openflowplugin.applications.southboundcli.cli.GetReconciliationStateProvider">
                 <argument ref ="reconciliationJMXServiceMBean"/>
-                <argument ref="clusterMemberInfoProvider"/>
-                <argument value="${org.osgi.service.http.port}"/>
             </action>
         </command>
         <command name="openflow/getflownodecache">
             <action class="org.opendaylight.openflowplugin.applications.southboundcli.cli.GetFlowGroupCacheProvider">
-                <argument ref="flowCacheManager"/>
+                <argument ref="flowGroupHistories"/>
             </action>
         </command>
     </command-bundle>
-
-</blueprint>
\ No newline at end of file
+</blueprint>