Merge "BUG-7608: use blueprint action-provider/action-service"

diff --git a/applications/lldp-speaker/src/main/resources/org/opendaylight/blueprint/lldp-speaker.xml b/applications/lldp-speaker/src/main/resources/org/opendaylight/blueprint/lldp-speaker.xml
index ca8fa54dd97aae6a98ecf0fbb8c6045b31f63c14..d07cc2d1eeee4de99a88a18100f8370384f6f8be 100644 (file)
--- a/applications/lldp-speaker/src/main/resources/org/opendaylight/blueprint/lldp-speaker.xml
+++ b/applications/lldp-speaker/src/main/resources/org/opendaylight/blueprint/lldp-speaker.xml
@@ -14,7 +14,7 @@
     ]]></odl:default-config>
   </odl:clustered-app-config>
 
-  <odl:rpc-service id="packetProcessingService"
+  <odl:action-service id="packetProcessingService"
       interface="org.opendaylight.yang.gen.v1.urn.opendaylight.packet.service.rev130709.PacketProcessingService"/>
 
   <bean id="lldpSpeaker" class="org.opendaylight.openflowplugin.applications.lldpspeaker.LLDPSpeaker"
@@ -40,4 +40,4 @@
   </bean>
 
   <odl:rpc-implementation ref="operationalStatusChangeService"/>
-</blueprint>
\ No newline at end of file
+</blueprint>

diff --git a/openflowplugin-impl/src/main/resources/org/opendaylight/blueprint/openflowplugin-impl.xml b/openflowplugin-impl/src/main/resources/org/opendaylight/blueprint/openflowplugin-impl.xml
index 20b907b41694bfb03e5d1d6040eddc08708016a0..976efaabee28c5b988d888fe4959faa73f1d2503 100644 (file)
--- a/openflowplugin-impl/src/main/resources/org/opendaylight/blueprint/openflowplugin-impl.xml
+++ b/openflowplugin-impl/src/main/resources/org/opendaylight/blueprint/openflowplugin-impl.xml
@@ -6,4 +6,6 @@
 
   <service ref="ofPluginProviderFactory" interface="org.opendaylight.openflowplugin.api.openflow.OpenFlowPluginProviderFactory"
           odl:type="default"/>
-</blueprint>
\ No newline at end of file
+
+  <odl:action-provider interface="org.opendaylight.yang.gen.v1.urn.opendaylight.packet.service.rev130709.PacketProcessingService"/>
+</blueprint>